diff options
| author | Andreas Schneider <asn@samba.org> | 2015-10-30 13:36:39 +0100 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2015-11-05 09:23:15 +0100 |
| commit | aad7019e2db23521772542cc2da2b1d8bc863024 (patch) | |
| tree | a96dc44a2683bc1f3cce135e5dca9636884b24c5 | |
| parent | 8922654f840c09a2f33a722048a8f3f326da3a4c (diff) | |
| download | samba-aad7019e2db23521772542cc2da2b1d8bc863024.tar.gz | |
uwrap: Improve debug output
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
| -rw-r--r-- | lib/uid_wrapper/uid_wrapper.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/lib/uid_wrapper/uid_wrapper.c b/lib/uid_wrapper/uid_wrapper.c index 96035b06afb..3f9ce98f439 100644 --- a/lib/uid_wrapper/uid_wrapper.c +++ b/lib/uid_wrapper/uid_wrapper.c @@ -136,10 +136,10 @@ enum uwrap_dbglvl_e { #ifdef NDEBUG # define UWRAP_LOG(...) #else /* NDEBUG */ -static void uwrap_log(enum uwrap_dbglvl_e dbglvl, const char *format, ...) PRINTF_ATTRIBUTE(2, 3); -# define UWRAP_LOG(dbglvl, ...) uwrap_log((dbglvl), __VA_ARGS__) +static void uwrap_log(enum uwrap_dbglvl_e dbglvl, const char *function, const char *format, ...) PRINTF_ATTRIBUTE(3, 4); +# define UWRAP_LOG(dbglvl, ...) uwrap_log((dbglvl), __func__, __VA_ARGS__) -static void uwrap_log(enum uwrap_dbglvl_e dbglvl, const char *format, ...) +static void uwrap_log(enum uwrap_dbglvl_e dbglvl, const char *function, const char *format, ...) { char buffer[1024]; va_list va; @@ -156,28 +156,28 @@ static void uwrap_log(enum uwrap_dbglvl_e dbglvl, const char *format, ...) va_end(va); if (lvl >= dbglvl) { + const char *prefix; switch (dbglvl) { case UWRAP_LOG_ERROR: - fprintf(stderr, - "UWRAP_ERROR(%d): %s\n", - (int)getpid(), buffer); + prefix = "UWRAP_ERROR"; break; case UWRAP_LOG_WARN: - fprintf(stderr, - "UWRAP_WARN(%d): %s\n", - (int)getpid(), buffer); + prefix = "UWRAP_WARN"; break; case UWRAP_LOG_DEBUG: - fprintf(stderr, - "UWRAP_DEBUG(%d): %s\n", - (int)getpid(), buffer); + prefix = "UWRAP_DEBUG"; break; case UWRAP_LOG_TRACE: - fprintf(stderr, - "UWRAP_TRACE(%d): %s\n", - (int)getpid(), buffer); + prefix = "UWRAP_TRACE"; break; } + + fprintf(stderr, + "%s(%d) - %s: %s\n", + prefix, + (int)getpid(), + function, + buffer); } } #endif /* NDEBUG */ |