From 2cb8e5ddb8a3d28c2076254ccc2ef2f53d0815d3 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 22 Jan 2016 12:52:33 +0000 Subject: [PATCH] Minor fixes to "daemon: Split out command* functions and CLEANUP_* macros." This updates commit d94860d7e8357b70d2a301f381fc41aca49c4369. Thanks: Pino Toscano. --- daemon/cleanups.h | 4 +++- daemon/command.c | 5 +---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/daemon/cleanups.h b/daemon/cleanups.h index 1a56ead8d..6746e2744 100644 --- a/daemon/cleanups.h +++ b/daemon/cleanups.h @@ -19,7 +19,9 @@ #ifndef GUESTFSD_CLEANUPS_H #define GUESTFSD_CLEANUPS_H -/* Used by the CLEANUP_* macros. */ +/* These functions are used internally by the CLEANUP_* macros. + * Don't call them directly. + */ extern void cleanup_free (void *ptr); extern void cleanup_free_string_list (void *ptr); extern void cleanup_unlink_free (void *ptr); diff --git a/daemon/command.c b/daemon/command.c index 3e757aa31..73fce564d 100644 --- a/daemon/command.c +++ b/daemon/command.c @@ -31,6 +31,7 @@ #include "ignore-value.h" +#include "guestfs-internal-all.h" #include "command.h" #include "cleanups.h" @@ -39,10 +40,6 @@ extern int verbose; extern const char *sysroot; extern size_t sysroot_len; -#ifndef MAX -# define MAX(a,b) ((a)>(b)?(a):(b)) -#endif - /* For improved readability dealing with pipe arrays */ #define PIPE_READ 0 #define PIPE_WRITE 1