summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorBen Pfaff <blp@nicira.com>2010-08-17 12:49:31 -0700
committerBen Pfaff <blp@nicira.com>2010-08-25 14:55:47 -0700
commitd931cde4d74ef1eee77594dd60c3a5b587394a1a (patch)
tree2022135ce7e26074d747b0288544d61145fd4a01 /lib
parentd53e44e9346d6755ebc4ac70d3f43ce8fd98ea57 (diff)
downloadopenvswitch-d931cde4d74ef1eee77594dd60c3a5b587394a1a.tar.gz
ovsdb: Remove unused ovsdb_datum_from_json_unique().
This function was not used outside of the test-ovsdb program. It seems like we might as well remove it.
Diffstat (limited to 'lib')
-rw-r--r--lib/ovsdb-data.c17
-rw-r--r--lib/ovsdb-data.h5
2 files changed, 0 insertions, 22 deletions
diff --git a/lib/ovsdb-data.c b/lib/ovsdb-data.c
index dba89acb5..9c54fe81b 100644
--- a/lib/ovsdb-data.c
+++ b/lib/ovsdb-data.c
@@ -1214,23 +1214,6 @@ ovsdb_datum_from_json(struct ovsdb_datum *datum,
return error;
}
-/* This is the same as ovsdb_datum_from_json(), except that duplicate values
- * in a set or map are dropped instead of being treated as an error. */
-struct ovsdb_error *
-ovsdb_datum_from_json_unique(struct ovsdb_datum *datum,
- const struct ovsdb_type *type,
- const struct json *json,
- struct ovsdb_symbol_table *symtab)
-{
- struct ovsdb_error *error;
-
- error = ovsdb_datum_from_json__(datum, type, json, symtab);
- if (!error) {
- ovsdb_datum_sort_unique(datum, type->key.type, type->value.type);
- }
- return error;
-}
-
/* Converts 'datum', of the specified 'type', to JSON format, and returns the
* JSON. The caller is responsible for freeing the returned JSON.
*
diff --git a/lib/ovsdb-data.h b/lib/ovsdb-data.h
index 820a4dbb3..ae0faa26e 100644
--- a/lib/ovsdb-data.h
+++ b/lib/ovsdb-data.h
@@ -84,11 +84,6 @@ struct ovsdb_error *ovsdb_atom_from_json(union ovsdb_atom *,
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);