switch to size_t and more paranoid compiler flags

Author: quartzjer

Makefile

@@ -2,7 +2,7 @@
 all: test example
 
 test.c: test/test.c src/js0n.c
-	gcc -Wall -o test/test test/test.c src/js0n.c
+	gcc -Wall -Wextra -Wno-unused-parameter -o test/test test/test.c src/js0n.c
 
 test: test.c
 	@if ./test/test ; then \

src/js0n.c

@@ -16,14 +16,14 @@
 #define PUSH(i) if(depth == 1) { if(!index) { val = cur+i; }else{ if(klen && index == 1) start = cur+i; else index--; } }
 
 // determine if key matches or value is complete
-#define CAP(i) if(depth == 1) { if(val && !index) {*vlen = (cur+i+1) - val; return val;}; if(klen) index = (start && klen == (cur-start) && strncmp(key,start,klen)==0) ? 1 : 2;}
+#define CAP(i) if(depth == 1) { if(val && !index) {*vlen = (size_t)((cur+i+1) - val); return val;}; if(klen) index = (start && klen == (size_t)(cur-start) && strncmp(key,start,klen)==0) ? 1 : 2;}
 
 // this makes a single pass across the json bytes, using each byte as an index into a jump table to build an index and transition state
-char *js0n(char *key, int klen, char *json, int jlen, int *vlen)
+char *js0n(char *key, size_t klen, char *json, size_t jlen, size_t *vlen)
 {
 	char *val = 0;
 	char *cur, *end, *start;
-	int index = 1;
+	size_t index = 1;
 	int depth = 0;
 	int utf8_remain = 0;
 	static void *gostruct[] = 
@@ -77,7 +77,6 @@ char *js0n(char *key, int klen, char *json, int jlen, int *vlen)
 	// no key is array mode, klen provides requested index
 	if(!key)
 	{
-		if(klen < 0) return 0;
 		index = klen;
 		klen = 0;
 	}else{
@@ -159,4 +158,4 @@ char *js0n(char *key, int klen, char *json, int jlen, int *vlen)
 
 #if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6))
 #pragma GCC diagnostic pop
-#endif
+#endif

src/js0n.h

@@ -5,4 +5,4 @@
 // vlen = where to store return value length
 // returns pointer to value and sets len to value length, or 0 if not found
 // any parse error will set vlen to the position of the error
-char *js0n(char *key, int klen, char *json, int jlen, int *vlen);
+char *js0n(char *key, size_t klen, char *json, size_t jlen, size_t *vlen);

test/example.c

@@ -5,17 +5,17 @@
 
 void ex1(void)
 {
-	int vlen = 0;
+	size_t vlen = 0;
 
 	char *json = "{\"foo\":\"bar\",\"barbar\":[1,2,3],\"obj\":{\"a\":\"b\"}}";
 	printf("parsing '%s'\n", json);
 	char *val = js0n("barbar", 0, json, strlen(json), &vlen);
-	printf("returned %.*s\n",vlen,val);
+	printf("returned %.*s\n",(int)vlen,val);
 
 	char *array = "[\"foo\",\"bar\",[1,2,3],{\"a\":\"b\"},42]";
 	printf("parsing '%s'\n", array);
 	val = js0n(0, 3, array, strlen(array), &vlen);
-	printf("returned %.*s\n",vlen,val);
+	printf("returned %.*s\n",(int)vlen,val);
 
 }
 

test/test.c

@@ -7,7 +7,7 @@
 int main(int argc, char **argv)
 {
 	char buff[1024], *json = NULL, *ret;
-	int len, len2, jlen=0;
+	size_t len, len2, jlen=0;
 	FILE *f;
 
 	fail_unless((f = fopen("./test/test.json","r")) != NULL);