Remove several unused local variables.

[libguestfs.git] / src / appliance.c

diff --git a/src/appliance.c b/src/appliance.c
index 7dc42c1..b6854b0 100644 (file)
--- a/src/appliance.c
+++ b/src/appliance.c
@@ -41,14 +41,15 @@
 #include "guestfs-internal-actions.h"
 #include "guestfs_protocol.h"
 
+/* Old-style appliance is going to be obsoleted. */
 static const char *kernel_name = "vmlinuz." host_cpu;
 static const char *initrd_name = "initramfs." host_cpu ".img";
 
 static int find_path (guestfs_h *g, int (*pred) (guestfs_h *g, const char *pelem, void *data), void *data, char **pelem);
 static int dir_contains_file (const char *dir, const char *file);
 static int dir_contains_files (const char *dir, ...);
-static int contains_supermin_appliance (guestfs_h *g, const char *path, void *data);
 static int contains_ordinary_appliance (guestfs_h *g, const char *path, void *data);
+static int contains_supermin_appliance (guestfs_h *g, const char *path, void *data);
 static char *calculate_supermin_checksum (guestfs_h *g, const char *supermin_path);
 static int check_for_cached_appliance (guestfs_h *g, const char *supermin_path, const char *checksum, char **kernel, char **initrd, char **appliance);
 static int build_supermin_appliance (guestfs_h *g, const char *supermin_path, const char *checksum, char **kernel, char **initrd, char **appliance);
@@ -141,15 +142,15 @@ guestfs___build_appliance (guestfs_h *g,
 }
 
 static int
-contains_supermin_appliance (guestfs_h *g, const char *path, void *data)
+contains_ordinary_appliance (guestfs_h *g, const char *path, void *data)
 {
-  return dir_contains_files (path, "supermin.d", "kmod.whitelist", NULL);
+  return dir_contains_files (path, kernel_name, initrd_name, NULL);
 }
 
 static int
-contains_ordinary_appliance (guestfs_h *g, const char *path, void *data)
+contains_supermin_appliance (guestfs_h *g, const char *path, void *data)
 {
-  return dir_contains_files (path, kernel_name, initrd_name, NULL);
+  return dir_contains_files (path, "supermin.d", NULL);
 }
 
 /* supermin_path is a path which is known to contain a supermin