{"Interval", NULL, NULL},
{"ReadThreads", NULL, "5"},
{"WriteThreads", NULL, "5"},
- {"WriteQueueLengthLimitHigh", NULL, NULL},
- {"WriteQueueLengthLimitLow", NULL, NULL},
+ {"WriteQueueLimitHigh", NULL, NULL},
+ {"WriteQueueLimitLow", NULL, NULL},
{"Timeout", NULL, "2"},
{"AutoLoadPlugin", NULL, "false"},
{"PreCacheChain", NULL, "PreCache"},
if (i >= cf_global_options_num)
return (-1);
+ if (strcasecmp (option, "PIDFile") == 0 && pidfile_from_cli == 1)
+ {
+ DEBUG ("Configfile: Ignoring `PIDFILE' option because "
+ "command-line option `-P' take precedence.");
+ return (0);
+ }
+
sfree (cf_global_options[i].value);
if (value != NULL)
const char *str;
long value;
- str = global_option_get(option);
- if(NULL == str) return(default_value);
+ str = global_option_get (option);
+ if (NULL == str)
+ return (default_value);
errno = 0;
- value = strtol(str, NULL, 10);
- if (errno == ERANGE && (value == LONG_MAX || value == LONG_MIN)) return(default_value);
- if (errno != 0 && value == 0) return(default_value);
- return(value);
-} /* char *global_option_get_long */
+ value = strtol (str, /* endptr = */ NULL, /* base = */ 0);
+ if (errno != 0)
+ return (default_value);
-long global_option_get_long_in_range (const char *option, long default_value, long min, long max)
-{
- long value;
-
- assert(min < max);
- value = global_option_get_long(option, default_value);
- if(value < min) return(default_value);
- if(value > max) return(default_value);
- return(value);
-
-} /* char *global_option_get_long_in_range */
+ return (value);
+} /* char *global_option_get_long */
cdtime_t cf_get_default_interval (void)
{