From 4e7a71da4b55950d2e267118681ca7e04f019573 Mon Sep 17 00:00:00 2001 From: midipix Date: Sun, 29 Nov 2015 08:41:17 -0500 Subject: conformance fixes: optimized build: variable initialization and default values. --- src/internal/argv/argv.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'src/internal/argv') diff --git a/src/internal/argv/argv.h b/src/internal/argv/argv.h index 14146ed..36615f6 100644 --- a/src/internal/argv/argv.h +++ b/src/internal/argv/argv.h @@ -619,6 +619,8 @@ static void argv_usage( char * paradigm; char * buf; size_t buflen; + const char * sdescription; + const char * sargname; const char indent[] = " "; const int rblen = sizeof("}") - sizeof(char); @@ -684,6 +686,7 @@ static void argv_usage( paradigm = next_para = buf = 0; fnewline = false; rparalen = 0; + mparalen = 0; for (option=options,buflen=0,rdesclen=1; option->short_name || option->long_name; option++) { if (option->paradigm) { @@ -693,10 +696,13 @@ static void argv_usage( rparalen = strlen(option->paradigm) - 2*rblen; } + sdescription = option->description ? option->description : ""; + sargname = option->argname ? option->argname : ""; + if (option->paradigm) - rdesclen = snprintf(buf,buflen,option->description,option->paradigm); + rdesclen = snprintf(buf,buflen,sdescription,option->paradigm); else - rdesclen = snprintf(buf,buflen,option->description,option->argname); + rdesclen = snprintf(buf,buflen,sdescription,sargname); if (fnewline) (void)0; -- cgit v1.2.3