From 15c80b1a92516a41d4aed8403db1485e97a7eff6 Mon Sep 17 00:00:00 2001 From: Michael Meffie Date: Fri, 22 Nov 2013 15:26:34 -0500 Subject: [PATCH] comerr: avoid comma operator Avoid unnecessary use of the comma operator in compile_et's command-line argument processing. Change-Id: If9308d211676be471f3534e144c7d90214994699 Reviewed-on: http://gerrit.openafs.org/10491 Reviewed-by: Benjamin Kaduk Reviewed-by: Marc Dionne Tested-by: Derrick Brashear Reviewed-by: Derrick Brashear --- src/comerr/compile_et.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/comerr/compile_et.c b/src/comerr/compile_et.c index c73433fce..982cabb5a 100644 --- a/src/comerr/compile_et.c +++ b/src/comerr/compile_et.c @@ -162,8 +162,8 @@ main(int argc, char **argv) p = strrchr(whoami, '/'); if (p) whoami = p + 1; - while (argv++, --argc) { - char *arg = *argv; + while (--argc) { + char *arg = *++argv; if (arg[0] != '-') { if (filename) dup_err("filenames", filename, arg); @@ -174,7 +174,8 @@ main(int argc, char **argv) debug++; else if (check_arg(lang_args, arg)) { got_language++; - arg = *++argv, argc--; + arg = *++argv; + argc--; if (!arg) usage(); if (language) @@ -201,17 +202,20 @@ main(int argc, char **argv) exit(1); } } else if (strcmp(arg, "h") == 0) { - arg = *++argv, argc--; + arg = *++argv; + argc--; if (!arg) usage(); got_include = arg; } else if (strcmp(arg, "p") == 0) { - arg = *++argv, argc--; + arg = *++argv; + argc--; if (!arg) usage(); got_prefix = arg; } else if (strcmp(arg, "v") == 0) { - arg = *++argv, argc--; + arg = *++argv; + argc--; if (arg == NULL) { fprintf(stderr, "%s: -v option requires an argument\n", whoami); -- 2.39.5