f831c24a1fe02c30fe4ffb086d2bac1fc8ee5820 andypohl Tue Oct 29 12:43:58 2013 +0100 A couple of things that broke compilation diff --git src/lib/options.c src/lib/options.c index 2144694..4d07d0a 100644 --- src/lib/options.c +++ src/lib/options.c @@ -129,31 +129,31 @@ if (!((eqPtr != NULL) || (arg[0] == '-'))) return FALSE; /* not an option */ /* A dash by itself is not an option. It can mean * negative strand for some of the DNA oriented utilities. */ if (arg[0] == '-' && (arg[1] == 0 || isspace(arg[1]))) return FALSE; if ((keepNumbers) && (arg[0] == '-')) { int i = 1; int num_dec = 0; int num_dig = 0; int num_other = 0; - while (i < strlen(arg) + while (i < strlen(arg)) { if (isdigit(arg[i])) num_dig++; else if (arg[i] == '.') num_dec++; else num_other++; i++; } if ((num_dig > 0) && (num_dec < 2) && (num_other == 0)) return FALSE; } /* We treat this=that as an option only if the '=' happens before any non-alphanumeric * characters. This lets us have URLs and SQL statements in the command line even though @@ -243,31 +243,31 @@ return hash; } struct hash *optionParseIntoHash(int *pArgc, char *argv[], boolean justFirst) /* Read options in command line (only up to first real argument) into * options hash. Options come in three forms: * -option words starting with dash * option=val words with = in the middle * -option=val combining the two. * The resulting hash will be keyed by the option name with the val * string for value. For '-option' types the value is 'on'. */ { return parseOptions(pArgc, argv, justFirst, NULL, FALSE); } -struct hash *optionParseIntoHashExceptNumbers(int *pArgc, char *argv[], boolean justFirst); +struct hash *optionParseIntoHashExceptNumbers(int *pArgc, char *argv[], boolean justFirst) /* Read options in argc/argv into a hash (except negative numbers) of your own choosing. */ { return parseOptions(pArgc, argv, justFirst, NULL, TRUE); } static struct hash *options = NULL; static struct optionSpec *optionSpecification = NULL; static void setOptions(struct hash *hash) /* Set global options hash to hash, and also do processing * of log file and other common options. */ { options = hash; if (optionExists("verbose")) verboseSetLevel(optionInt("verbose", 0));