* [dpdk-dev] [PATCH] hash: fix Doxygen
@ 2018-08-07 2:00 Pablo de Lara
2018-08-07 13:41 ` Thomas Monjalon
0 siblings, 1 reply; 2+ messages in thread
From: Pablo de Lara @ 2018-08-07 2:00 UTC (permalink / raw)
To: bruce.richardson; +Cc: dev, Pablo de Lara, stable
rte_hash_lookup_data() and rte_hash_lookup_with_hash_data()
functions return the index of the table where the key is stored
when this is found, and not 0 as the Doxygen currently states.
Also, these functions, and rte_hash_get_key_with_position()
return negative values when keys are not found (-EINVAL and -ENOENT),
where the minus sign was missing.
Fixes: 473d1bebce43 ("hash: allow to store data in hash table")
Fixes: 6dc34e0afe7a ("hash: retrieve a key given its position")
Cc: stable@dpdk.org
Reported-by: Petr Houska <t-pehous@microsoft.com>
Signed-off-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
---
lib/librte_hash/rte_hash.h | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/lib/librte_hash/rte_hash.h b/lib/librte_hash/rte_hash.h
index 1f1a276df..f2e50ab1a 100644
--- a/lib/librte_hash/rte_hash.h
+++ b/lib/librte_hash/rte_hash.h
@@ -268,8 +268,8 @@ rte_hash_del_key_with_hash(const struct rte_hash *h, const void *key, hash_sig_t
* Output containing a pointer to the key
* @return
* - 0 if retrieved successfully
- * - EINVAL if the parameters are invalid.
- * - ENOENT if no valid key is found in the given position.
+ * - -EINVAL if the parameters are invalid.
+ * - -ENOENT if no valid key is found in the given position.
*/
int
rte_hash_get_key_with_position(const struct rte_hash *h, const int32_t position,
@@ -286,9 +286,11 @@ rte_hash_get_key_with_position(const struct rte_hash *h, const int32_t position,
* @param data
* Output with pointer to data returned from the hash table.
* @return
- * 0 if successful lookup
- * - EINVAL if the parameters are invalid.
- * - ENOENT if the key is not found.
+ * - A positive value that can be used by the caller as an offset into an
+ * array of user data. This value is unique for this key, and is the same
+ * value that was returned when the key was added.
+ * - -EINVAL if the parameters are invalid.
+ * - -ENOENT if the key is not found.
*/
int
rte_hash_lookup_data(const struct rte_hash *h, const void *key, void **data);
@@ -307,9 +309,11 @@ rte_hash_lookup_data(const struct rte_hash *h, const void *key, void **data);
* @param data
* Output with pointer to data returned from the hash table.
* @return
- * 0 if successful lookup
- * - EINVAL if the parameters are invalid.
- * - ENOENT if the key is not found.
+ * - A positive value that can be used by the caller as an offset into an
+ * array of user data. This value is unique for this key, and is the same
+ * value that was returned when the key was added.
+ * - -EINVAL if the parameters are invalid.
+ * - -ENOENT if the key is not found.
*/
int
rte_hash_lookup_with_hash_data(const struct rte_hash *h, const void *key,
--
2.17.1
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [dpdk-dev] [PATCH] hash: fix Doxygen
2018-08-07 2:00 [dpdk-dev] [PATCH] hash: fix Doxygen Pablo de Lara
@ 2018-08-07 13:41 ` Thomas Monjalon
0 siblings, 0 replies; 2+ messages in thread
From: Thomas Monjalon @ 2018-08-07 13:41 UTC (permalink / raw)
To: Pablo de Lara; +Cc: dev, bruce.richardson, stable, Petr Houska
07/08/2018 04:00, Pablo de Lara:
> rte_hash_lookup_data() and rte_hash_lookup_with_hash_data()
> functions return the index of the table where the key is stored
> when this is found, and not 0 as the Doxygen currently states.
>
> Also, these functions, and rte_hash_get_key_with_position()
> return negative values when keys are not found (-EINVAL and -ENOENT),
> where the minus sign was missing.
>
> Fixes: 473d1bebce43 ("hash: allow to store data in hash table")
> Fixes: 6dc34e0afe7a ("hash: retrieve a key given its position")
> Cc: stable@dpdk.org
>
> Reported-by: Petr Houska <t-pehous@microsoft.com>
> Signed-off-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
Bugzilla ID: 78
Applied, thanks
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-08-07 13:41 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-08-07 2:00 [dpdk-dev] [PATCH] hash: fix Doxygen Pablo de Lara
2018-08-07 13:41 ` Thomas Monjalon
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).