From e053b6bf435519cbbdedaef23f537992f3b50a15 Mon Sep 17 00:00:00 2001
From: Nathaniel Wesley Filardo <nwfilardo@gmail.com>
Date: Sun, 27 Jul 2014 20:16:35 -0400
Subject: [PATCH] Move vos COMMONPARMS to a larger offset

Currently, vos.c leaves a gap of 12 in the argument handling array
before its common operations (-verbose, -noauth, etc.); 'vos each'
will take more, so move that to 25.

While here, switch to named constants for these arguments, which
should make it easier to do this again, if ever necessary.

Change-Id: Idc4424e5fe4efd78389ea8421db000a361b461ec
Reviewed-on: http://gerrit.openafs.org/11332
Reviewed-by: Chas Williams - CONTRACTOR <chas@cmf.nrl.navy.mil>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
---
 src/volser/vos.c | 53 +++++++++++++++++++++++++++++++++++------------------
 1 file changed, 35 insertions(+), 18 deletions(-)

diff --git a/src/volser/vos.c b/src/volser/vos.c
index 5583289..412ed89 100644
--- a/src/volser/vos.c
+++ b/src/volser/vos.c
@@ -72,15 +72,32 @@ struct tqHead {
     struct tqElem *next;
 };
 
-#define COMMONPARMS     cmd_Seek(ts, 12);\
-cmd_AddParm(ts, "-cell", CMD_SINGLE, CMD_OPTIONAL, "cell name");\
-cmd_AddParmAlias(ts, 12, "-c");   /* original -cell option */ \
-cmd_AddParm(ts, "-noauth", CMD_FLAG, CMD_OPTIONAL, "don't authenticate");\
-cmd_AddParm(ts, "-localauth",CMD_FLAG,CMD_OPTIONAL,"use server tickets");\
-cmd_AddParm(ts, "-verbose", CMD_FLAG, CMD_OPTIONAL, "verbose");\
-cmd_AddParm(ts, "-encrypt", CMD_FLAG, CMD_OPTIONAL, "encrypt commands");\
-cmd_AddParm(ts, "-noresolve", CMD_FLAG, CMD_OPTIONAL, "don't resolve addresses"); \
-cmd_AddParm(ts, "-config", CMD_SINGLE, CMD_OPTIONAL, "config location"); \
+enum {
+    COMMONPARM_OFFSET_CELL      = 25,
+    COMMONPARM_OFFSET_NOAUTH    = 26,
+    COMMONPARM_OFFSET_LOCALAUTH = 27,
+    COMMONPARM_OFFSET_VERBOSE   = 28,
+    COMMONPARM_OFFSET_ENCRYPT   = 29,
+    COMMONPARM_OFFSET_NORESOLVE = 30,
+    COMMONPARM_OFFSET_CONFIG    = 31,
+};
+
+#define COMMONPARMS \
+cmd_AddParmAtOffset(ts, COMMONPARM_OFFSET_CELL, \
+    "-cell", CMD_SINGLE, CMD_OPTIONAL, "cell name");\
+cmd_AddParmAlias(ts, COMMONPARM_OFFSET_CELL, "-c");   /* original -cell option */ \
+cmd_AddParmAtOffset(ts, COMMONPARM_OFFSET_NOAUTH, \
+    "-noauth", CMD_FLAG, CMD_OPTIONAL, "don't authenticate");\
+cmd_AddParmAtOffset(ts, COMMONPARM_OFFSET_LOCALAUTH, \
+    "-localauth",CMD_FLAG,CMD_OPTIONAL,"use server tickets");\
+cmd_AddParmAtOffset(ts, COMMONPARM_OFFSET_VERBOSE, \
+    "-verbose", CMD_FLAG, CMD_OPTIONAL, "verbose");\
+cmd_AddParmAtOffset(ts, COMMONPARM_OFFSET_ENCRYPT, \
+    "-encrypt", CMD_FLAG, CMD_OPTIONAL, "encrypt commands");\
+cmd_AddParmAtOffset(ts, COMMONPARM_OFFSET_NORESOLVE, \
+    "-noresolve", CMD_FLAG, CMD_OPTIONAL, "don't resolve addresses"); \
+cmd_AddParmAtOffset(ts, COMMONPARM_OFFSET_CONFIG, \
+    "-config", CMD_SINGLE, CMD_OPTIONAL, "config location"); \
 
 #define ERROR_EXIT(code) do { \
     error = (code); \
@@ -5815,26 +5832,26 @@ MyBeforeProc(struct cmd_syndesc *as, void *arock)
     secFlags = AFSCONF_SECOPTS_FALLBACK_NULL;
 
     tcell = NULL;
-    if (as->parms[12].items)	/* if -cell specified */
-	tcell = as->parms[12].items->data;
+    if (as->parms[COMMONPARM_OFFSET_CELL].items)	/* if -cell specified */
+	tcell = as->parms[COMMONPARM_OFFSET_CELL].items->data;
 
-    if (as->parms[13].items)
+    if (as->parms[COMMONPARM_OFFSET_NOAUTH].items)
 	secFlags |= AFSCONF_SECOPTS_NOAUTH;
 
-    if (as->parms[14].items) {	/* -localauth specified */
+    if (as->parms[COMMONPARM_OFFSET_LOCALAUTH].items) {	/* -localauth specified */
 	secFlags |= AFSCONF_SECOPTS_LOCALAUTH;
 	confdir = AFSDIR_SERVER_ETC_DIRPATH;
     }
 
-    if (as->parms[16].items     /* -encrypt specified */
+    if (as->parms[COMMONPARM_OFFSET_ENCRYPT].items     /* -encrypt specified */
 #ifdef AFS_NT40_ENV
         || win32_enableCrypt()
 #endif /* AFS_NT40_ENV */
          )
 	secFlags |= AFSCONF_SECOPTS_ALWAYSENCRYPT;
 
-    if (as->parms[18].items)   /* -config flag set */
-	confdir = as->parms[18].items->data;
+    if (as->parms[COMMONPARM_OFFSET_CONFIG].items)   /* -config flag set */
+	confdir = as->parms[COMMONPARM_OFFSET_CONFIG].items->data;
 
     if ((code = vsu_ClientInit(confdir, tcell, secFlags, UV_SetSecurity,
 			       &cstruct))) {
@@ -5843,11 +5860,11 @@ MyBeforeProc(struct cmd_syndesc *as, void *arock)
 	exit(1);
     }
     rxInitDone = 1;
-    if (as->parms[15].items)	/* -verbose flag set */
+    if (as->parms[COMMONPARM_OFFSET_VERBOSE].items)	/* -verbose flag set */
 	verbose = 1;
     else
 	verbose = 0;
-    if (as->parms[17].items)	/* -noresolve flag set */
+    if (as->parms[COMMONPARM_OFFSET_NORESOLVE].items)	/* -noresolve flag set */
 	noresolve = 1;
     else
 	noresolve = 0;
-- 
1.9.4