debug: pass struct debug_class *config to reopen_one_log()
authorRalph Boehme <slow@samba.org>
Mon, 23 Nov 2020 14:46:47 +0000 (15:46 +0100)
committerKarolin Seeger <kseeger@samba.org>
Wed, 9 Dec 2020 10:44:15 +0000 (10:44 +0000)
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)

lib/util/debug.c

index 1650551a76631c66a432222c7d5cc64793db69bf..681b12e00464465b16391fef12dd2ed3f76f132f 100644 (file)
@@ -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;
                }