Merge cleanup changes. (FSF address fix, and using GLib variants of some

functions which cleans up compiler warnings.)

1 files changed, 4 insertions, 4 deletions

diff --git a/lib/json.c b/lib/json.c
index 91f38ad4..2e0c50c1 100644
--- a/lib/json.c
+++ b/lib/json.c
@@ -52,7 +52,7 @@ typedef unsigned int json_uchar;
 
 static unsigned char hex_value (json_char c)
 {
-   if (isdigit(c))
+   if (g_ascii_isdigit(c))
       return c - '0';
 
    switch (c) {
@@ -608,14 +608,14 @@ json_value * json_parse_ex (json_settings * settings,
 
                      default:
 
-                        if (isdigit (b) || b == '-')
+                        if (g_ascii_isdigit (b) || b == '-')
                         {
                            if (!new_value (&state, &top, &root, &alloc, json_integer))
                               goto e_alloc_failure;
 
                            if (!state.first_pass)
                            {
-                              while (isdigit (b) || b == '+' || b == '-'
+                              while (g_ascii_isdigit (b) || b == '+' || b == '-'
                                         || b == 'e' || b == 'E' || b == '.')
                               {
                                  if ( (++ i) == end)
@@ -705,7 +705,7 @@ json_value * json_parse_ex (json_settings * settings,
             case json_integer:
             case json_double:
 
-               if (isdigit (b))
+               if (g_ascii_isdigit (b))
                {
                   ++ num_digits;