projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
daemon: Fix memory leak in --monitor implementation.
[openvswitch]
/
lib
/
ovsdb-data.h
diff --git
a/lib/ovsdb-data.h
b/lib/ovsdb-data.h
index 9cada2f404d251bf69db370d8bbacd9cd57ab655..0638fa1bcdb98ca1174e20ac1db7d6349d47d7b9 100644
(file)
--- a/
lib/ovsdb-data.h
+++ b/
lib/ovsdb-data.h
@@
-20,6
+20,7
@@
#include "compiler.h"
#include "ovsdb-types.h"
#include "compiler.h"
#include "ovsdb-types.h"
+struct ds;
struct ovsdb_symbol_table;
/* One value of an atomic type (given by enum ovs_atomic_type). */
struct ovsdb_symbol_table;
/* One value of an atomic type (given by enum ovs_atomic_type). */
@@
-72,6
+73,12
@@
struct ovsdb_error *ovsdb_atom_from_json(union ovsdb_atom *,
WARN_UNUSED_RESULT;
struct json *ovsdb_atom_to_json(const union ovsdb_atom *,
enum ovsdb_atomic_type);
WARN_UNUSED_RESULT;
struct json *ovsdb_atom_to_json(const union ovsdb_atom *,
enum ovsdb_atomic_type);
+
+char *ovsdb_atom_from_string(union ovsdb_atom *, enum ovsdb_atomic_type,
+ const char *)
+ WARN_UNUSED_RESULT;
+void ovsdb_atom_to_string(const union ovsdb_atom *, enum ovsdb_atomic_type,
+ struct ds *);
\f
/* An instance of an OVSDB type (given by struct ovsdb_type).
*
\f
/* An instance of an OVSDB type (given by struct ovsdb_type).
*
@@
-122,6
+129,13
@@
struct ovsdb_error *ovsdb_datum_from_json(struct ovsdb_datum *,
struct json *ovsdb_datum_to_json(const struct ovsdb_datum *,
const struct ovsdb_type *);
struct json *ovsdb_datum_to_json(const struct ovsdb_datum *,
const struct ovsdb_type *);
+char *ovsdb_datum_from_string(struct ovsdb_datum *,
+ const struct ovsdb_type *, const char *)
+ WARN_UNUSED_RESULT;
+void ovsdb_datum_to_string(const struct ovsdb_datum *,
+ const struct ovsdb_type *, struct ds *);
+
+/* Comparison. */
uint32_t ovsdb_datum_hash(const struct ovsdb_datum *,
const struct ovsdb_type *, uint32_t basis);
int ovsdb_datum_compare_3way(const struct ovsdb_datum *,
uint32_t ovsdb_datum_hash(const struct ovsdb_datum *,
const struct ovsdb_type *, uint32_t basis);
int ovsdb_datum_compare_3way(const struct ovsdb_datum *,
@@
-187,5
+201,12
@@
struct ovsdb_symbol *ovsdb_symbol_table_get(const struct ovsdb_symbol_table *,
const char *name);
void ovsdb_symbol_table_put(struct ovsdb_symbol_table *, const char *name,
const struct uuid *, bool used);
const char *name);
void ovsdb_symbol_table_put(struct ovsdb_symbol_table *, const char *name,
const struct uuid *, bool used);
+
\f
+/* Tokenization
+ *
+ * Used by ovsdb_atom_from_string() and ovsdb_datum_from_string(). */
+
+char *ovsdb_token_parse(const char **, char **outp) WARN_UNUSED_RESULT;
+bool ovsdb_token_is_delim(unsigned char);
#endif /* ovsdb-data.h */
#endif /* ovsdb-data.h */