projects
/
jansson.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adds json_pack / json_unpack variadic functions.
[jansson.git]
/
src
/
jansson_private.h
diff --git
a/src/jansson_private.h
b/src/jansson_private.h
index
3045956
..
2d2af62
100644
(file)
--- a/
src/jansson_private.h
+++ b/
src/jansson_private.h
@@
-8,22
+8,29
@@
#ifndef JANSSON_PRIVATE_H
#define JANSSON_PRIVATE_H
#ifndef JANSSON_PRIVATE_H
#define JANSSON_PRIVATE_H
+#include <stddef.h>
#include "jansson.h"
#include "hashtable.h"
#define container_of(ptr_, type_, member_) \
#include "jansson.h"
#include "hashtable.h"
#define container_of(ptr_, type_, member_) \
- ((type_ *)((char *)ptr_ - (size_t)&((type_ *)0)->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;
+ 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;
@@
-40,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)
@@
-49,4
+56,18
@@
typedef struct {
#define json_to_real(json_) container_of(json_, json_real_t, json)
#define json_to_integer(json_) container_of(json_, json_integer_t, json)
#define json_to_real(json_) container_of(json_, json_real_t, json)
#define json_to_integer(json_) container_of(json_, json_integer_t, json)
+typedef struct {
+ size_t serial;
+ char key[1];
+} object_key_t;
+
+const object_key_t *jsonp_object_iter_fullkey(void *iter);
+
+#define JSON_ERROR_MSG_LENGTH 160
+
+struct json_error_t {
+ char msg[JSON_ERROR_MSG_LENGTH];
+ int line;
+};
+
#endif
#endif