commit 0f6b3e2c8eb245a8d71d5fc1ce8bc274441ece9e
author Michal Vasko <mvasko@cesnet.cz> Fri Sep 07 12:18:12 2018 +0200
committer Michal Vasko <mvasko@cesnet.cz> Fri Sep 07 12:18:12 2018 +0200
tree 3abf60555939044e2ba8cbd1f605f3e574d35ce5
parent 1324b6c3473c7f4d6bd5554f00f36dc6a3426aeb

dict CHANGE allow values to be NULL

src/dict.h

diff --git a/src/dict.h b/src/dict.h
index a2e643d..d24c522 100644
--- a/src/dict.h
+++ b/src/dict.h
@@ -39,12 +39,12 @@
  * performed.
  *
  * @param[in] ctx libyang context handler
- * @param[in] value String to be stored in the dictionary.
+ * @param[in] value String to be stored in the dictionary. If NULL, function does nothing.
  * @param[in] len Number of bytes to store. The value is not required to be
  * NULL terminated string, the len parameter says number of bytes stored in
  * dictionary. The specified number of bytes is duplicated and terminating NULL
  * byte is added automatically.
- * @return pointer to the string stored in the dictionary
+ * @return pointer to the string stored in the dictionary, NULL if \p value was NULL.
  */
 const char *lydict_insert(struct ly_ctx *ctx, const char *value, size_t len);
 
@@ -59,8 +59,8 @@
  * the string is not present in dictionary, the pointer is directly used by the
  * dictionary. Otherwise, the reference counter is incremented and the value is
  * freed. So, after calling the function, caller is supposed to not use the
- * value address anymore.
- * @return pointer to the string stored in the dictionary
+ * value address anymore. If NULL, function does nothing.
+ * @return pointer to the string stored in the dictionary, NULL if \p value was NULL.
  */
 const char *lydict_insert_zc(struct ly_ctx *ctx, char *value);
 
@@ -71,7 +71,7 @@
  * @param[in] ctx libyang context handler
  * @param[in] value String to be freed. Note, that not only the string itself
  * must match the stored value, but also the address is being compared and the
- * counter is decremented only if it matches.
+ * counter is decremented only if it matches. If NULL, function does nothing.
  */
 void lydict_remove(struct ly_ctx *ctx, const char *value);
 

src/hash_table.c

diff --git a/src/hash_table.c b/src/hash_table.c
index b1274e2..c39b902 100644
--- a/src/hash_table.c
+++ b/src/hash_table.c
@@ -139,7 +139,11 @@
     struct dict_rec rec, *match = NULL;
     char *val_p;
 
-    LY_CHECK_ARG_RET(NULL, value, ctx,);
+    LY_CHECK_ARG_RET(ctx, ctx,);
+
+    if (!value) {
+        return NULL;
+    }
 
     len = strlen(value);
     hash = dict_hash(value, len);
@@ -222,9 +226,11 @@
 {
     const char *result;
 
-    LY_CHECK_ARG_RET(NULL, value, NULL);
+    LY_CHECK_ARG_RET(ctx, ctx, NULL);
 
-    if (!len) {
+    if (!value) {
+        return NULL;
+    } else if (!len) {
         len = strlen(value);
     }
 
@@ -240,7 +246,11 @@
 {
     const char *result;
 
-    LY_CHECK_ARG_RET(NULL, value, NULL);
+    LY_CHECK_ARG_RET(ctx, ctx, NULL);
+
+    if (!value) {
+        return NULL;
+    }
 
     pthread_mutex_lock(&ctx->dict.lock);
     result = dict_insert(ctx, value, strlen(value), 1);