commit 011e4aa0c62902b24dd42833a7b77a83f313b876
author Radek Krejci <rkrejci@cesnet.cz> Fri Sep 04 15:22:31 2020 +0200
committer Michal Vasko <mvasko@cesnet.cz> Fri Sep 11 13:59:04 2020 +0200
tree 5f130b91ce4b012caaed6bf450756a1c785f8f32
parent 96e48da0712fefafdf0c122486c6dce17bba9e68

dictionary REFACTOR unify functions pattern to return LY_ERR

Change API functions manipulating with libyang dictionary to return
LY_ERR value as a primary indicator of the result and the value from the
dictionary is returned via optional output parameter.

src/hash_table.c

diff --git a/src/hash_table.c b/src/hash_table.c
index 9d34ca9..5f1af01 100644
--- a/src/hash_table.c
+++ b/src/hash_table.c
@@ -178,10 +178,10 @@
     pthread_mutex_unlock((pthread_mutex_t *)&ctx->dict.lock);
 }
 
-static char *
-dict_insert(const struct ly_ctx *ctx, char *value, size_t len, ly_bool zerocopy)
+LY_ERR
+dict_insert(const struct ly_ctx *ctx, char *value, size_t len, ly_bool zerocopy, const char **str_p)
 {
-    LY_ERR ret = 0;
+    LY_ERR ret = LY_SUCCESS;
     struct dict_rec *match = NULL, rec;
     uint32_t hash;
 
@@ -199,6 +199,7 @@
         if (zerocopy) {
             free(value);
         }
+        ret = LY_SUCCESS;
     } else if (ret == LY_SUCCESS) {
         if (!zerocopy) {
             /*
@@ -206,49 +207,52 @@
              * record is already inserted in hash table
              */
             match->value = malloc(sizeof *match->value * (len + 1));
-            LY_CHECK_ERR_RET(!match->value, LOGMEM(ctx), NULL);
+            LY_CHECK_ERR_RET(!match->value, LOGMEM(ctx), LY_EMEM);
             memcpy(match->value, value, len);
             match->value[len] = '\0';
         }
     } else {
         /* lyht_insert returned error */
-        LOGINT(ctx);
         if (zerocopy) {
             free(value);
         }
-        return NULL;
+        return ret;
     }
 
-    return match->value;
+    if (str_p) {
+        *str_p = match->value;
+    }
+
+    return ret;
 }
 
-API const char *
-lydict_insert(const struct ly_ctx *ctx, const char *value, size_t len)
+API LY_ERR
+lydict_insert(const struct ly_ctx *ctx, const char *value, size_t len, const char **str_p)
 {
-    const char *result;
+    LY_ERR result;
 
-    LY_CHECK_ARG_RET(ctx, ctx, value, NULL);
+    LY_CHECK_ARG_RET(ctx, ctx, value, LY_EINVAL);
 
     if (!len) {
         len = strlen(value);
     }
 
     pthread_mutex_lock((pthread_mutex_t *)&ctx->dict.lock);
-    result = dict_insert(ctx, (char *)value, len, 0);
+    result = dict_insert(ctx, (char *)value, len, 0, str_p);
     pthread_mutex_unlock((pthread_mutex_t *)&ctx->dict.lock);
 
     return result;
 }
 
-API const char *
-lydict_insert_zc(const struct ly_ctx *ctx, char *value)
+API LY_ERR
+lydict_insert_zc(const struct ly_ctx *ctx, char *value, const char **str_p)
 {
-    const char *result;
+    LY_ERR result;
 
-    LY_CHECK_ARG_RET(ctx, ctx, value, NULL);
+    LY_CHECK_ARG_RET(ctx, ctx, value, LY_EINVAL);
 
     pthread_mutex_lock((pthread_mutex_t *)&ctx->dict.lock);
-    result = dict_insert(ctx, value, strlen(value), 1);
+    result = dict_insert(ctx, value, strlen(value), 1, str_p);
     pthread_mutex_unlock((pthread_mutex_t *)&ctx->dict.lock);
 
     return result;