X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=string.c;h=c820bdca3fd1ca37695354aa03024b4d384da765;hb=642445e95fea1c548c79f80ad3b5d6f30ba572f3;hp=f8b64b77c08d0c109c62129bdfeac04b775b3d6b;hpb=6e0b28e02a1013c019a3225e922b71f913bfbae4;p=paraslash.git

diff --git a/string.c b/string.c
index f8b64b77..c820bdca 100644
--- a/string.c
+++ b/string.c
@@ -562,10 +562,18 @@ int para_atoi64(const char *str, int64_t *value)
 	tmp = strtoll(str, &endptr, 10);
 	if (errno == ERANGE && (tmp == LLONG_MAX || tmp == LLONG_MIN))
 		return -E_ATOI_OVERFLOW;
-	if (errno != 0 && tmp == 0) /* other error */
-		return -E_STRTOLL;
+	/*
+	 * If there were no digits at all, strtoll() stores the original value
+	 * of str in *endptr.
+	 */
 	if (endptr == str)
 		return -E_ATOI_NO_DIGITS;
+	/*
+	 * The implementation may also set errno and return 0 in case no
+	 * conversion was performed.
+	 */
+	if (errno != 0 && tmp == 0)
+		return -E_ATOI_NO_DIGITS;
 	if (*endptr != '\0') /* Further characters after number */
 		return -E_ATOI_JUNK_AT_END;
 	*value = tmp;
@@ -625,7 +633,7 @@ int get_loglevel_by_name(const char *txt)
 		return LL_CRIT;
 	if (loglevel_equal(txt, "emerg"))
 		return LL_EMERG;
-	return -1;
+	return -E_BAD_LL;
 }
 
 static int get_next_word(const char *buf, const char *delim, char **word)