summaryrefslogtreecommitdiffstats
path: root/daemon
diff options
context:
space:
mode:
authorJim Meyering <meyering@redhat.com>2009-07-29 14:48:45 -0400
committerRichard Jones <rjones@redhat.com>2009-07-30 08:59:15 +0100
commit5fd9891646a16792dda91505db6610ad9e36a704 (patch)
treec57c0e63c2c7b6fed39a8ab9e51b34c87ae5198c /daemon
parentd58084f387f8e141224d06169959eb0854dd9bc2 (diff)
downloadlibguestfs-5fd9891646a16792dda91505db6610ad9e36a704.tar.gz
libguestfs-5fd9891646a16792dda91505db6610ad9e36a704.tar.xz
libguestfs-5fd9891646a16792dda91505db6610ad9e36a704.zip
fix comments; move declarations
* daemon/devsparts.c (do_list_devices, do_list_partitions): Remove stray words in comments. Move declarations down to definition.
Diffstat (limited to 'daemon')
-rw-r--r--daemon/devsparts.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/daemon/devsparts.c b/daemon/devsparts.c
index a198ccd9..33579ba5 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;