libelwix/src/json.c - diff

Return to json.c CVS log

Up to [ELWIX - Embedded LightWeight unIX -] / libelwix / src

version 1.1.2.6, 2017/11/28 11:14:00	version 1.1.2.7, 2017/11/28 13:42:22
Line 428 json_token2val(const char jstr, jtok_t __restrict t	Line 428 json_token2val(const char jstr, jtok_t __restrict t
if (!v)	if (!v)
return NULL;	return NULL;

AIT_SET_STRSIZ(v, tok->tok_end - tok->tok_start);	AIT_SET_STRSIZ(v, json_toklen(tok));
strncpy(AIT_GET_STR(v), jstr + tok->tok_start, AIT_LEN(v) - 1);	strncpy(AIT_GET_STR(v), json_tokstr(jstr, tok), AIT_LEN(v) - 1);

return v;	return v;
}	}
Line 450 json_token2str(const char jstr, jtok_t __restrict t	Line 450 json_token2str(const char jstr, jtok_t __restrict t
if (!jstr \|\| !tok)	if (!jstr \|\| !tok)
return NULL;	return NULL;

len = tok->tok_end - tok->tok_start;	len = json_toklen(tok);
str = e_malloc(len + 1);	str = e_malloc(len + 1);
if (!str)	if (!str)
return NULL;	return NULL;
else {	else {
strncpy(str, jstr + tok->tok_start, len);	strncpy(str, json_tokstr(jstr, tok), len);
str[len] = 0;	str[len] = 0;
}	}