{"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"},
/* Resize the memory containing the children to be big enough to hold
* all children. */
+ if (dst->children_num + src->children_num - 1 == 0)
+ {
+ dst->children_num = 0;
+ return (0);
+ }
+
temp = (oconfig_item_t *) realloc (dst->children,
sizeof (oconfig_item_t)
* (dst->children_num + src->children_num - 1));
return (-1);
/* Now replace the i'th child in `root' with `new'. */
- cf_ci_replace_child (root, new, i);
+ if (cf_ci_replace_child (root, new, i) < 0)
+ return (-1);
/* ... and go back to the new i'th child. */
--i;
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)
{