1d76bf881d3e18580739e44698a0d1a499c2f9f1 hiram Fri Oct 2 10:31:39 2015 -0700 fixup gcc warnings for -Wunused-but-set-variable refs #16121 diff --git src/lib/options.c src/lib/options.c index 4d07d0a..a368267 100644 --- src/lib/options.c +++ src/lib/options.c @@ -34,68 +34,67 @@ optionSpecs += 1; } return NULL; } static void validateOption(char *name, char *val, struct optionSpec *optionSpecs) /* validate an option against a list of values */ { char *valEnd; struct optionSpec *optionSpec = matchingOption(name, optionSpecs); if (optionSpec == NULL) optionSpec = matchingOption(name, commonOptions); if (optionSpec == NULL) errAbort("-%s is not a valid option", name); -long long discardMe = 0; switch (optionSpec->flags & OPTION_TYPE_MASK) { case OPTION_BOOLEAN: if (val != NULL) errAbort("boolean option -%s must not have value", name); break; case OPTION_STRING: if (val == NULL) errAbort("string option -%s must have a value", name); break; case OPTION_INT: if (val == NULL) errAbort("int option -%s must have a value", name); - discardMe = strtol(val, &valEnd, 10); + (void) strtol(val, &valEnd, 10); // ignore return if ((*val == '\0') || (*valEnd != '\0')) errAbort("value of -%s is not a valid integer: \"%s\"", name, val); break; case OPTION_LONG_LONG: if (val == NULL) errAbort("int option -%s must have a value", name); - discardMe = strtoll(val, &valEnd, 10); + (void) strtoll(val, &valEnd, 10); // ignore return if ((*val == '\0') || (*valEnd != '\0')) errAbort("value of -%s is not a valid long long: \"%s\"", name, val); break; case OPTION_FLOAT: if (val == NULL) errAbort("float option -%s must have a value", name); - discardMe = (long long)strtod(val, &valEnd); + (void) (long long)strtod(val, &valEnd); // ignore return if ((*val == '\0') || (*valEnd != '\0')) errAbort("value of -%s is not a valid float: \"%s\"", name, val); break; case OPTION_DOUBLE: if (val == NULL) errAbort("double option -%s must have a value", name); - discardMe = (long long)strtod(val, &valEnd); + (void) (long long)strtod(val, &valEnd); // ignore return if ((*val == '\0') || (*valEnd != '\0')) errAbort("value of -%s is not a valid double: \"%s\"", name, val); break; default: errAbort("bug: invalid type in optionSpec for %s", optionSpec->name); } } static void parseMultiOption(struct hash *hash, char *name, char* val, struct optionSpec *spec) /* process multiple instances of an option, requres that the optionSpec of the option */ { struct slName *valList; switch (spec->flags & OPTION_TYPE_MASK) {