From 56f52a606b02d40fdc92b9012c7835679163cd5c Mon Sep 17 00:00:00 2001
From: Oliver Kiddle <okiddle@yahoo.co.uk>
Date: Tue, 14 Dec 2010 18:04:01 +0100
Subject: [PATCH] switches need to be renumbered following removal of some
 switches so, e.g. inc -version was not working

---
 uip/inc.c    |   24 ++++++++++++------------
 uip/msgchk.c |   14 +++++++-------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/uip/inc.c b/uip/inc.c
index 38ab687..f461dd8 100644
--- a/uip/inc.c
+++ b/uip/inc.c
@@ -78,29 +78,29 @@ static struct swit switches[] = {
     { "pack file", POPminc (-4) },
 #define	NPACKSW                   10
     { "nopack", POPminc (-6) },
-#define PORTSW			  13
+#define PORTSW			  11
     { "port name/number", POPminc (-4) },
-#define	SILSW                     15
+#define	SILSW                     12
     { "silent", 0 },
-#define	NSILSW                    16
+#define	NSILSW                    13
     { "nosilent", 0 },
-#define	TRNCSW                    17
+#define	TRNCSW                    14
     { "truncate", 0 },
-#define	NTRNCSW                   18
+#define	NTRNCSW                   15
     { "notruncate", 0 },
-#define	WIDTHSW                   19
+#define	WIDTHSW                   16
     { "width columns", 0 },
-#define VERSIONSW                 20
+#define VERSIONSW                 17
     { "version", 0 },
-#define	HELPSW                    21
+#define	HELPSW                    18
     { "help", 0 },
-#define SNOOPSW                   22
+#define SNOOPSW                   19
     { "snoop", -5 },
-#define SASLSW                    24
+#define SASLSW                    20
     { "sasl", SASLminc(-4) },
-#define SASLMECHSW                25
+#define SASLMECHSW                21
     { "saslmech", SASLminc(-8) },
-#define PROXYSW                   26
+#define PROXYSW                   22
     { "proxy command", POPminc(-5) },
     { NULL, 0 }
 };
diff --git a/uip/msgchk.c b/uip/msgchk.c
index fa2336f..03525c8 100644
--- a/uip/msgchk.c
+++ b/uip/msgchk.c
@@ -41,19 +41,19 @@ static struct swit switches[] = {
     { "host hostname", POPminc (-4) },
 #define	USERSW                   5
     { "user username", POPminc (-4) },
-#define PORTSW			 8
+#define PORTSW			 6
     { "port name/number", POPminc(-4) },
-#define VERSIONSW               10
+#define VERSIONSW                7
     { "version", 0 },
-#define	HELPSW                  11
+#define	HELPSW                   8
     { "help", 0 },
-#define SNOOPSW                 12
+#define SNOOPSW                  9
     { "snoop", -5 },
-#define SASLSW                  14
+#define SASLSW                  10
     { "sasl", SASLminc(-4) },
-#define SASLMECHSW		15
+#define SASLMECHSW		11
     { "saslmech", SASLminc(-5) },
-#define PROXYSW 		16
+#define PROXYSW 		12
     { "proxy command", POPminc(-5) },
     { NULL, 0 }
 };
-- 
1.7.10.4