From: Greg Hazel Date: Fri, 4 Jan 2013 00:54:04 +0000 (-0800) Subject: rename _errno X-Git-Tag: json-c-0.11-20130402~21^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F60%2Fhead;p=thirdparty%2Fjson-c.git rename _errno --- diff --git a/json_util.c b/json_util.c index 79ae5c70..4030cbef 100644 --- a/json_util.c +++ b/json_util.c @@ -147,14 +147,14 @@ int json_parse_int64(const char *buf, int64_t *retval) int64_t num64; const char *buf_skip_space; int orig_has_neg; - int _errno; + int saved_errno; errno = 0; // sscanf won't always set errno, so initialize if (sscanf(buf, "%" SCNd64, &num64) != 1) { MC_DEBUG("Failed to parse, sscanf != 1\n"); return 1; } - _errno = errno; + saved_errno = errno; buf_skip_space = buf; orig_has_neg = 0; // Skip leading spaces @@ -171,7 +171,7 @@ int json_parse_int64(const char *buf, int64_t *retval) if (buf_skip_space[0] == '0' && buf_skip_space[1] == '\0') orig_has_neg = 0; // "-0" is the same as just plain "0" - if (_errno != ERANGE) + if (saved_errno != ERANGE) { char buf_cmp[100]; char *buf_cmp_start = buf_cmp; @@ -199,10 +199,10 @@ int json_parse_int64(const char *buf, int64_t *retval) ) ) { - _errno = ERANGE; + saved_errno = ERANGE; } } - if (_errno == ERANGE) + if (saved_errno == ERANGE) { if (orig_has_neg) num64 = INT64_MIN;