git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ofp-util: Remove prototype of non-existing function.
[sliver-openvswitch.git]
/
lib
/
ovsdb-data.h
diff --git
a/lib/ovsdb-data.h
b/lib/ovsdb-data.h
index
3609866
..
ece1672
100644
(file)
--- a/
lib/ovsdb-data.h
+++ b/
lib/ovsdb-data.h
@@
-1,4
+1,4
@@
-/* Copyright (c) 2009, 2010, 2011 Nicira, Inc.
+/* Copyright (c) 2009, 2010, 2011
, 2012, 2013
Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-23,6
+23,7
@@
struct ds;
struct ovsdb_symbol_table;
struct ds;
struct ovsdb_symbol_table;
+struct smap;
/* 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 {
@@
-87,6
+88,8
@@
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);
+size_t ovsdb_atom_json_length(const union ovsdb_atom *,
+ enum ovsdb_atomic_type);
char *ovsdb_atom_from_string(union ovsdb_atom *,
const struct ovsdb_base_type *, const char *,
char *ovsdb_atom_from_string(union ovsdb_atom *,
const struct ovsdb_base_type *, const char *,
@@
-162,6
+165,8
@@
struct ovsdb_error *ovsdb_datum_from_json(struct ovsdb_datum *,
WARN_UNUSED_RESULT;
struct json *ovsdb_datum_to_json(const struct ovsdb_datum *,
const struct ovsdb_type *);
WARN_UNUSED_RESULT;
struct json *ovsdb_datum_to_json(const struct ovsdb_datum *,
const struct ovsdb_type *);
+size_t ovsdb_datum_json_length(const struct ovsdb_datum *,
+ const struct ovsdb_type *);
char *ovsdb_datum_from_string(struct ovsdb_datum *,
const struct ovsdb_type *, const char *,
char *ovsdb_datum_from_string(struct ovsdb_datum *,
const struct ovsdb_type *, const char *,
@@
-172,7
+177,7
@@
void ovsdb_datum_to_string(const struct ovsdb_datum *,
void ovsdb_datum_to_bare(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_s
hash(struct ovsdb_datum *, struct shash
*);
+void ovsdb_datum_from_s
map(struct ovsdb_datum *, struct smap
*);
/* Comparison. */
uint32_t ovsdb_datum_hash(const struct ovsdb_datum *,
/* Comparison. */
uint32_t ovsdb_datum_hash(const struct ovsdb_datum *,