changed referenced from "long double" back to "double" for backwards compatibility

git-svn-id: svn://svn.open-ils.org/OpenSRF/branches/new-json2@1040 9efc2488-bf62-4759-914b-345cdb29e865

diff --git a/include/opensrf/osrf_json.h b/include/opensrf/osrf_json.h
index 5f2ad7a..6c6e489 100644 (file)
--- a/include/opensrf/osrf_json.h
+++ b/include/opensrf/osrf_json.h
@@ -94,7 +94,7 @@ struct jsonParserHandlerStruct {
        void (*handleNull)                      (void* userData);
        void (*handleString)                    (void* userData, char* string);
        void (*handleBool)                      (void* userData, int boolval);
-       void (*handleNumber)                    (void* userData, long double num);
+       void (*handleNumber)                    (void* userData, double num);
        void (*handleError)                     (void* userData, char* err, ...);
 };
 typedef struct jsonParserHandlerStruct jsonParserHandler;
@@ -109,7 +109,8 @@ struct _jsonObjectStruct {
                osrfList*       l;              /* array container */
                char*           s;              /* string */
                int                     b;              /* bool */
-               long double     n;              /* number */
+//             double  n;              /* number */
+               double  n;              /* number */
        } value;
 };
 typedef struct _jsonObjectStruct jsonObject;
@@ -186,7 +187,7 @@ jsonObject* jsonNewObjectType(int type);
 /**
  * Creates a new number object
  */
-jsonObject* jsonNewNumberObject( long double num );
+jsonObject* jsonNewNumberObject( double num );
 
 
 /**
@@ -284,7 +285,7 @@ unsigned long jsonObjectRemoveKey( jsonObject* dest, const char* key);
        is a string.  Otherwise returns NULL*/
 char* jsonObjectGetString(const jsonObject*);
 
-long double jsonObjectGetNumber( const jsonObject* obj );
+double jsonObjectGetNumber( const jsonObject* obj );
 
 /* sets the string data */
 void jsonObjectSetString(jsonObject* dest, const char* string);

diff --git a/include/opensrf/osrf_json_utils.h b/include/opensrf/osrf_json_utils.h
index 76af666..db3c1aa 100644 (file)
--- a/include/opensrf/osrf_json_utils.h
+++ b/include/opensrf/osrf_json_utils.h
@@ -70,7 +70,7 @@ void _jsonHandleEndArray(void*);
 void _jsonHandleNull(void*);
 void _jsonHandleString(void*, char* string);
 void _jsonHandleBool(void*, int boolval);
-void _jsonHandleNumber(void*, long double num);
+void _jsonHandleNumber(void*, double num);
 void _jsonHandleError(void*, char* str, ...);
 
 struct jsonInternalParserStruct {

diff --git a/src/libopensrf/osrf_json_object.c b/src/libopensrf/osrf_json_object.c
index 4cdaaef..a4914c6 100644 (file)
--- a/src/libopensrf/osrf_json_object.c
+++ b/src/libopensrf/osrf_json_object.c
@@ -45,7 +45,7 @@ jsonObject* jsonNewObjectFmt(const char* data, ...) {
        return o;
 }
 
-jsonObject* jsonNewNumberObject( long double num ) {
+jsonObject* jsonNewNumberObject( double num ) {
        jsonObject* o = jsonNewObject(NULL);
        o->type = JSON_NUMBER;
        o->value.n = num;
@@ -151,14 +151,14 @@ char* jsonObjectToJSONRaw( const jsonObject* obj ) {
                        break;
 
                case JSON_NUMBER: {
-                       long double x = obj->value.n;
+                       double x = obj->value.n;
                        if( x == (long) x ) {
                                LONG_TO_STRING((long)x);        
                                OSRF_BUFFER_ADD(buf, LONGSTR);
 
                        } else {
-                               LONG_DOUBLE_TO_STRING(x);
-                               OSRF_BUFFER_ADD(buf, LONGDOUBLESTR);
+                               DOUBLE_TO_STRING(x);
+                               OSRF_BUFFER_ADD(buf, DOUBLESTR);
                        }
                        break;
                }
@@ -288,7 +288,7 @@ char* jsonObjectGetString(const jsonObject* obj) {
        return (obj && obj->type == JSON_STRING) ? obj->value.s : NULL;
 }
 
-long double jsonObjectGetNumber( const jsonObject* obj ) {
+double jsonObjectGetNumber( const jsonObject* obj ) {
        return (obj && obj->type == JSON_NUMBER) ? obj->value.n : 0;
 }
 
@@ -379,8 +379,8 @@ char* jsonObjectToSimpleString( const jsonObject* o ) {
                                value = strdup(LONGSTR);
 
                        } else {
-                               LONG_DOUBLE_TO_STRING(o->value.n);
-                               value = strdup(LONGDOUBLESTR);
+                               DOUBLE_TO_STRING(o->value.n);
+                               value = strdup(DOUBLESTR);
                        }
 
                        break;

diff --git a/src/libopensrf/osrf_json_parser.c b/src/libopensrf/osrf_json_parser.c
index aff24a9..0837652 100644 (file)
--- a/src/libopensrf/osrf_json_parser.c
+++ b/src/libopensrf/osrf_json_parser.c
@@ -319,7 +319,7 @@ int _jsonParserHandleNumber( jsonParserContext* ctx ) {
 
        /* make me more strict */
        char* err = NULL;
-       long double d = strtod(ctx->buffer->buf, &err);
+       double d = strtod(ctx->buffer->buf, &err);
        if(err && err[0] != '\0') 
                return _jsonParserError(ctx, "Invalid number sequence");
        JSON_STATE_REMOVE(ctx, JSON_STATE_IN_NUMBER);
@@ -586,7 +586,7 @@ void _jsonHandleBool(void* ctx, int boolval) {
        _jsonInsertParserItem(p, obj);
 }
 
-void _jsonHandleNumber(void* ctx, long double num) {
+void _jsonHandleNumber(void* ctx, double num) {
        jsonInternalParser* p = (jsonInternalParser*) ctx;
        _jsonInsertParserItem(p, jsonNewNumberObject(num));
 }