diff options
| author | Ben Pfaff <blp@nicira.com> | 2012-07-18 10:51:02 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2012-07-18 10:51:02 -0700 |
| commit | 57c8677b511908b3120df3cbf44244423cfefc34 (patch) | |
| tree | 1770ef8c0a4335de9244315e94f59c20b8b3c855 /lib/ovsdb-data.h | |
| parent | 51c82a49d58daebe289e045fe44009d59b1f9236 (diff) | |
system-stats: Use "smap" instead of "shash".
"smap" is now the appropriate data structure for a string-to-string map.
Also changes ovsdb_datum_from_shash() into ovsdb_datum_from_smap() since
system-stats related code was the only client.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Diffstat (limited to 'lib/ovsdb-data.h')
| -rw-r--r-- | lib/ovsdb-data.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/ovsdb-data.h b/lib/ovsdb-data.h index 36098663..2e31cc5b 100644 --- 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 Nicira, Inc. * * 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 smap; /* One value of an atomic type (given by enum ovs_atomic_type). */ union ovsdb_atom { @@ -172,7 +173,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_from_shash(struct ovsdb_datum *, struct shash *); +void ovsdb_datum_from_smap(struct ovsdb_datum *, struct smap *); /* Comparison. */ uint32_t ovsdb_datum_hash(const struct ovsdb_datum *, |