X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fconfigfile.c;h=0e54f267f9fdd08c15d4d4d11a427f409d708723;hb=26e01e52629e0894e34ad3deb6c9fc921d145443;hp=044180ee83a3aa646ec49406e09c7836563716cb;hpb=4088bccc40644f45971304f4c73bc40dcfb87957;p=collectd.git

diff --git a/src/configfile.c b/src/configfile.c
index 044180ee..0e54f267 100644
--- a/src/configfile.c
+++ b/src/configfile.c
@@ -109,8 +109,8 @@ static cf_global_option_t cf_global_options[] =
 	{"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"},
@@ -922,27 +922,17 @@ long global_option_get_long (const char *option, long default_value)
 		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 */
-
-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);
+		value = strtol (str, /* endptr = */ NULL, /* base = */ 0);
+		if (errno != 0)
+			return (default_value);
 
-} /* char *global_option_get_long_in_range */
+		return (value);
+} /* char *global_option_get_long */
 
 cdtime_t cf_get_default_interval (void)
 {