#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_error *ovsdb_atom_from_json(union ovsdb_atom *,
- enum ovsdb_atomic_type,
+ const struct ovsdb_base_type *,
const struct json *,
- const struct ovsdb_symbol_table *)
+ struct ovsdb_symbol_table *)
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 *,
+ const struct ovsdb_base_type *, const char *)
+ WARN_UNUSED_RESULT;
+void ovsdb_atom_to_string(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;
\f
/* An instance of an OVSDB type (given by struct ovsdb_type).
*
/* Checking and maintaining invariants. */
struct ovsdb_error *ovsdb_datum_sort(struct ovsdb_datum *,
- const struct ovsdb_type *);
+ enum ovsdb_atomic_type key_type)
+ WARN_UNUSED_RESULT;
+
+void ovsdb_datum_sort_assert(struct ovsdb_datum *,
+ enum ovsdb_atomic_type key_type);
+
+struct ovsdb_error *ovsdb_datum_check_constraints(
+ const struct ovsdb_datum *, const struct ovsdb_type *)
+ WARN_UNUSED_RESULT;
/* Type conversion. */
struct ovsdb_error *ovsdb_datum_from_json(struct ovsdb_datum *,
const struct ovsdb_type *,
const struct json *,
- const struct ovsdb_symbol_table *)
+ struct ovsdb_symbol_table *)
WARN_UNUSED_RESULT;
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 *,
void ovsdb_symbol_table_destroy(struct ovsdb_symbol_table *);
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);
+struct ovsdb_symbol *ovsdb_symbol_table_put(struct ovsdb_symbol_table *,
+ const char *name,
+ const struct uuid *, bool used);
+struct ovsdb_symbol *ovsdb_symbol_table_insert(struct ovsdb_symbol_table *,
+ const char *name);
+\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 */