-/* Copyright (c) 2009, 2010 Nicira Networks
+/* Copyright (c) 2009, 2010, 2011 Nicira Networks
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
struct ds;
struct ovsdb_symbol_table;
+struct shash;
/* One value of an atomic type (given by enum ovs_atomic_type). */
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);
WARN_UNUSED_RESULT;
void ovsdb_atom_to_string(const union ovsdb_atom *, enum ovsdb_atomic_type,
struct ds *);
+void ovsdb_atom_to_bare(const union ovsdb_atom *, enum ovsdb_atomic_type,
+ struct ds *);
struct ovsdb_error *ovsdb_atom_check_constraints(
const union ovsdb_atom *, const struct ovsdb_base_type *)
WARN_UNUSED_RESULT;
void ovsdb_datum_to_string(const struct ovsdb_datum *,
const struct ovsdb_type *, struct ds *);
+void ovsdb_datum_to_bare(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 *,