X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fmapread.c;h=f1e7c571dae2b4198ec9d028081412365221a0df;hb=0797174ac571f1ff80ba3fa86ae362cd10864e14;hp=8b75a72cc0c605af79b5df3db0425daef057ba0d;hpb=8dc4a07247c20f31ac8a69d73fc5117052cc4a96;p=16.git

diff --git a/src/lib/mapread.c b/src/lib/mapread.c
index 8b75a72c..f1e7c571 100644
--- a/src/lib/mapread.c
+++ b/src/lib/mapread.c
@@ -1,8 +1,8 @@
 #include "src/lib/mapread.h"
 
-int jsoneq(const char huge *json, jsmntok_t huge *tok, const char *s) {
-	if (tok->type == JSMN_STRING && (int) strlen(s) == tok->end - tok->start &&
-			strncmp((char const near *)json + tok->start, s, tok->end - tok->start) == 0) {
+int jsoneq(const char huge *json, jsmntok_t huge *tok, const char huge *s) {
+	if (tok->type == JSMN_STRING && (int)_fstrlen(s) == tok->end - tok->start &&
+			_fstrncmp((char const *)json + tok->start, s, tok->end - tok->start) == 0) {
 		return 0;
 	}
 	return -1;
@@ -28,7 +28,7 @@ int dump(const char huge *js, jsmntok_t huge *t, size_t count, int indent, char
 	}
 	/* We may want to do strtol() here to get numeric value */
 	if (t->type == JSMN_PRIMITIVE) {
-		if(strstr(js_sv, "data"))
+		if(_fstrstr(js_sv, "data"))
 		{
 			/*
 				here we should recursivly call dump again here to skip over the array until we get the facking width of the map.
@@ -44,7 +44,7 @@ int dump(const char huge *js, jsmntok_t huge *t, size_t count, int indent, char
 			#endif
 		}
 		else
-		if(strstr(js_sv, "height"))
+		if(_fstrstr(js_sv, "height"))
 		{
 //----			map->height = (unsigned int)strtol(js+t->start, (char **)js+t->end, 10);
 			map->height = atoi((const char *)js+t->start);
@@ -52,7 +52,7 @@ int dump(const char huge *js, jsmntok_t huge *t, size_t count, int indent, char
 			fprintf(stdout, "indent= [%d]	", indent);
 			fprintf(stdout, "h:[%d]\n", map->height);
 			#endif
-		}else if(strstr(js_sv, "width"))
+		}else if(_fstrstr(js_sv, "width"))
 		{
 //----			map->width = (unsigned int)strtol(js+t->start, (char **)js+t->end, 10);
 			map->width = atoi((const char *)js+t->start);
@@ -82,17 +82,17 @@ int dump(const char huge *js, jsmntok_t huge *t, size_t count, int indent, char
 			map->tiles->tileWidth = 16;
 			map->tiles->rows = 1;
 			map->tiles->cols = 1;
-			strcpy(js_sv, "data");//strdup(js+t->start);//, t->end - t->start);
+			_fstrcpy(js_sv, "data");//strdup(js+t->start);//, t->end - t->start);
 		}
 		else
 		if (jsoneq(js, t, "height") == 0 && indent<=1)
 		{
-			strcpy(js_sv, "height");//strdup(js+t->start);//, t->end - t->start);
+			_fstrcpy(js_sv, "height");//strdup(js+t->start);//, t->end - t->start);
 		}else
 		if(jsoneq(js, t, "width") == 0 && indent<=1)
 		{
-			strcpy(js_sv, "width");//strdup(js+t->start);//, t->end - t->start);
-		}else strcpy(js_sv, "\0");
+			_fstrcpy(js_sv, "width");//strdup(js+t->start);//, t->end - t->start);
+		}else _fstrcpy(js_sv, "\0");
 		return 1;
 	} else if (t->type == JSMN_OBJECT) {
 		//fprintf(stdout, "\n");
@@ -124,11 +124,10 @@ int loadmap(char *mn, map_t *map)
 	int r;
 	static int incr=0;
 	int eof_expected = 0;
-	//char *jz = NULL;
 	char huge *js = NULL;
 	size_t jslen = 0;
 	char buf[BUFSIZ];
-	char huge *buff = /*(char huge *)*/&buf;//(char huge *)(MK_FP(FP_SEG(&buf), FP_OFF(&buf)));//
+	char huge *buff = &buf;
 	static char js_ss[16];
 
 	jsmn_parser p;
@@ -147,8 +146,6 @@ int loadmap(char *mn, map_t *map)
 		return 3;
 	}
 
-	//buff = _fmalloc(sizeof(buf));
-
 	for (;;) {
 		/* Read another chunk */
 		r = fread(buf, 1, sizeof(buf), fh);
@@ -164,22 +161,16 @@ int loadmap(char *mn, map_t *map)
 				return 2;
 			}
 		}
-		buff = /*(char huge *)*/&buf;
-		js = _frealloc(js, jslen + r +1);
+		js = _frealloc(js, jslen + r + 1);
 		if (js == NULL) {
 			fprintf(stderr, "*js=%Fp\n", *js);
 			fprintf(stderr, "realloc(): errno = %d\n", errno);
 			return 3;
 		}
-		//printf("strncpy~\n");
-		//strncpy(jz + jslen, buf, r);
-		if(_fstrncpy(js + jslen, buff, r) == NULL)
-			fprintf(stderr, "_fstrncpy(): errno = %d\n", errno);
-		//printf("strncpy okies~~\n");
+		_fstrncpy(js + jslen, &(*buff), r);
 		jslen = jslen + r;
 
 again:
-		//printf("(*js)=%Fp\n", (*js));
 		r = jsmn_parse(&p, js, jslen, tok, tokcount);
 		if (r < 0) {
 			if (r == JSMN_ERROR_NOMEM) {
@@ -192,22 +183,25 @@ again:
 				goto again;
 			}
 		} else {
-			printf("*js=%Fp\n", (*js));
-			printf("&buf=[%Fp]\n", &buf);
-			printf("&buf_seg=[%x]\n", FP_SEG(&buf));
-			printf("&buf_off=[%x]\n", FP_OFF(&buf));
-			printf("&buf_fp=[%Fp]\n", MK_FP(FP_SEG(&buf), FP_OFF(&buf)));
+			//printf("js=%Fp\n", (js));
+			//printf("*js=%Fp\n", (*(js)));
+			//printf("&*js=%s\n", &(*(js)));
+			//printf("&buf=[%Fp]\n", &buf);
+			//printf("&buf_seg=[%x]\n", FP_SEG(&buf));
+			//printf("&buf_off=[%x]\n", FP_OFF(&buf));
+			//printf("&buf_fp=[%Fp]\n", MK_FP(FP_SEG(&buf), FP_OFF(&buf)));
 			//printf("buf=[\n%s\n]\n", buf);
-			printf("buff=[%Fp]\n", buff);
-			printf("(*buff)=[%Fp]\n", (*buff));
+			//printf("buff=[%Fp]\n", buff);
+			//printf("(*buff)=[%Fp]\n", (*buff));
 			//printf("&(*buff)=[\n%s\n]\n", &(*buff));
 			dump(js, tok, p.toknext, incr, &js_ss, map, 0);
 			eof_expected = 1;
 		}
 	}
 
-	hfree(js);
-	hfree(tok);
+	_ffree(js);
+	_ffree(buff);
+	_ffree(tok);
 	fclose(fh);
 
 	return 0;