search for: appliance_fil

Some compilers do not manage to figure out that the members of it are set only when search_appliance() in the end returns 1, which is already checked. Help them a bit by resetting the appliance_files struct on our own, so they will not report that 'appliance.kernel', and the others are used as uninitialized. --- lib/appliance.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/appliance.c b/lib/appliance.c index 360d4105f..0fa37339e 100644 --- a/lib/appliance.c +++ b/lib/appl...

...deletions(-) > > diff --git a/lib/appliance.c b/lib/appliance.c > index f12918573..c21525961 100644 > --- a/lib/appliance.c > +++ b/lib/appliance.c > @@ -37,18 +37,23 @@ > #include "guestfs.h" > #include "guestfs-internal.h" > > +typedef struct appliance_files { > + char *kernel; > + char *initrd; > + char *image; > +} appliance_files; As a matter of preference, I think that typedefs hide the meaning of the code, so it becomes unclear what we are passing around as a parameter. Attached is a patch which turns this into a simple struct....

...t; lib/appliance.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/lib/appliance.c b/lib/appliance.c > index 66f91cb0a..42591e7d7 100644 > --- a/lib/appliance.c > +++ b/lib/appliance.c > @@ -222,7 +222,7 @@ search_appliance (guestfs_h *g, struct appliance_files *appliance) > static int > contains_old_style_appliance (guestfs_h *g, const char *path, void *data) > { > - return dir_contains_files (g, path, kernel_name, initrd_name, NULL); > + return dir_contains_files (g, path, kernel_name, initrd_name, (void *) NULL); > } > &g...

...| 1 - ruby/run-ruby-tests | 1 - 11 files changed, 0 insertions(+), 11 deletions(-) diff --git a/appliance/Makefile.am b/appliance/Makefile.am index 8391b8b..d1338bf 100644 --- a/appliance/Makefile.am +++ b/appliance/Makefile.am @@ -146,4 +146,3 @@ CLEANFILES = $(APPLIANCE_FILES) packagelist kmod.whitelist supermin.incfiles clean-local: rm -rf $(top_builddir)/initramfs - diff --git a/appliance/debian/modules/y0_install-guestfsd b/appliance/debian/modules/y0_install-guestfsd index 17bbbdc..c95e4f0 100755 --- a/appliance/debian/modules/y0_install-guestfsd +++ b/applian...