From: Martin Schwenke <martin@meltin.net>
Date: Fri, 5 Jul 2019 03:13:16 +0000 (+1000)
Subject: ctdb-mutex: Update to use modern debug macro
X-Git-Tag: tdb-1.4.2~410
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=98169241ef74d92beb433639834dfc0decc52a75;p=thirdparty%2Fsamba.git

ctdb-mutex: Update to use modern debug macro

One of these had a missing space, so this implicitly fixes it.  It
also drops the need to unnecessarily include common.h, which comes
with some dependency baggage.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
---

diff --git a/ctdb/server/ctdb_cluster_mutex.c b/ctdb/server/ctdb_cluster_mutex.c
index 719b5c14f7a..08784c0340c 100644
--- a/ctdb/server/ctdb_cluster_mutex.c
+++ b/ctdb/server/ctdb_cluster_mutex.c
@@ -33,7 +33,6 @@
 
 #include "ctdb_private.h"
 #include "common/common.h"
-#include "common/logging.h"
 
 #include "ctdb_cluster_mutex.h"
 
@@ -234,7 +233,7 @@ ctdb_cluster_mutex(TALLOC_CTX *mem_ctx,
 
 	h = talloc(mem_ctx, struct ctdb_cluster_mutex_handle);
 	if (h == NULL) {
-		DEBUG(DEBUG_ERR, (__location__ " out of memory\n"));
+		DBG_ERR("out of memory\n");
 		return NULL;
 	}
 
@@ -246,7 +245,7 @@ ctdb_cluster_mutex(TALLOC_CTX *mem_ctx,
 	ret = pipe(h->fd);
 	if (ret != 0) {
 		talloc_free(h);
-		DEBUG(DEBUG_ERR, (__location__ " Failed to open pipe\n"));
+		DBG_ERR("Failed to open pipe\n");
 		return NULL;
 	}
 	set_close_on_exec(h->fd[0]);
@@ -302,7 +301,7 @@ ctdb_cluster_mutex(TALLOC_CTX *mem_ctx,
 		execv(args[0], args);
 
 		/* Only happens on error */
-		DEBUG(DEBUG_ERR, (__location__ "execv() failed\n"));
+		DBG_ERR("execv() failed\n");
 		_exit(1);
 	}
 
@@ -313,7 +312,7 @@ ctdb_cluster_mutex(TALLOC_CTX *mem_ctx,
 		DBG_WARNING("Failed to unblock SIGTERM (%d)\n", errno);
 	}
 
-	DEBUG(DEBUG_DEBUG, (__location__ " Created PIPE FD:%d\n", h->fd[0]));
+	DBG_DEBUG("Created PIPE FD:%d\n", h->fd[0]);
 	set_close_on_exec(h->fd[0]);
 
 	close(h->fd[1]);