jdk-build-libs
/
json-c
Not watched
1
0
Fork 0
Code
Releases 11 Wiki evaluate Activity
Issues 0 Pull Requests 0 Datasets Model Cloudbrain HPC
Browse Source

* Fix bug with use of capital E in numbers with exponents 

Mateusz Loskot, mateusz at loskot dot net
  * Add stddef.h include



git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@19 327403b1-1117-474d-bef2-5cb71233fd97
tags/json-c-0.10-20120530
Michael Clark 18 years ago
parent
dfaf670436
commit
c8f4a6e7de
7 changed files with 11 additions and 3 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +3
    -0
      ChangeLog
  2. +2
    -1
      json_object.c
  3. +2
    -1
      json_tokener.c
  4. +1
    -1
      json_tokener.h
  5. +1
    -0
      json_util.c
  6. +1
    -0
      test1.c
  7. +1
    -0
      test2.c

+ 3
- 0
ChangeLog View File

@@ -1,6 +1,9 @@
0.8 0.8
* Add macros to enable compiling out debug code * Add macros to enable compiling out debug code
Geoffrey Young, geoff at modperlcookbook dot org Geoffrey Young, geoff at modperlcookbook dot org
* Fix bug with use of capital E in numbers with exponents
Mateusz Loskot, mateusz at loskot dot net
* Add stddef.h include


0.7 0.7
* Add escaping of backslash to json output * Add escaping of backslash to json output


+ 2
- 1
json_object.c View File

@@ -13,6 +13,7 @@


#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <stddef.h>
#include <string.h> #include <string.h>


#include "debug.h" #include "debug.h"
@@ -29,7 +30,7 @@


#define REFCOUNT_DEBUG 1 #define REFCOUNT_DEBUG 1


char *json_number_chars = "0123456789.+-e";
char *json_number_chars = "0123456789.+-eE";
char *json_hex_chars = "0123456789abcdef"; char *json_hex_chars = "0123456789abcdef";


#ifdef REFCOUNT_DEBUG #ifdef REFCOUNT_DEBUG


+ 2
- 1
json_tokener.c View File

@@ -13,6 +13,7 @@


#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <stddef.h>
#include <ctype.h> #include <ctype.h>
#include <string.h> #include <string.h>


@@ -378,7 +379,7 @@ struct json_object* json_tokener_parse_ex(struct json_tokener *tok,
case json_tokener_state_number: case json_tokener_state_number:
if(c && strchr(json_number_chars, c)) { if(c && strchr(json_number_chars, c)) {
printbuf_memappend(tok->pb, &c, 1); printbuf_memappend(tok->pb, &c, 1);
if(c == '.' || c == 'e') tok->is_double = 1;
if(c == '.' || c == 'e' || c == 'E') tok->is_double = 1;
} else { } else {
int numi; int numi;
double numd; double numd;


+ 1
- 1
json_tokener.h View File

@@ -71,7 +71,7 @@ struct json_tokener
char *str; char *str;
struct printbuf *pb; struct printbuf *pb;
int depth, is_double, st_pos, char_offset; int depth, is_double, st_pos, char_offset;
enum json_tokener_error err;
ptrdiff_t err;
unsigned int ucs_char; unsigned int ucs_char;
char quote_char; char quote_char;
struct json_tokener_srec stack[JSON_TOKENER_MAX_DEPTH]; struct json_tokener_srec stack[JSON_TOKENER_MAX_DEPTH];


+ 1
- 0
json_util.c View File

@@ -13,6 +13,7 @@


#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <stddef.h>
#include <limits.h> #include <limits.h>
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>


+ 1
- 0
test1.c View File

@@ -1,5 +1,6 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <stddef.h>
#include <string.h> #include <string.h>


#include "json.h" #include "json.h"


+ 1
- 0
test2.c View File

@@ -1,5 +1,6 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <stddef.h>
#include <string.h> #include <string.h>


#include "json.h" #include "json.h"


Write Preview
Loading…
Cancel
Save