From 95418a30be0d3f1495db702d44c50139742663fc Mon Sep 17 00:00:00 2001 From: Olivier Matz Date: Tue, 28 Jan 2014 17:06:42 +0100 Subject: [PATCH] kvargs: add the key in handler pameters 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 Acked-by: Bruce Richardson --- 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 c7f626f2bb..c41a01688e 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 98b8a7c1ef..94003e20d6 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 51a0aa4967..8f5d2b311b 100644 --- a/lib/librte_pmd_pcap/rte_eth_pcap.c +++ b/lib/librte_pmd_pcap/rte_eth_pcap.c @@ -403,7 +403,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; @@ -426,7 +426,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; @@ -476,7 +476,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; @@ -490,7 +490,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; @@ -510,7 +510,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; -- 2.20.1