build: remove trailing blanks, enable syntax-check

[libguestfs.git] / daemon / devsparts.c

diff --git a/daemon/devsparts.c b/daemon/devsparts.c
index a198ccd..1970e7d 100644 (file)
--- 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) {
@@ -47,24 +46,24 @@ do_list_devices (void)
 
   while ((d = readdir (dir)) != NULL) {
     if (strncmp (d->d_name, "sd", 2) == 0 ||
-       strncmp (d->d_name, "hd", 2) == 0 ||
-       strncmp (d->d_name, "vd", 2) == 0) {
+        strncmp (d->d_name, "hd", 2) == 0 ||
+        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;
+        perror (buf);
+        continue;
       }
       close (fd);
 
       if (add_string (&r, &size, &alloc, buf) == -1) {
-       closedir (dir);
-       return NULL;
+        closedir (dir);
+        return NULL;
       }
     }
   }
@@ -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) {
@@ -102,18 +100,18 @@ do_list_partitions (void)
 
   while ((d = readdir (dir)) != NULL) {
     if (strncmp (d->d_name, "sd", 2) == 0 ||
-       strncmp (d->d_name, "hd", 2) == 0 ||
-       strncmp (d->d_name, "vd", 2) == 0) {
+        strncmp (d->d_name, "hd", 2) == 0 ||
+        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;
+        perror (buf);
+        continue;
       }
       close (fd);
 
@@ -124,26 +122,26 @@ do_list_partitions (void)
 
       dir2 = opendir (buf);
       if (!dir2) {
-       reply_with_perror ("opendir: %s", buf);
-       free_stringslen (r, size);
-       return NULL;
+        reply_with_perror ("opendir: %s", buf);
+        free_stringslen (r, size);
+        return NULL;
       }
       while ((d = readdir (dir2)) != NULL) {
-       if (strncmp (d->d_name, devname, strlen (devname)) == 0) {
-         snprintf (buf, sizeof buf, "/dev/%s", d->d_name);
-
-         if (add_string (&r, &size, &alloc, buf) == -1) {
-           closedir (dir2);
-           closedir (dir);
-           return NULL;
-         }
-       }
+        if (strncmp (d->d_name, devname, strlen (devname)) == 0) {
+          snprintf (buf, sizeof buf, "/dev/%s", d->d_name);
+
+          if (add_string (&r, &size, &alloc, buf) == -1) {
+            closedir (dir2);
+            closedir (dir);
+            return NULL;
+          }
+        }
       }
 
       if (closedir (dir2) == -1) {
-       reply_with_perror ("closedir: /sys/block/%s", devname);
-       free_stringslen (r, size);
-       return NULL;
+        reply_with_perror ("closedir: /sys/block/%s", devname);
+        free_stringslen (r, size);
+        return NULL;
       }
     }
   }