projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ovs-vsctl: Add --columns options to "list" command.
[openvswitch]
/
lib
/
ovsdb-data.h
diff --git
a/lib/ovsdb-data.h
b/lib/ovsdb-data.h
index 820a4dbb3a9be3a1ee6268c16798ae8a2f604651..f7e98a84bd1d90d79da97c9d40bc5f65d47039e9 100644
(file)
--- a/
lib/ovsdb-data.h
+++ b/
lib/ovsdb-data.h
@@
-22,6
+22,7
@@
struct ds;
struct ovsdb_symbol_table;
struct ds;
struct ovsdb_symbol_table;
+struct shash;
/* One value of an atomic type (given by enum ovs_atomic_type). */
union ovsdb_atom {
/* One value of an atomic type (given by enum ovs_atomic_type). */
union ovsdb_atom {
@@
-84,11
+85,6
@@
struct ovsdb_error *ovsdb_atom_from_json(union ovsdb_atom *,
const struct json *,
struct ovsdb_symbol_table *)
WARN_UNUSED_RESULT;
const struct json *,
struct ovsdb_symbol_table *)
WARN_UNUSED_RESULT;
-struct ovsdb_error *ovsdb_datum_from_json_unique(struct ovsdb_datum *,
- const struct ovsdb_type *,
- const struct json *,
- struct ovsdb_symbol_table *)
- WARN_UNUSED_RESULT;
struct json *ovsdb_atom_to_json(const union ovsdb_atom *,
enum ovsdb_atomic_type);
struct json *ovsdb_atom_to_json(const union ovsdb_atom *,
enum ovsdb_atomic_type);
@@
-172,6
+168,8
@@
char *ovsdb_datum_from_string(struct ovsdb_datum *,
void ovsdb_datum_to_string(const struct ovsdb_datum *,
const struct ovsdb_type *, struct ds *);
void ovsdb_datum_to_string(const struct ovsdb_datum *,
const struct ovsdb_type *, struct ds *);
+void ovsdb_datum_from_shash(struct ovsdb_datum *, struct shash *);
+
/* Comparison. */
uint32_t ovsdb_datum_hash(const struct ovsdb_datum *,
const struct ovsdb_type *, uint32_t basis);
/* Comparison. */
uint32_t ovsdb_datum_hash(const struct ovsdb_datum *,
const struct ovsdb_type *, uint32_t basis);