Changeset: 63a3a7b4b130 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=63a3a7b4b130
Modified Files:
monetdb5/modules/atoms/json_atom.c
Branch: default
Log Message:
Silence compiler
diffs (39 lines):
diff --git a/monetdb5/modules/atoms/json_atom.c
b/monetdb5/modules/atoms/json_atom.c
--- a/monetdb5/modules/atoms/json_atom.c
+++ b/monetdb5/modules/atoms/json_atom.c
@@ -788,7 +788,7 @@ str JSONrenderRowObject(BAT **bl, MalBlk
ATOMformat( tpe, p, &val);
if( strncmp(val,"nil",3) == 0)
strcpy(val,"null");
- l = strlen(name) + strlen(val);
+ l = (int)strlen(name) + (int)strlen(val);
if (l > lim-len)
row= (char*) GDKrealloc(row, lim += BUFSIZ);
snprintf(row+len,lim-len,"\"%s\":%s,", name, val);
@@ -829,7 +829,7 @@ JSONrenderobject(Client cntxt, MalBlkPtr
for( j =0; j< cnt; j++){
row = JSONrenderRowObject(bl,mb,stk,pci,j);
- l =strlen(row);
+ l =(int)strlen(row);
if (l +2 > lim-len)
row= (char*) GDKrealloc(row, lim = ((int)cnt *
l) <= lim? (int)cnt*l: lim+BUFSIZ);
strncpy(result+len,row, l+1);
@@ -865,7 +865,7 @@ str JSONrenderRowArray(BAT **bl, MalBlkP
ATOMformat( tpe, p, &val);
if( strncmp(val,"nil",3) == 0)
strcpy(val,"null");
- l = strlen(val);
+ l = (int) strlen(val);
if (l > lim-len)
row= (char*) GDKrealloc(row, lim += BUFSIZ);
snprintf(row+len,lim-len,"%s,", val);
@@ -903,7 +903,7 @@ JSONrenderarray(Client cntxt, MalBlkPtr
for( j =0; j< cnt; j++){
row = JSONrenderRowArray(bl,mb,pci,j);
- l =strlen(row);
+ l = (int)strlen(row);
if (l +2 > lim-len)
row= (char*) GDKrealloc(row, lim = ((int)cnt *
l) <= lim? (int)cnt*l: lim+BUFSIZ);
strncpy(result+len,row, l+1);
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
