git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
revalidator: Fix ukey stats cache updating.
[sliver-openvswitch.git]
/
lib
/
json.h
diff --git
a/lib/json.h
b/lib/json.h
index
7674015
..
cfe9457
100644
(file)
--- a/
lib/json.h
+++ b/
lib/json.h
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2009
Nicira Networks
.
+ * Copyright (c) 2009
, 2010 Nicira, Inc
.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-32,6
+32,12
@@
#include "shash.h"
#include "shash.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct ds;
+
/* Type of a JSON value. */
enum json_type {
JSON_NULL, /* null */
/* Type of a JSON value. */
enum json_type {
JSON_NULL, /* null */
@@
-76,6
+82,7
@@
struct json *json_array_create_empty(void);
void json_array_add(struct json *, struct json *element);
void json_array_trim(struct json *);
struct json *json_array_create(struct json **, size_t n);
void json_array_add(struct json *, struct json *element);
void json_array_trim(struct json *);
struct json *json_array_create(struct json **, size_t n);
+struct json *json_array_create_1(struct json *);
struct json *json_array_create_2(struct json *, struct json *);
struct json *json_array_create_3(struct json *, struct json *, struct json *);
struct json *json_array_create_2(struct json *, struct json *);
struct json *json_array_create_3(struct json *, struct json *, struct json *);
@@
-110,6
+117,7
@@
void json_parser_abort(struct json_parser *);
struct json *json_from_string(const char *string);
struct json *json_from_file(const char *file_name);
struct json *json_from_string(const char *string);
struct json *json_from_file(const char *file_name);
+struct json *json_from_stream(FILE *stream);
\f
/* Serializing JSON. */
\f
/* Serializing JSON. */
@@
-118,5
+126,14
@@
enum {
JSSF_SORT = 1 << 1 /* Object members in sorted order, if true. */
};
char *json_to_string(const struct json *, int flags);
JSSF_SORT = 1 << 1 /* Object members in sorted order, if true. */
};
char *json_to_string(const struct json *, int flags);
+void json_to_ds(const struct json *, int flags, struct ds *);
+
\f
+/* JSON string formatting operations. */
+
+bool json_string_unescape(const char *in, size_t in_len, char **outp);
+
+#ifdef __cplusplus
+}
+#endif
#endif /* json.h */
#endif /* json.h */