mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-08-31 06:15:47 +00:00
Code Issues Releases Wiki Activity

ovsdb-idlc: Use ovsdb_datum_from_smap() instead of open-coding it.

Browse Source 
There's no reason to have three copies of this code for every smap-type
column.

The code wasn't a perfect match for ovsdb_datum_from_smap(), so this commit
also changes ovsdb_datum_from_smap() to better suit it.  It only had one
caller and the new design is adequate for that caller.

Signed-off-by: Ben Pfaff <blp@ovn.org>
Acked-by: Andy Zhou <azhou@ovn.org>
This commit is contained in:
Ben Pfaff
2016-08-31 22:03:27 -07:00
parent 7e1ffe3c41
commit 9b03e59d20
4 changed files with 15 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/ovsdb-data.c
View File

@@ -1,4 +1,4 @@
/* Copyright (c) 2009, 2010, 2011, 2012, 2014 Nicira, Inc.
/* Copyright (c) 2009, 2010, 2011, 2012, 2014, 2016 Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -1542,27 +1542,24 @@ ovsdb_datum_to_bare(const struct ovsdb_datum *datum,
}
}
/* Initializes 'datum' as a string-to-string map whose contents are taken from
* 'smap'. Destroys 'smap'. */
/* Initializes 'datum' as a string-to-string map whose contents are copied from
* 'smap', which is not modified. */
void
ovsdb_datum_from_smap(struct ovsdb_datum *datum, struct smap *smap)
ovsdb_datum_from_smap(struct ovsdb_datum *datum, const struct smap *smap)
{
struct smap_node *node, *next;
size_t i;
datum->n = smap_count(smap);
datum->keys = xmalloc(datum->n * sizeof *datum->keys);
datum->values = xmalloc(datum->n * sizeof *datum->values);
i = 0;
SMAP_FOR_EACH_SAFE (node, next, smap) {
smap_steal(smap, node,
&datum->keys[i].string, &datum->values[i].string);
struct smap_node *node;
size_t i = 0;
SMAP_FOR_EACH (node, smap) {
datum->keys[i].string = xstrdup(node->key);
datum->values[i].string = xstrdup(node->value);
i++;
}
ovs_assert(i == datum->n);
smap_destroy(smap);
ovsdb_datum_sort_unique(datum, OVSDB_TYPE_STRING, OVSDB_TYPE_STRING);
}