From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 2 Nov 2023 08:40:48 +0000 (+0000)
Subject: jail: Correctly compile out debug stuff when not enabled
X-Git-Tag: 0.9.30~1314
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6ac51607ec2b1395df75c7260f1c18344a07edca;p=pakfire.git

jail: Correctly compile out debug stuff when not enabled

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/libpakfire/jail.c b/src/libpakfire/jail.c
index fff8c7e67..f59d07d7e 100644
--- a/src/libpakfire/jail.c
+++ b/src/libpakfire/jail.c
@@ -148,7 +148,9 @@ struct pakfire_jail_exec {
 		// Logging
 		int log_INFO[2];
 		int log_ERROR[2];
+#ifdef ENABLE_DEBUG
 		int log_DEBUG[2];
+#endif /* ENABLE_DEBUG */
 	} pipes;
 
 	// Communicate
@@ -166,7 +168,9 @@ struct pakfire_jail_exec {
 		// Logging
 		struct pakfire_log_buffer log_INFO;
 		struct pakfire_log_buffer log_ERROR;
+#ifdef ENABLE_DEBUG
 		struct pakfire_log_buffer log_DEBUG;
+#endif /* ENABLE_DEBUG */
 	} buffers;
 
 	struct pakfire_cgroup* cgroup;
@@ -782,14 +786,26 @@ static int pakfire_jail_wait(struct pakfire_jail* jail, struct pakfire_jail_exec
 	// Logging
 	const int log_INFO  = pakfire_jail_get_pipe_to_read(jail, &ctx->pipes.log_INFO);
 	const int log_ERROR = pakfire_jail_get_pipe_to_read(jail, &ctx->pipes.log_ERROR);
+#ifdef ENABLE_DEBUG
 	const int log_DEBUG = pakfire_jail_get_pipe_to_read(jail, &ctx->pipes.log_DEBUG);
+#endif /* ENABLE_DEBUG */
 
 	// Signals
 	const int signalfd = pakfire_jail_handle_signals(jail);
 
 	// Make a list of all file descriptors we are interested in
 	const int fds[] = {
-		stdin, stdout, stderr, pidfd, timerfd, signalfd, log_INFO, log_ERROR, log_DEBUG,
+		stdin,
+		stdout,
+		stderr,
+		pidfd,
+		timerfd,
+		signalfd,
+		log_INFO,
+		log_ERROR,
+#ifdef ENABLE_DEBUG
+		log_DEBUG,
+#endif /* ENABLE_DEBUG */
 	};
 
 	// Setup epoll
@@ -947,11 +963,13 @@ static int pakfire_jail_wait(struct pakfire_jail* jail, struct pakfire_jail_exec
 
 					callback = pakfire_jail_log;
 
+#ifdef ENABLE_DEBUG
 				} else if (fd == log_DEBUG) {
 					buffer = &ctx->buffers.log_DEBUG;
 					priority = LOG_DEBUG;
 
 					callback = pakfire_jail_log;
+#endif /* ENABLE_DEBUG */
 
 				// Handle anything from the log pipes
 				} else if (fd == stdout) {
@@ -1879,7 +1897,9 @@ static int __pakfire_jail_exec(struct pakfire_jail* jail, const char* argv[],
 			.stderr    = { -1, -1 },
 			.log_INFO  = { -1, -1 },
 			.log_ERROR = { -1, -1 },
+#ifdef ENABLE_DEBUG
 			.log_DEBUG = { -1, -1 },
+#endif /* ENABLE_DEBUG */
 		},
 
 		.communicate = {
@@ -2055,7 +2075,9 @@ ERROR:
 		close(ctx.pidfd);
 	pakfire_jail_close_pipe(jail, ctx.pipes.log_INFO);
 	pakfire_jail_close_pipe(jail, ctx.pipes.log_ERROR);
+#ifdef ENABLE_DEBUG
 	pakfire_jail_close_pipe(jail, ctx.pipes.log_DEBUG);
+#endif /* ENABLE_DEBUG */
 
 	return exit;
 }