search for: 22b81de

Cosmetic change as suggested in this previous patch: https://www.redhat.com/archives/libguestfs/2016-November/msg00111.html Matteo Cafasso (2): lib: generic function for temporary path generation lib: use guestfs_int_make_temp_path to generate temporary files src/drives.c | 5 ++--- src/file.c | 22 +++++++++------------- src/guestfs-internal.h | 1 + src/journal.c

...tmpfile = guestfs_int_make_temp_path (g, "ls"); + if (tmpfile == NULL) goto err; - tmpfile = safe_asprintf (g, "%s/ls%d", g->tmpdir, ++g->unique); - if (guestfs_ls0 (g, directory, tmpfile) == -1) goto err; diff --git a/src/journal.c b/src/journal.c index 22b81de..f36e661 100644 --- a/src/journal.c +++ b/src/journal.c @@ -66,10 +66,10 @@ guestfs_impl_journal_get (guestfs_h *g) size_t i, j, size; uint64_t len; - if (guestfs_int_lazy_make_tmpdir (g) == -1) + tmpfile = guestfs_int_make_temp_path (g, "journal"); + if (tmpfile == NULL) g...

...src/inspect-fs.c @@ -34,6 +34,7 @@ #include "xstrtol.h" #include "guestfs.h" +#include "guestfs-private.h" #include "guestfs-internal.h" static int check_filesystem (guestfs_h *g, const char *mountable, diff --git a/src/journal.c b/src/journal.c index 22b81de..e79520d 100644 --- a/src/journal.c +++ b/src/journal.c @@ -42,6 +42,7 @@ #include "full-read.h" #include "guestfs.h" +#include "guestfs-private.h" #include "guestfs-internal.h" #include "guestfs-internal-actions.h" diff --git a/src/mountabl...

Move the generate_all_structs and generate_all_headers functions, previously internal within the implementation of generate_guestfs_h, to be usable by other functions in the same "C" module (but not public). Only code motion. --- generator/c.ml | 163 +++++++++++++++++++++++++++++---------------------------- 1 file changed, 82 insertions(+), 81 deletions(-) diff --git a/generator/c.ml

...lude "guestfs.h" #include "guestfs-internal.h" #include "guestfs-internal-actions.h" -#include "guestfs_protocol.h" COMPILE_REGEXP (re_primary_partition, "^/dev/(?:h|s|v)d.[1234]$", 0) diff --git a/src/journal.c b/src/journal.c index b36b362..22b81de 100644 --- a/src/journal.c +++ b/src/journal.c @@ -20,7 +20,6 @@ #include <stdio.h> #include <stdlib.h> -#include <stdint.h> #include <inttypes.h> #include <string.h> #include <unistd.h> @@ -45,7 +44,6 @@ #include "guestfs.h" #include "gue...

--- generator/c.ml | 2 -- 1 file changed, 2 deletions(-) diff --git a/generator/c.ml b/generator/c.ml index 055b683..963cf21 100644 --- a/generator/c.ml +++ b/generator/c.ml @@ -1213,9 +1213,7 @@ and generate_client_actions hash () = #include <stdlib.h> #include <stdint.h> #include <inttypes.h> -#include <sys/types.h> #include <sys/stat.h> -#include