Pino Toscano
2018-Jun-15 10:44 UTC
[Libguestfs] [PATCH] fuse: fix build when not available
The 'localmountpoint' variable in the handle is available only when building with FUSE support, so guard it in a proper #ifdef block. Fixes commit 296370fb86e96eec095d86faf6de8f532395ea54. --- lib/handle.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/handle.c b/lib/handle.c index bc45d29b2..a47aaafab 100644 --- a/lib/handle.c +++ b/lib/handle.c @@ -399,7 +399,9 @@ guestfs_close (guestfs_h *g) free (g->hv); free (g->backend); free (g->backend_data); +#if HAVE_FUSE free (g->localmountpoint); +#endif guestfs_int_free_string_list (g->backend_settings); free (g->append); guestfs_int_free_error_data_list (g); -- 2.17.1
Richard W.M. Jones
2018-Jun-15 16:14 UTC
Re: [Libguestfs] [PATCH] fuse: fix build when not available
On Fri, Jun 15, 2018 at 12:44:04PM +0200, Pino Toscano wrote:> The 'localmountpoint' variable in the handle is available only when > building with FUSE support, so guard it in a proper #ifdef block. > > Fixes commit 296370fb86e96eec095d86faf6de8f532395ea54. > --- > lib/handle.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/lib/handle.c b/lib/handle.c > index bc45d29b2..a47aaafab 100644 > --- a/lib/handle.c > +++ b/lib/handle.c > @@ -399,7 +399,9 @@ guestfs_close (guestfs_h *g) > free (g->hv); > free (g->backend); > free (g->backend_data); > +#if HAVE_FUSE > free (g->localmountpoint); > +#endif > guestfs_int_free_string_list (g->backend_settings); > free (g->append); > guestfs_int_free_error_data_list (g);Obvious fix to my earlier commit, thanks. Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com virt-df lists disk usage of guests without needing to install any software inside the virtual machine. Supports Linux and Windows. http://people.redhat.com/~rjones/virt-df/
Possibly Parallel Threads
- [PATCH v2] fuse: mount_local: Fix crash when called from Java binding.
- [PATCH v3 3/5] threads: Use thread-local storage for errors.
- [PATCH 3/5] threads: Use thread-local storage for errors.
- [PATCH threads v2 0/5] Add support for thread-safe handle.
- [RFC] fuse: mount_local: Fix crash when called from Java binding