From 79d40972fddc2651b499bf2f5780aea97c9f5d07 Mon Sep 17 00:00:00 2001 From: Christian Hopps Date: Mon, 12 Jun 2023 00:25:07 -0400 Subject: [PATCH] lib: mgmtd: fix/stdize debug message macros Signed-off-by: Christian Hopps --- lib/mgmt_be_client.c | 2 +- lib/mgmt_fe_client.h | 2 +- mgmtd/mgmt_be_adapter.c | 2 +- mgmtd/mgmt_ds.c | 2 +- mgmtd/mgmt_fe_adapter.c | 2 +- mgmtd/mgmt_txn.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/mgmt_be_client.c b/lib/mgmt_be_client.c index 5c875204f7..24084f6fe8 100644 --- 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 edf861746c..845d0bd94a 100644 --- 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 e4a62951d2..49a307e9c2 100644 --- 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 3fd47862b2..2926c9dd4f 100644 --- 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 7509d24a6a..eb23fc3d60 100644 --- 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 6b85bd68f3..18aeab711f 100644 --- 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__)