commit 273727c0c51432145807505d77b193d5fa4d8245
author Michal Vasko <mvasko@cesnet.cz> Mon Sep 11 10:30:08 2023 +0200
committer Michal Vasko <mvasko@cesnet.cz> Mon Sep 11 10:30:08 2023 +0200
tree 5bb38637b91890258b39a538b31f67d31d9b13cc
parent 03205432f5b6c0de85f9a901ab203b5377c05f83

log UPDATE add line number to paths

src/log.c

diff --git a/src/log.c b/src/log.c
index feaef5f..41c8e90 100644
--- a/src/log.c
+++ b/src/log.c
@@ -833,7 +833,7 @@
 
     if (log_location.paths.count && ((const char *)(log_location.paths.objs[log_location.paths.count - 1]))[0]) {
         /* simply get what is in the provided path string */
-        r = asprintf(path, "Path \"%s\".", (const char *)log_location.paths.objs[log_location.paths.count - 1]);
+        r = asprintf(path, "Path \"%s\"", (const char *)log_location.paths.objs[log_location.paths.count - 1]);
         LY_CHECK_ERR_RET(r == -1, LOGMEM(ctx), LY_EMEM);
     } else {
         /* data/schema node */
@@ -851,28 +851,28 @@
             free(str);
             LY_CHECK_ERR_RET(r == -1, LOGMEM(ctx), LY_EMEM);
         }
+    }
 
-        /* line */
+    /* line */
+    prev = *path;
+    if (log_location.line) {
+        r = asprintf(path, "%s%sine number %" PRIu64, prev ? prev : "", prev ? ", l" : "L", log_location.line);
+        free(prev);
+        LY_CHECK_ERR_RET(r == -1, LOGMEM(ctx), LY_EMEM);
+
+        log_location.line = 0;
+    } else if (log_location.inputs.count) {
+        r = asprintf(path, "%s%sine number %" PRIu64, prev ? prev : "", prev ? ", l" : "L",
+                ((struct ly_in *)log_location.inputs.objs[log_location.inputs.count - 1])->line);
+        free(prev);
+        LY_CHECK_ERR_RET(r == -1, LOGMEM(ctx), LY_EMEM);
+    }
+
+    if (*path) {
         prev = *path;
-        if (log_location.line) {
-            r = asprintf(path, "%s%sine number %" PRIu64, prev ? prev : "", prev ? ", l" : "L", log_location.line);
-            free(prev);
-            LY_CHECK_ERR_RET(r == -1, LOGMEM(ctx), LY_EMEM);
-
-            log_location.line = 0;
-        } else if (log_location.inputs.count) {
-            r = asprintf(path, "%s%sine number %" PRIu64, prev ? prev : "", prev ? ", l" : "L",
-                    ((struct ly_in *)log_location.inputs.objs[log_location.inputs.count - 1])->line);
-            free(prev);
-            LY_CHECK_ERR_RET(r == -1, LOGMEM(ctx), LY_EMEM);
-        }
-
-        if (*path) {
-            prev = *path;
-            r = asprintf(path, "%s.", prev);
-            free(prev);
-            LY_CHECK_ERR_RET(r == -1, LOGMEM(ctx), LY_EMEM);
-        }
+        r = asprintf(path, "%s.", prev);
+        free(prev);
+        LY_CHECK_ERR_RET(r == -1, LOGMEM(ctx), LY_EMEM);
     }
 
     return LY_SUCCESS;