MirrorSave
/
nodemcu-firmware
mirror of https://github.com/nodemcu/nodemcu-firmware.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix cjson.encode() when in integer version

This commit is contained in:
funshine 2015-03-18 19:37:47 +08:00
parent 3aead6d230
commit 3d14530b80
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/cjson/fpconv.c
View File

@ -35,6 +35,7 @@
#include "fpconv.h" #include "fpconv.h"
#if 0
/* Lua CJSON assumes the locale is the same for all threads within a /* Lua CJSON assumes the locale is the same for all threads within a
* process and doesn't change after initialisation. * process and doesn't change after initialisation.
* *
@ -203,6 +204,6 @@ void fpconv_init()
{ {
fpconv_update_locale(); fpconv_update_locale();
} }
#endif
/* vi:ai et sw=4 ts=4: /* vi:ai et sw=4 ts=4:
*/ */

2
app/modules/cjson.c
View File

@ -772,7 +772,7 @@ static void json_append_number(lua_State *l, json_config_t *cfg,
strbuf_ensure_empty_length(json, FPCONV_G_FMT_BUFSIZE); strbuf_ensure_empty_length(json, FPCONV_G_FMT_BUFSIZE);
// len = fpconv_g_fmt(strbuf_empty_ptr(json), num, cfg->encode_number_precision); // len = fpconv_g_fmt(strbuf_empty_ptr(json), num, cfg->encode_number_precision);
c_sprintf(strbuf_empty_ptr(json), LUA_NUMBER_FMT, num); c_sprintf(strbuf_empty_ptr(json), LUA_NUMBER_FMT, (LUA_NUMBER)num);
len = c_strlen(strbuf_empty_ptr(json)); len = c_strlen(strbuf_empty_ptr(json));
strbuf_extend_length(json, len); strbuf_extend_length(json, len);