src/hg/instinct/lib/json.c 1.6
1.6 2010/02/10 21:38:11 jsanborn
cleaned up
Index: src/hg/instinct/lib/json.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/instinct/lib/json.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -b -B -U 4 -r1.5 -r1.6
--- src/hg/instinct/lib/json.c 10 Feb 2010 21:35:35 -0000 1.5
+++ src/hg/instinct/lib/json.c 10 Feb 2010 21:38:11 -0000 1.6
@@ -14,16 +14,14 @@
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", " ");
vfprintf(stdout, format, args);
-//printf("\"})");
printf("\"}");
exit(-1);
}
@@ -38,16 +36,14 @@
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", " ");
vfprintf(stdout, format, args);
-//printf("\"})");
printf("\"}");
exit(-1);
}
@@ -226,10 +222,8 @@
/* Append objects in container (whatever they may be) to growing string */
void appendObjects(struct jsonObject *joList, struct dyString *dy)
{
-//if (!joList)
-// return;
dyStringPrintf(dy, "{");
struct jsonObject *jo;
for (jo = joList; jo; jo = jo->next)
@@ -320,11 +314,9 @@
slReverse(&js->objects);
struct dyString *dy = newDyString(100);
-//dyStringPrintf(dy, "(");
appendObjects(js->objects, dy);
-//dyStringPrintf(dy, ")");
return dy->string;
}