commit a77e0e1151b68d3d24a8463caeda54f104c3e7fd
author Radek Krejci <rkrejci@cesnet.cz> Thu Sep 20 12:39:15 2018 +0200
committer Radek Krejci <rkrejci@cesnet.cz> Thu Sep 20 12:39:15 2018 +0200
tree e20c6e2eece56ee3f6f9d841168c349e80c89d13
parent 1e88003ddec798c762342e26dc71e6705efb64a7

context CHANGE simplify the code of ly_ctx_set_searchdir()

src/context.c

diff --git a/src/context.c b/src/context.c
index 45be465..1c82259 100644
--- a/src/context.c
+++ b/src/context.c
@@ -67,7 +67,6 @@
 {
     struct stat st;
     char *new_dir = NULL;
-    LY_ERR rc = LY_ESYS;
     unsigned int u;
 
     LY_CHECK_ARG_RET(ctx, ctx, LY_EINVAL);
@@ -83,9 +82,9 @@
                          LOGERR(ctx, LY_ESYS, "Given search directory \"%s\" is not a directory.", search_dir),
                          LY_EINVAL);
         new_dir = realpath(search_dir, NULL);
-        LY_CHECK_ERR_GOTO(!new_dir,
-                          LOGERR(ctx, LY_ESYS, "realpath() call failed for \"%s\" (%s).", search_dir, strerror(errno)),
-                          cleanup);
+        LY_CHECK_ERR_RET(!new_dir,
+                         LOGERR(ctx, LY_ESYS, "realpath() call failed for \"%s\" (%s).", search_dir, strerror(errno)),
+                         LY_ESYS);
         /* avoid path duplication */
         for (u = 0; u < ctx->search_paths.count; ++u) {
             if (!strcmp(new_dir, ctx->search_paths.objs[0])) {
@@ -103,10 +102,6 @@
         /* consider that no change is not actually an error */
         return LY_SUCCESS;
     }
-
-cleanup:
-    free(new_dir);
-    return rc;
 }
 
 API const char * const *