lib: mgmtd: fix/stdize debug message macros

Signed-off-by: Christian Hopps <chopps@labn.net>
(cherry picked from commit 79d40972fddc2651b499bf2f5780aea97c9f5d07)

diff --git a/lib/mgmt_be_client.c b/lib/mgmt_be_client.c
index 5c875204f7af82b4776f0acca180c25730dba6d1..24084f6fe8c4746bc4e2f22285f62e4fa375fa49 100644 (file)
--- a/lib/mgmt_be_client.c
+++ b/lib/mgmt_be_client.c
@@ -21,7 +21,7 @@
 #include "lib/mgmt_be_client_clippy.c"
 
 #define MGMTD_BE_CLIENT_DBG(fmt, ...)                                          \
-       DEBUGD(&mgmt_dbg_be_client, "BE-CLIENT: %s:" fmt, __func__,            \
+       DEBUGD(&mgmt_dbg_be_client, "BE-CLIENT: %s: " fmt, __func__,           \
               ##__VA_ARGS__)
 #define MGMTD_BE_CLIENT_ERR(fmt, ...)                                          \
        zlog_err("BE-CLIENT: %s: ERROR: " fmt, __func__, ##__VA_ARGS__)

diff --git a/lib/mgmt_fe_client.h b/lib/mgmt_fe_client.h
index edf861746c2d21274d228ac580ba11c4799bca5c..845d0bd94a087c50d479788ae62acd1030815880 100644 (file)
--- a/lib/mgmt_fe_client.h
+++ b/lib/mgmt_fe_client.h
@@ -120,7 +120,7 @@ struct mgmt_fe_client_cbs {
 extern struct debug mgmt_dbg_fe_client;
 
 #define MGMTD_FE_CLIENT_DBG(fmt, ...)                                          \
-       DEBUGD(&mgmt_dbg_fe_client, "FE-CLIENT: %s:" fmt, __func__,            \
+       DEBUGD(&mgmt_dbg_fe_client, "FE-CLIENT: %s: " fmt, __func__,           \
               ##__VA_ARGS__)
 #define MGMTD_FE_CLIENT_ERR(fmt, ...)                                          \
        zlog_err("FE-CLIENT: %s: ERROR: " fmt, __func__, ##__VA_ARGS__)

diff --git a/mgmtd/mgmt_be_adapter.c b/mgmtd/mgmt_be_adapter.c
index e4a62951d28d9a2203e04d2e784b35e9c9197f4a..49a307e9c208b042d9a74b3871a8383c7f272181 100644 (file)
--- a/mgmtd/mgmt_be_adapter.c
+++ b/mgmtd/mgmt_be_adapter.c
@@ -20,7 +20,7 @@
 #include "mgmtd/mgmt_be_adapter.h"
 
 #define MGMTD_BE_ADAPTER_DBG(fmt, ...)                                         \
-       DEBUGD(&mgmt_debug_be, "BE-ADAPTER: %s:" fmt, __func__, ##__VA_ARGS__)
+       DEBUGD(&mgmt_debug_be, "BE-ADAPTER: %s: " fmt, __func__, ##__VA_ARGS__)
 #define MGMTD_BE_ADAPTER_ERR(fmt, ...)                                         \
        zlog_err("BE-ADAPTER: %s: ERROR: " fmt, __func__, ##__VA_ARGS__)
 

diff --git a/mgmtd/mgmt_ds.c b/mgmtd/mgmt_ds.c
index 3fd47862b2e8dcae137ce154dcf5156f05f43724..2926c9dd4f760a879b131304e72ede0b75046ebe 100644 (file)
--- a/mgmtd/mgmt_ds.c
+++ b/mgmtd/mgmt_ds.c
@@ -16,7 +16,7 @@
 #include "libyang/libyang.h"
 
 #define MGMTD_DS_DBG(fmt, ...)                                                 \
-       DEBUGD(&mgmt_debug_ds, "%s:" fmt, __func__, ##__VA_ARGS__)
+       DEBUGD(&mgmt_debug_ds, "DS: %s: " fmt, __func__, ##__VA_ARGS__)
 #define MGMTD_DS_ERR(fmt, ...)                                                 \
        zlog_err("%s: ERROR: " fmt, __func__, ##__VA_ARGS__)
 

diff --git a/mgmtd/mgmt_fe_adapter.c b/mgmtd/mgmt_fe_adapter.c
index 7509d24a6adb7b2a70fbfd6d6562a2db720f4632..eb23fc3d60c0fe97a66b6545b665c19b79fb9d4f 100644 (file)
--- a/mgmtd/mgmt_fe_adapter.c
+++ b/mgmtd/mgmt_fe_adapter.c
@@ -21,7 +21,7 @@
 #include "mgmtd/mgmt_fe_adapter.h"
 
 #define MGMTD_FE_ADAPTER_DBG(fmt, ...)                                         \
-       DEBUGD(&mgmt_debug_fe, "FE-ADAPTER: %s:" fmt, __func__, ##__VA_ARGS__)
+       DEBUGD(&mgmt_debug_fe, "FE-ADAPTER: %s: " fmt, __func__, ##__VA_ARGS__)
 #define MGMTD_FE_ADAPTER_ERR(fmt, ...)                                         \
        zlog_err("FE-ADAPTER: %s: ERROR: " fmt, __func__, ##__VA_ARGS__)
 

diff --git a/mgmtd/mgmt_txn.c b/mgmtd/mgmt_txn.c
index 6b85bd68f321254edef72d7c882fac4e04873c2e..18aeab711ff8c9c151b76b88b7164b4419fdcb33 100644 (file)
--- a/mgmtd/mgmt_txn.c
+++ b/mgmtd/mgmt_txn.c
@@ -15,7 +15,7 @@
 #include "mgmtd/mgmt_txn.h"
 
 #define MGMTD_TXN_DBG(fmt, ...)                                                \
-       DEBUGD(&mgmt_debug_txn, "%s:" fmt, __func__, ##__VA_ARGS__)
+       DEBUGD(&mgmt_debug_txn, "TXN: %s: " fmt, __func__, ##__VA_ARGS__)
 #define MGMTD_TXN_ERR(fmt, ...)                                                \
        zlog_err("%s: ERROR: " fmt, __func__, ##__VA_ARGS__)