src/hg/instinct/lib/json.c 1.7
1.7 2010/04/23 20:51:50 sbenz
Fixed string representation in keys, need to be double quoted strings according to strict spec
Index: src/hg/instinct/lib/json.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/instinct/lib/json.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -b -B -U 4 -r1.6 -r1.7
--- src/hg/instinct/lib/json.c 10 Feb 2010 21:38:11 -0000 1.6
+++ src/hg/instinct/lib/json.c 23 Apr 2010 20:51:50 -0000 1.7
@@ -14,9 +14,9 @@
static char const rcsid[] = "$Id$";
void jsonWarning(char *format, va_list args)
{
-printf("{ 'warning' : \"");
+printf("{ \"warning\" : \"");
/* newline characters screws up JSON parser, so remove any that may be in format str*/
format = replaceChars(format, "\n", " ");
@@ -36,9 +36,9 @@
void jsonEarlyWarningHandler(char *format, va_list args)
{ /* send error to client via JSON-formatted object, to avoid parsing error */
-printf("{ 'err' : \"");
+printf("{ \"err\" : \"");
/* newline characters screws up JSON parser, so remove any that may be in format str*/
format = replaceChars(format, "\n", " ");
@@ -73,9 +73,9 @@
{
if (!jo)
return;
struct slInt *sl = jo->data;
-dyStringPrintf(dy, "'%s' : %d", jo->name, sl->val);
+dyStringPrintf(dy, "\"%s\" : %d", jo->name, sl->val);
}
/* Add single integer */
void jsonAddInt(struct json *js, char *name, int val)
@@ -94,9 +94,9 @@
if (!jo)
return;
if (jo->name)
- dyStringPrintf(dy, "'%s' : ", jo->name);
+ dyStringPrintf(dy, "\"%s\" : ", jo->name);
dyStringPrintf(dy, "[");
struct slInt *sl, *slList = jo->data;
@@ -123,9 +123,9 @@
{
if (!jo)
return;
struct slDouble *sl = jo->data;
-dyStringPrintf(dy, "'%s' : %f", jo->name, sl->val);
+dyStringPrintf(dy, "\"%s\" : %f", jo->name, sl->val);
}
/* Add single double */
void jsonAddDouble(struct json *js, char *name, double val)
@@ -144,9 +144,9 @@
if (!jo)
return;
if (jo->name)
- dyStringPrintf(dy, "'%s' : ", jo->name);
+ dyStringPrintf(dy, "\"%s\" : ", jo->name);
dyStringPrintf(dy, "[");
struct slDouble *sl, *slList = jo->data;
@@ -175,11 +175,11 @@
return;
char *str = jo->data;
if (str)
- dyStringPrintf(dy, "'%s' : \"%s\"", jo->name, str);
+ dyStringPrintf(dy, "\"%s\" : \"%s\"", jo->name, str);
else
- dyStringPrintf(dy, "'%s' : \"\"", jo->name);
+ dyStringPrintf(dy, "\"%s\" : \"\"", jo->name);
}
/* Add string -- makes local copy */
void jsonAddString(struct json *js, char *name, char *str)
@@ -196,9 +196,9 @@
if (!jo)
return;
if (jo->name)
- dyStringPrintf(dy, "'%s' : ", jo->name);
+ dyStringPrintf(dy, "\"%s\" : ", jo->name);
dyStringPrintf(dy, "[");
struct slName *sl, *slList = jo->data;
@@ -244,9 +244,9 @@
struct json *js = jo->data;
if (!js)
return;
-dyStringPrintf(dy, "'%s' : ", jo->name);
+dyStringPrintf(dy, "\"%s\" : ", jo->name);
slReverse(&js->objects);
appendObjects(js->objects, dy);
}
@@ -272,9 +272,9 @@
struct json *js, *jsList = jo->data;
if (!jsList)
return;
-dyStringPrintf(dy, "'%s' : [", jo->name);
+dyStringPrintf(dy, "\"%s\" : [", jo->name);
for (js = jsList; js; js = js->next)
{
slReverse(&js->objects);
appendObjects(js->objects, dy);