From 64b255327dc6c2456ba4d4e28651b07819710a60 Mon Sep 17 00:00:00 2001 From: Michael Meffie Date: Mon, 30 May 2011 14:23:49 -0400 Subject: [PATCH] cmd: Reorder cmd_AddParmAtOffset arguments Reorder the arguments of this recently introduced function to make client code more readable. Change-Id: I37f662f849bd96176230f75783e2a1c62d94b8c9 Reviewed-on: http://gerrit.openafs.org/4755 Tested-by: BuildBot Reviewed-by: Simon Wilkinson Reviewed-by: Jeffrey Altman --- src/cmd/cmd.c | 6 +++--- src/cmd/cmd.p.h | 4 ++-- tests/cmd/command-t.c | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/cmd/cmd.c b/src/cmd/cmd.c index 4362ba0af..d0e634102 100644 --- a/src/cmd/cmd.c +++ b/src/cmd/cmd.c @@ -529,8 +529,8 @@ cmd_Seek(struct cmd_syndesc *as, int apos) } int -cmd_AddParmAtOffset(struct cmd_syndesc *as, char *aname, int atype, - afs_int32 aflags, char *ahelp, int ref) +cmd_AddParmAtOffset(struct cmd_syndesc *as, int ref, char *aname, int atype, + afs_int32 aflags, char *ahelp) { struct cmd_parmdesc *tp; @@ -566,7 +566,7 @@ cmd_AddParm(struct cmd_syndesc *as, char *aname, int atype, if (as->nParms >= CMD_MAXPARMS) return CMD_EXCESSPARMS; - return cmd_AddParmAtOffset(as, aname, atype, aflags, ahelp, as->nParms++); + return cmd_AddParmAtOffset(as, as->nParms++, aname, atype, aflags, ahelp); } int diff --git a/src/cmd/cmd.p.h b/src/cmd/cmd.p.h index 75c294523..3193d56de 100644 --- a/src/cmd/cmd.p.h +++ b/src/cmd/cmd.p.h @@ -74,8 +74,8 @@ extern int cmd_CreateAlias(struct cmd_syndesc *as, char *aname); extern int cmd_Seek(struct cmd_syndesc *as, int apos); extern int cmd_AddParm(struct cmd_syndesc *as, char *aname, int atype, afs_int32 aflags, char *ahelp); -extern int cmd_AddParmAtOffset(struct cmd_syndesc *as, char *name, int atype, - afs_int32 aflags, char *ahelp, int ref); +extern int cmd_AddParmAtOffset(struct cmd_syndesc *as, int ref, char *name, + int atype, afs_int32 aflags, char *ahelp); extern int cmd_AddParmAlias(struct cmd_syndesc *as, int pos, char *alias); extern int cmd_Dispatch(int argc, char **argv); extern int cmd_FreeArgv(char **argv); diff --git a/tests/cmd/command-t.c b/tests/cmd/command-t.c index b576048f4..846a8543d 100644 --- a/tests/cmd/command-t.c +++ b/tests/cmd/command-t.c @@ -187,10 +187,10 @@ main(int argc, char **argv) cmd_FreeOptions(&retopts); cmd_FreeArgv(tv); /* Try adding a couple of parameters at specific positions */ - cmd_AddParmAtOffset(opts, "-fifth", CMD_SINGLE, CMD_OPTIONAL, - "fifth option", FIFTH_OFF); - cmd_AddParmAtOffset(opts, "-fourth", CMD_SINGLE, CMD_OPTIONAL, - "fourth option", FOURTH_OFF); + cmd_AddParmAtOffset(opts, FIFTH_OFF, "-fifth", CMD_SINGLE, CMD_OPTIONAL, + "fifth option"); + cmd_AddParmAtOffset(opts, FOURTH_OFF, "-fourth", CMD_SINGLE, CMD_OPTIONAL, + "fourth option" ); code = cmd_ParseLine("-first a -fourth b -fifth c", tv, &tc, 100); is_int(0, code, "cmd_ParseLine succeeds"); code = cmd_Parse(tc, tv, &retopts); -- 2.39.5