FGCOM/jansson
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '2.4'

Browse Source
This commit is contained in:
Petri Lehtinen 2012-12-10 08:47:11 +02:00
commit b98be1f18d
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/dump.c
View File

@ -38,7 +38,7 @@ static int dump_to_file(const char *buffer, size_t size, void *data)
} }
/* 32 spaces (the maximum indentation size) */ /* 32 spaces (the maximum indentation size) */
static char whitespace[] = " "; static const char whitespace[] = " ";
static int dump_indent(size_t flags, int depth, int space, json_dump_callback_t dump, void *data) static int dump_indent(size_t flags, int depth, int space, json_dump_callback_t dump, void *data)
{ {

2
src/hashtable.c
View File

@ -74,7 +74,7 @@ static void insert_to_bucket(hashtable_t *hashtable, bucket_t *bucket,
} }
} }
static size_t primes[] = { static const size_t primes[] = {
5, 13, 23, 53, 97, 193, 389, 769, 1543, 3079, 6151, 12289, 24593, 5, 13, 23, 53, 97, 193, 389, 769, 1543, 3079, 6151, 12289, 24593,
49157, 98317, 196613, 393241, 786433, 1572869, 3145739, 6291469, 49157, 98317, 196613, 393241, 786433, 1572869, 3145739, 6291469,
12582917, 25165843, 50331653, 100663319, 201326611, 402653189, 12582917, 25165843, 50331653, 100663319, 201326611, 402653189,

2
src/load.c
View File

@ -37,7 +37,7 @@
#define l_isalpha(c) (l_isupper(c) || l_islower(c)) #define l_isalpha(c) (l_isupper(c) || l_islower(c))
#define l_isdigit(c) ('0' <= (c) && (c) <= '9') #define l_isdigit(c) ('0' <= (c) && (c) <= '9')
#define l_isxdigit(c) \ #define l_isxdigit(c) \
(l_isdigit(c) || 'A' <= (c) || (c) <= 'F' || 'a' <= (c) || (c) <= 'f') (l_isdigit(c) || ('A' <= (c) && (c) <= 'F') || ('a' <= (c) && (c) <= 'f'))
/* Read one byte from stream, convert to unsigned char, then int, and /* Read one byte from stream, convert to unsigned char, then int, and
return. return EOF on end of file. This corresponds to the return. return EOF on end of file. This corresponds to the

4
src/pack_unpack.c
View File

@ -21,7 +21,7 @@ typedef struct {
int column; int column;
} scanner_t; } scanner_t;
static const char *type_names[] = { static const char * const type_names[] = {
"object", "object",
"array", "array",
"string", "string",
@ -34,7 +34,7 @@ static const char *type_names[] = {
#define type_name(x) type_names[json_typeof(x)] #define type_name(x) type_names[json_typeof(x)]
static const char *unpack_value_starters = "{[siIbfFOon"; static const char unpack_value_starters[] = "{[siIbfFOon";
static void scanner_init(scanner_t *s, json_error_t *error, static void scanner_init(scanner_t *s, json_error_t *error,