From: Olivier Matz <olivier.matz@6wind.com>
Date: Tue, 28 Jan 2014 16:06:37 +0000 (+0100)
Subject: kvargs: remove useless size field
X-Git-Tag: spdx-start~10968
X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=03b611b7137a0b94bce6ecfa4e5bacd6463d503a;p=dpdk.git

kvargs: remove useless size field

This value was not very useful as the size of the table is fixed (equals
RTE_KVARGS_MAX).

By the way, the memset in the initialization function was wrong (size
too short). Even if it was not really an issue since we rely on the
"count" field, it is now fixed by this patch.

Signed-off-by: Olivier Matz <olivier.matz@6wind.com>
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
---

diff --git a/lib/librte_kvargs/rte_kvargs.c b/lib/librte_kvargs/rte_kvargs.c
index c3d65af780..b05a9bc88a 100644
--- a/lib/librte_kvargs/rte_kvargs.c
+++ b/lib/librte_kvargs/rte_kvargs.c
@@ -48,8 +48,7 @@ int
 rte_kvargs_init(struct rte_kvargs *kvlist)
 {
 	kvlist->count = 0;
-	kvlist->size = RTE_KVARGS_MAX;
-	memset(kvlist->pairs, 0, kvlist->size);
+	memset(kvlist->pairs, 0, sizeof(kvlist->pairs));
 	return 0;
 }
 
@@ -64,7 +63,7 @@ rte_kvargs_add_pair(struct rte_kvargs *kvlist, char *key, char *val)
 	struct rte_kvargs_pair* entry;
 
 	/* is the list full? */
-	if (kvlist->count >= kvlist->size) {
+	if (kvlist->count >= RTE_KVARGS_MAX) {
 		RTE_LOG(ERR, PMD, "Couldn't add %s, key/value list is full\n", key);
 		return -1;
 	}
diff --git a/lib/librte_kvargs/rte_kvargs.h b/lib/librte_kvargs/rte_kvargs.h
index 288e05f5c9..3540e034ca 100644
--- a/lib/librte_kvargs/rte_kvargs.h
+++ b/lib/librte_kvargs/rte_kvargs.h
@@ -71,7 +71,6 @@ struct rte_kvargs_pair {
 /** Store a list of key/value associations */
 struct rte_kvargs {
 	unsigned count; /**< number of entries in the list */
-	size_t size;    /**< maximum number of entries */
 	struct rte_kvargs_pair pairs[RTE_KVARGS_MAX]; /**< list of key/values */
 };