[dpdk-dev] [PATCH 09/11] kvargs: add the key in handler pameters

[Olivier Matz]

This argument can be useful when rte_kvargs_process() is called with
key=NULL, in this case the handler is invoked for all entries of the
kvlist.

Signed-off-by: Olivier Matz <olivier.matz at 6wind.com>
---
 lib/librte_kvargs/rte_kvargs.c     |  2 +-
 lib/librte_kvargs/rte_kvargs.h     |  2 +-
 lib/librte_pmd_pcap/rte_eth_pcap.c | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/librte_kvargs/rte_kvargs.c b/lib/librte_kvargs/rte_kvargs.c
index 73034fc..1ff7056 100644
--- a/lib/librte_kvargs/rte_kvargs.c
+++ b/lib/librte_kvargs/rte_kvargs.c
@@ -161,7 +161,7 @@ rte_kvargs_process(const struct rte_kvargs *kvlist,
        for (i = 0; i < kvlist->count; i++) {
                pair = &kvlist->pairs[i];
                if (strcmp(pair->key, key_match) == 0) {
-                       if ((*handler)(pair->value, opaque_arg) < 0)
+                       if ((*handler)(pair->key, pair->value, opaque_arg) < 0)
                                return -1;
                }
        }
diff --git a/lib/librte_kvargs/rte_kvargs.h b/lib/librte_kvargs/rte_kvargs.h
index 35572ba..c080c06 100644
--- a/lib/librte_kvargs/rte_kvargs.h
+++ b/lib/librte_kvargs/rte_kvargs.h
@@ -64,7 +64,7 @@ extern "C" {
 #define RTE_KVARGS_KV_DELIM    "="

 /** Type of callback function used by rte_kvargs_process() */
-typedef int (*arg_handler_t)(const char *value, void *opaque);
+typedef int (*arg_handler_t)(const char *key, const char *value, void *opaque);

 /** A key/value association */
 struct rte_kvargs_pair {
diff --git a/lib/librte_pmd_pcap/rte_eth_pcap.c 
b/lib/librte_pmd_pcap/rte_eth_pcap.c
index 8484497..6649f0f 100644
--- a/lib/librte_pmd_pcap/rte_eth_pcap.c
+++ b/lib/librte_pmd_pcap/rte_eth_pcap.c
@@ -419,7 +419,7 @@ static struct eth_dev_ops ops = {
  * reference of it for use it later on.
  */
 static int
-open_rx_pcap(const char *value, void *extra_args)
+open_rx_pcap(const char *key __rte_unused, const char *value, void *extra_args)
 {
        unsigned i;
        const char *pcap_filename = value;
@@ -442,7 +442,7 @@ open_rx_pcap(const char *value, void *extra_args)
  * for use it later on.
  */
 static int
-open_tx_pcap(const char *value, void *extra_args)
+open_tx_pcap(const char *key __rte_unused, const char *value, void *extra_args)
 {
        unsigned i;
        const char *pcap_filename = value;
@@ -492,7 +492,7 @@ open_iface_live(const char *iface, pcap_t **pcap) {
  * Opens an interface for reading and writing
  */
 static inline int
-open_rx_tx_iface(const char *value, void *extra_args)
+open_rx_tx_iface(const char *key __rte_unused, const char *value, void 
*extra_args)
 {
        const char *iface = value;
        pcap_t **pcap = extra_args;
@@ -506,7 +506,7 @@ open_rx_tx_iface(const char *value, void *extra_args)
  * Opens a NIC for reading packets from it
  */
 static inline int
-open_rx_iface(const char *value, void *extra_args)
+open_rx_iface(const char *key __rte_unused, const char *value, void 
*extra_args)
 {
        unsigned i;
        const char *iface = value;
@@ -526,7 +526,7 @@ open_rx_iface(const char *value, void *extra_args)
  * Opens a NIC for writing packets to it
  */
 static inline int
-open_tx_iface(const char *value, void *extra_args)
+open_tx_iface(const char *key __rte_unused, const char *value, void 
*extra_args)
 {
        unsigned i;
        const char *iface = value;
-- 
1.8.4.rc3