From: Ralph Boehme <slow@samba.org>
Date: Mon, 23 Nov 2020 14:46:47 +0000 (+0100)
Subject: debug: pass struct debug_class *config to reopen_one_log()
X-Git-Tag: samba-4.12.11~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f6bd782cb3b68354c6ebe1bae7fd82f4c5f5fb1f;p=thirdparty%2Fsamba.git

debug: pass struct debug_class *config to reopen_one_log()

Pass a pointer to the struct instead of all struct members individually. No
change in behaviour.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14248

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit 29cd139a32d5dbf36bef68eb9c7f1160201e3042)
---

diff --git a/lib/util/debug.c b/lib/util/debug.c
index 1650551a766..681b12e0046 100644
--- a/lib/util/debug.c
+++ b/lib/util/debug.c
@@ -1082,14 +1082,15 @@ static void debug_callback_log(const char *msg, int msg_level)
  Fix from dgibson@linuxcare.com.
 **************************************************************************/
 
-static bool reopen_one_log(int *fd, const char *logfile)
+static bool reopen_one_log(struct debug_class *config)
 {
-	int old_fd = *fd;
+	int old_fd = config->fd;
+	const char *logfile = config->logfile;
 	int new_fd;
 
 	if (logfile == NULL) {
 		debug_close_fd(old_fd);
-		*fd = -1;
+		config->fd = -1;
 		return true;
 	}
 
@@ -1104,7 +1105,7 @@ static bool reopen_one_log(int *fd, const char *logfile)
 
 	debug_close_fd(old_fd);
 	smb_set_close_on_exec(new_fd);
-	*fd = new_fd;
+	config->fd = new_fd;
 
 	return true;
 }
@@ -1164,8 +1165,7 @@ bool reopen_logs_internal(void)
 	state.reopening_logs = true;
 
 	for (i = DBGC_ALL; i < debug_num_classes; i++) {
-		ok = reopen_one_log(&dbgc_config[i].fd,
-				    dbgc_config[i].logfile);
+		ok = reopen_one_log(&dbgc_config[i]);
 		if (!ok) {
 			break;
 		}