From: Jim Meyering <meyering@redhat.com>
Date: Wed, 29 Jul 2009 18:48:45 +0000 (-0400)
Subject: fix comments; move declarations
X-Git-Tag: 1.0.66~57
X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=commitdiff_plain;h=5fd9891646a16792dda91505db6610ad9e36a704

fix comments; move declarations

* daemon/devsparts.c (do_list_devices, do_list_partitions):
Remove stray words in comments.
Move declarations down to definition.
---

diff --git a/daemon/devsparts.c b/daemon/devsparts.c
index a198ccd..33579ba 100644
--- a/daemon/devsparts.c
+++ b/daemon/devsparts.c
@@ -37,7 +37,6 @@ do_list_devices (void)
   DIR *dir;
   struct dirent *d;
   char buf[256];
-  int fd;
 
   dir = opendir ("/sys/block");
   if (!dir) {
@@ -51,11 +50,11 @@ do_list_devices (void)
 	strncmp (d->d_name, "vd", 2) == 0) {
       snprintf (buf, sizeof buf, "/dev/%s", d->d_name);
 
-      /* RHBZ#514505: Some versions of qemu <= 0.10 device to add a
+      /* RHBZ#514505: Some versions of qemu <= 0.10 add a
        * CD-ROM device even though we didn't request it.  Try to
        * detect this by seeing if the device contains media.
        */
-      fd = open (buf, O_RDONLY);
+      int fd = open (buf, O_RDONLY);
       if (fd == -1) {
 	perror (buf);
 	continue;
@@ -92,7 +91,6 @@ do_list_partitions (void)
   DIR *dir, *dir2;
   struct dirent *d;
   char buf[256], devname[256];
-  int fd;
 
   dir = opendir ("/sys/block");
   if (!dir) {
@@ -106,11 +104,11 @@ do_list_partitions (void)
 	strncmp (d->d_name, "vd", 2) == 0) {
       snprintf (buf, sizeof buf, "/dev/%s", d->d_name);
 
-      /* RHBZ#514505: Some versions of qemu <= 0.10 device to add a
+      /* RHBZ#514505: Some versions of qemu <= 0.10 add a
        * CD-ROM device even though we didn't request it.  Try to
        * detect this by seeing if the device contains media.
        */
-      fd = open (buf, O_RDONLY);
+      int fd = open (buf, O_RDONLY);
       if (fd == -1) {
 	perror (buf);
 	continue;