[dm-devel] [PATCH 2/4] multipath-tools: libdmmp: Allow log function as NULL.

Gris Ge fge at redhat.com
Tue Nov 21 14:09:15 UTC 2017


 * Do nothing when user set log function to NULL.
 * Update document to reflect so.

Signed-off-by: Gris Ge <fge at redhat.com>
---
 libdmmp/libdmmp.c         | 3 +++
 libdmmp/libdmmp/libdmmp.h | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/libdmmp/libdmmp.c b/libdmmp/libdmmp.c
index b4e7f08f..74cdb0a6 100644
--- a/libdmmp/libdmmp.c
+++ b/libdmmp/libdmmp.c
@@ -89,6 +89,9 @@ void _dmmp_log(struct dmmp_context *ctx, int priority, const char *file,
 {
 	va_list args;
 
+	if (ctx->log_func == NULL)
+		return;
+
 	va_start(args, format);
 	ctx->log_func(ctx, priority, file, line, func_name, format, args);
 	va_end(args);
diff --git a/libdmmp/libdmmp/libdmmp.h b/libdmmp/libdmmp/libdmmp.h
index 72b79b97..6e233e4f 100644
--- a/libdmmp/libdmmp/libdmmp.h
+++ b/libdmmp/libdmmp/libdmmp.h
@@ -258,7 +258,8 @@ DMMP_DLL_EXPORT int dmmp_context_log_priority_get(struct dmmp_context *ctx);
  *	Pointer of 'struct dmmp_context'.
  *	If this pointer is NULL, your program will be terminated by assert.
  * @log_func:
- *	Pointer of log handler function.
+ *	Pointer of log handler function. If set to NULL, all log will be
+ *	ignored.
  *
  * Return:
  *	void
-- 
2.15.0




More information about the dm-devel mailing list