Changeset 9876 for branches

Timestamp:

Jan 4, 2010, 10:28:42 PM (13 years ago)

Author:

charles

Message:

(1.7x libT) backport to 1.7x branch: r9480 #2554 "JSON_int_t won't use "long long int" unless STDC_VERSION is defined"

Location:

branches/1.7x/libtransmission

Files:

• JSON_parser.c (modified) (1 diff)
• JSON_parser.h (modified) (1 diff)

branches/1.7x/libtransmission/JSON_parser.c

@@ -501 +501 @@
                 case JSON_T_INTEGER:
                     arg = &value;
-                    sscanf(jc->parse_buffer, JSON_PARSER_INTEGER_SSCANF_TOKEN, &value.vu.integer_value);
+                    value.vu.integer_value = evutil_strtoll( jc->parse_buffer, NULL, 10 );
                     break;
                 case JSON_T_STRING:

branches/1.7x/libtransmission/JSON_parser.h

@@ -19 +19 @@
 
 /* Determine the integer type use to parse non-floating point numbers */
-#if __STDC_VERSION__ >= 199901L || HAVE_LONG_LONG == 1
-typedef long long JSON_int_t;
-#define JSON_PARSER_INTEGER_SSCANF_TOKEN "%lld"
-#define JSON_PARSER_INTEGER_SPRINTF_TOKEN "%lld"
-#else 
-typedef long JSON_int_t;
-#define JSON_PARSER_INTEGER_SSCANF_TOKEN "%ld"
-#define JSON_PARSER_INTEGER_SPRINTF_TOKEN "%ld"
-#endif
+#include <evutil.h>
+typedef ev_int64_t JSON_int_t;