Changeset 2116

Timestamp:

06/16/09 11:52:29 (15 months ago)

Author:

drobilla

Message:

Don't kludge locale around queries.

Location:

trunk/slv2/src

Files:

• query.c (modified) (1 diff)
• scalepoint.c (modified) (1 diff)
• value.c (modified) (4 diffs)

trunk/slv2/src/query.c

@@ -146 +146 @@
         }
 
-        // Reset numeric locale to correctly interpret turtle numeric constants
-        char* locale = strdup(setlocale(LC_NUMERIC, NULL));
-        setlocale(LC_NUMERIC, "POSIX");
-
         librdf_query_results* results = librdf_query_execute(query, plugin->rdf);
-
-        // Restore numeric locale
-        setlocale(LC_NUMERIC, locale);
-
-        free(locale);
 
         librdf_free_query(query);

trunk/slv2/src/scalepoint.c

@@ -22 +22 @@
 #include <string.h>
 #include <assert.h>
-#include <locale.h>
 #include <raptor.h>
 #include "slv2/types.h"

trunk/slv2/src/value.c

@@ -33 +33 @@
 slv2_value_set_numerics_from_string(SLV2Value val)
 {
-        // FIXME: locale kludges to work around librdf bug
+        // FIXME: locale kludge, need a locale independent strtol and strtod
         char* locale = strdup(setlocale(LC_NUMERIC, NULL));
 
@@ -228 +228 @@
         size_t len    = 0;
         char*  result = NULL;
-        char*  locale = strdup(setlocale(LC_NUMERIC, NULL));
-
-        // FIXME: locale kludges to work around librdf bug
+        char*  locale = NULL;
 
         switch (value->type) {
@@ -244 +242 @@
         case SLV2_VALUE_INT:
             // INT64_MAX is 9223372036854775807 (19 digits) + 1 for sign
+            // FIXME: locale kludge, need a locale independent snprintf
+            locale = strdup(setlocale(LC_NUMERIC, NULL));
                 len = 20;
                 result = calloc(len, sizeof(char));
@@ -251 +251 @@
                 break;
         case SLV2_VALUE_FLOAT:
+            // FIXME: locale kludge, need a locale independent snprintf
+            locale = strdup(setlocale(LC_NUMERIC, NULL));
                 len = 20; // FIXME: proper maximum value?
                 result = calloc(len, sizeof(char));