projects
/
jansson.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Enhance error reporting
[jansson.git]
/
src
/
jansson_private.h
diff --git
a/src/jansson_private.h
b/src/jansson_private.h
index
6d7e46c
..
951780c
100644
(file)
--- a/
src/jansson_private.h
+++ b/
src/jansson_private.h
@@
-15,17
+15,22
@@
#define container_of(ptr_, type_, member_) \
((type_ *)((char *)ptr_ - offsetof(type_, member_)))
#define container_of(ptr_, type_, member_) \
((type_ *)((char *)ptr_ - offsetof(type_, member_)))
+/* On some platforms, max() may already be defined */
+#ifndef max
+#define max(a, b) ((a) > (b) ? (a) : (b))
+#endif
+
typedef struct {
json_t json;
hashtable_t hashtable;
typedef struct {
json_t json;
hashtable_t hashtable;
-
unsigned long
serial;
+
size_t
serial;
int visited;
} json_object_t;
typedef struct {
json_t json;
int visited;
} json_object_t;
typedef struct {
json_t json;
-
unsigned in
t size;
-
unsigned in
t entries;
+
size_
t size;
+
size_
t entries;
json_t **table;
int visited;
} json_array_t;
json_t **table;
int visited;
} json_array_t;
@@
-42,7
+47,7
@@
typedef struct {
typedef struct {
json_t json;
typedef struct {
json_t json;
-
in
t value;
+
json_int_
t value;
} json_integer_t;
#define json_to_object(json_) container_of(json_, json_object_t, json)
} json_integer_t;
#define json_to_object(json_) container_of(json_, json_object_t, json)
@@
-52,10
+57,14
@@
typedef struct {
#define json_to_integer(json_) container_of(json_, json_integer_t, json)
typedef struct {
#define json_to_integer(json_) container_of(json_, json_integer_t, json)
typedef struct {
-
unsigned long
serial;
- char key[];
+
size_t
serial;
+ char key[
1
];
} object_key_t;
const object_key_t *jsonp_object_iter_fullkey(void *iter);
} object_key_t;
const object_key_t *jsonp_object_iter_fullkey(void *iter);
+void jsonp_error_init(json_error_t *error, const char *source);
+void jsonp_error_set(json_error_t *error, int line, int column,
+ const char *msg, ...);
+
#endif
#endif