search for: fea4a9dcf

...unction 'do_mkswap_U': swap.c:62:9: error: argument 1 null where non-null expected [-Werror=nonnull] if (strlen (label) > SWAP_LABEL_MAX) { ^~~~~~~~~~~~~~ --- daemon/swap.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/daemon/swap.c b/daemon/swap.c index 028bc1ee2..fea4a9dcf 100644 --- a/daemon/swap.c +++ b/daemon/swap.c @@ -22,6 +22,7 @@ #include <stdlib.h> #include <string.h> #include <unistd.h> +#include <assert.h> #include "guestfs_protocol.h" #include "daemon.h" @@ -58,6 +59,7 @@ do_mkswap (const char *device, con...

...t char *compress, char *const *excludes) return -1; } - ADD_ARG (argv, i, str_mksquashfs); + ADD_ARG (argv, i, "mksquashfs"); ADD_ARG (argv, i, buf); ADD_ARG (argv, i, tmpfile); ADD_ARG (argv, i, "-noappend"); diff --git a/daemon/swap.c b/daemon/swap.c index fea4a9dcf..a00937292 100644 --- a/daemon/swap.c +++ b/daemon/swap.c @@ -31,11 +31,6 @@ #include "ignore-value.h" -GUESTFSD_EXT_CMD(str_mkswap, mkswap); -GUESTFSD_EXT_CMD(str_swapon, swapon); -GUESTFSD_EXT_CMD(str_swapoff, swapoff); -GUESTFSD_EXT_CMD(str_swaplabel, swaplabel); - /* Confirmed t...

...t char *compress, char *const *excludes) return -1; } - ADD_ARG (argv, i, str_mksquashfs); + ADD_ARG (argv, i, "mksquashfs"); ADD_ARG (argv, i, buf); ADD_ARG (argv, i, tmpfile); ADD_ARG (argv, i, "-noappend"); diff --git a/daemon/swap.c b/daemon/swap.c index fea4a9dcf..30b37d9a6 100644 --- a/daemon/swap.c +++ b/daemon/swap.c @@ -31,10 +31,7 @@ #include "ignore-value.h" -GUESTFSD_EXT_CMD(str_mkswap, mkswap); -GUESTFSD_EXT_CMD(str_swapon, swapon); -GUESTFSD_EXT_CMD(str_swapoff, swapoff); -GUESTFSD_EXT_CMD(str_swaplabel, swaplabel); +DECLARE_EXTERNAL...

This is a simpler patch that removes GUESTFSD_EXT_CMD completely.

Replace GUESTFSD_EXT_CMD with a command line option ‘./guestfsd --print-external-commands’