#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;
}
/* 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.
#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);
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);
//map->data = malloc(sizeof(byte) * (t+1)->size);
map->tiles = /*_f*/malloc(sizeof(tiles_t));
//map->tiles->data = malloc(sizeof(bitmap_t));
- //fix this
- bp = bitmapLoadPcx("data/ed.pcx");
+ //fix this to be far~
+//0000 bp = bitmapLoadPcx("data/ed.pcx");
map->tiles->data = &bp;
//map->tiles->data->data = malloc((16/**2*/)*16);
//map->tiles->data->width = (16/**2*/);\r
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");
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 *)(MK_FP(FP_SEG(&buf), FP_OFF(&buf)));//(char huge *)FP_OFF(&buf);
+ char huge *buff = &buf;
static char js_ss[16];
jsmn_parser p;
return 3;
}
- //buff = _fmalloc(sizeof(buf));
-
for (;;) {
/* Read another chunk */
r = fread(buf, 1, sizeof(buf), fh);
return 2;
}
}
- //jz = realloc(jz, jslen + r + 1);
js = _frealloc(js, jslen + r + 1);
- if (/*jz == NULL || */js == NULL) {
+ if (js == NULL) {
fprintf(stderr, "*js=%Fp\n", *js);
- //fprintf(stderr, "*jz=%Fp\n", *jz);
fprintf(stderr, "realloc(): errno = %d\n", errno);
return 3;
}
- //printf("strncpy~\n");
- //strncpy(jz + jslen, buf, r);
- _fstrncpy(js + jslen, buff, r);
- //printf("strncpy okies~~\n");
+ _fstrncpy(js + jslen, &(*buff), r);
jslen = jslen + r;
again:
- //js = (char huge *)*jz;
- //printf("*js=%s\n", (*js));
r = jsmn_parse(&p, js, jslen, tok, tokcount);
if (r < 0) {
if (r == JSMN_ERROR_NOMEM) {
goto again;
}
} else {
- printf("&buf=[\n%Fp\n]\n", &buf);
- printf("&buf_seg=[\n%x\n]\n", FP_SEG(&buf));
- printf("&buf_off=[\n%x\n]\n", FP_OFF(&buf));
- printf("&buf_fp=[\n%Fp\n]\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=[\n%Fp\n]\n", buff);
- printf("*buff=[\n%Fp\n]\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;