X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=inspector%2Fvirt-inspector.c;h=d3e00a9cfc3a192e820be71f04d1d3e859668ed9;hb=3f4dc56a32074a02b1b829bd7a91878f73022d1d;hp=a3c0a04a304a24355f4e714b671eaa817910eba2;hpb=c5cb65f0aac3298e634b183f73fda6644a158018;p=libguestfs.git

diff --git a/inspector/virt-inspector.c b/inspector/virt-inspector.c
index a3c0a04..d3e00a9 100644
--- a/inspector/virt-inspector.c
+++ b/inspector/virt-inspector.c
@@ -83,7 +83,7 @@ usage (int status)
              "  --keys-from-stdin    Read passphrases from stdin\n"
              "  -v|--verbose         Verbose messages\n"
              "  -V|--version         Display version and exit\n"
-             "  -x                   Echo each command before executing it\n"
+             "  -x                   Trace libguestfs API calls\n"
              "For more information, see the manpage %s(1).\n"),
              program_name, program_name, program_name,
              program_name);
@@ -118,11 +118,9 @@ main (int argc, char *argv[])
   };
   struct drv *drvs = NULL;
   struct drv *drv;
-  char *p, *file = NULL;
   const char *format = NULL;
   int c;
   int option_index;
-  int next_prepared_drive = 1;
 
   g = guestfs_create ();
   if (g == NULL) {
@@ -632,7 +630,7 @@ canonicalize (char *dev)
       (dev[5] == 'h' || dev[5] == 'v') &&
       dev[6] == 'd' &&
       c_isalpha (dev[7]) &&
-      c_isdigit (dev[8]))
+      (c_isdigit (dev[8]) || dev[8] == '\0'))
     dev[5] = 's';
 }