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
vtep: Include OVS version number in VTEP man page.
[sliver-openvswitch.git]
/
lib
/
json.h
diff --git
a/lib/json.h
b/lib/json.h
index
41257b0
..
ef23124
100644
(file)
--- a/
lib/json.h
+++ b/
lib/json.h
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2009, 2010
Nicira Networks
.
+ * Copyright (c) 2009, 2010
, 2013 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,10
@@
#include "shash.h"
#include "shash.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
struct ds;
/* Type of a JSON value. */
struct ds;
/* Type of a JSON value. */
@@
-123,9
+127,15
@@
enum {
};
char *json_to_string(const struct json *, int flags);
void json_to_ds(const struct json *, int flags, struct ds *);
};
char *json_to_string(const struct json *, int flags);
void json_to_ds(const struct json *, int flags, struct ds *);
+
+size_t json_serialized_length(const struct json *);
\f
/* JSON string formatting operations. */
bool json_string_unescape(const char *in, size_t in_len, char **outp);
\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 */