search for: fail_stmt

This is a series of simplifications to the stubs code. It's all refactoring, there is no functional change. Rich.

.../daemon/daemon.h +++ b/daemon/daemon.h @@ -336,6 +336,24 @@ is_zero (const char *buffer, size_t size) } \ } while (0) +/* Helper for functions which need either a root(/sysroot) path, + * OR a /dev/ device which exists. + */ +#define DUP_RESOLVE_DEVICE_OR_PATH(path,buf,cancel_stmt,fail_stmt) \ + do { \ + int is_dev; \ + is_dev = STREQLEN (path, "/dev/", 5); \ + buf = is_dev ? strdup (path)...

...45..f7d0c75 100644 --- a/daemon/daemon.h +++ b/daemon/daemon.h @@ -336,6 +336,22 @@ is_zero (const char *buffer, size_t size) } \ } while (0) +/* Same as REQUIRE_ROOT_OR_RESOLVE_DEVICE but this strdup's the result. */ +#define STRDUP_RESOLVE_DEVICE_OR_PATH(path,buf,cancel_stmt,fail_stmt) \ + do { \ + int is_dev; \ + is_dev = STREQLEN (path, "/dev/", 5); \ + buf = is_dev ? strdup (path)...

In the kernel and qemu communities it is routine for patches that will be backported to stable branches to be posted for review. I'm proposing we do the same for libguestfs stable branches. All of the attached have been tested with 'make check-release'. Rich.

This started as a simple warning-elimination change. I'll get back to that series shortly ;-) It turned into a factorization and constification exercise during which I got a taste of ocaml. Thanks to Rich Jones for help with a few snippets in generator.ml. The overall result is that many previously-manually-maintained bits from daemon/*.c functions are now hoisted into the automatically-

...rc/generator.ml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/daemon/daemon.h b/daemon/daemon.h index 3f4c480..1cdb480 100644 --- a/daemon/daemon.h +++ b/daemon/daemon.h @@ -164,7 +164,7 @@ extern void reply (xdrproc_t xdrp, char *ret); */ #define RESOLVE_DEVICE(path,fail_stmt) \ do { \ - if (strncmp ((path), "/dev/", 5) != 0) { \ + if (STRNEQLEN ((path), "/dev/", 5)) { \ reply_with_error ("%s: %s: expecting a device name", __func__, (path)); \ fail_stmt; \ } \ diff --git a/daemon/g...

These 3 patches implement support for APIs which must accept a mountable, but don't update apis which must return mountables. Matt

This type is initially identical to Device. --- generator/bindtests.ml | 2 +- generator/c.ml | 7 +++++-- generator/csharp.ml | 6 ++++-- generator/daemon.ml | 4 ++-- generator/erlang.ml | 6 +++--- generator/fish.ml | 8 ++++---- generator/gobject.ml | 11 ++++++----- generator/haskell.ml | 11 +++++++---- generator/java.ml | 10 +++++-----

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