^o^ cleaned~

[16.git] / src / lib / mapread.c

diff --git a/src/lib/mapread.c b/src/lib/mapread.c
index 4e513eb4d661059170ff812690fa3e659ad92b2c..f1e7c571dae2b4198ec9d028081412365221a0df 100644 (file)
--- 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;\r
                        map->tiles->rows = 1;\r
                        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,10 +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 = &buf;
        static char js_ss[16];
 
        jsmn_parser p;
@@ -161,21 +161,16 @@ int loadmap(char *mn, map_t *map)
                                return 2;
                        }
                }
-               jz = realloc(jz, jslen + r + 1);
-               //js = _frealloc(js, jslen + r + 1);
-               if (jz == NULL) {
-                       fprintf(stderr, "*js=%s\n", *js);
-                       fprintf(stderr, "*jz=%s\n", *jz);
+               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("_fstrncpy~\n");
-               strncpy(jz + jslen, buf, r);
-               //printf("_fstrncpy okies~~\n");
+               _fstrncpy(js + jslen, &(*buff), r);
                jslen = jslen + r;
 
 again:
-               js = (char huge *)*jz;
                r = jsmn_parse(&p, js, jslen, tok, tokcount);
                if (r < 0) {
                        if (r == JSMN_ERROR_NOMEM) {
@@ -188,15 +183,25 @@ again:
                                goto again;
                        }
                } else {
-                       //printf("*buff=[\n%s\n]\n", *buff);
-                       //printf("buff=[\n%Fp\n]\n", buff);
+                       //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)=[\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;