X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Fext2.c;h=f181b8d7e594dad28329969696625c46e71f71d9;hp=5a1d0fdbc30564503726accc3f27ca77e409f82f;hb=84fc760439e82e6b3616abd0d1f9bd7d7eb01ec0;hpb=a7b73d4a1e09f12b2002083618056f0c823c1dcf

diff --git a/daemon/ext2.c b/daemon/ext2.c
index 5a1d0fd..f181b8d 100644
--- a/daemon/ext2.c
+++ b/daemon/ext2.c
@@ -28,7 +28,7 @@
 #include "actions.h"
 
 char **
-do_tune2fs_l (char *device)
+do_tune2fs_l (const char *device)
 {
   int r;
   char *out, *err;
@@ -36,8 +36,6 @@ do_tune2fs_l (char *device)
   char **ret = NULL;
   int size = 0, alloc = 0;
 
-  IS_DEVICE (device, NULL);
-
   r = command (&out, &err, "/sbin/tune2fs", "-l", device, NULL);
   if (r == -1) {
     reply_with_error ("tune2fs: %s", err);
@@ -77,31 +75,31 @@ do_tune2fs_l (char *device)
       do { colon++; } while (*colon && isspace (*colon));
 
       if (add_string (&ret, &size, &alloc, p) == -1) {
-	free (out);
-	return NULL;
+        free (out);
+        return NULL;
       }
       if (strcmp (colon, "<none>") == 0 ||
-	  strcmp (colon, "<not available>") == 0 ||
-	  strcmp (colon, "(none)") == 0) {
-	if (add_string (&ret, &size, &alloc, "") == -1) {
-	  free (out);
-	  return NULL;
-	}
+          strcmp (colon, "<not available>") == 0 ||
+          strcmp (colon, "(none)") == 0) {
+        if (add_string (&ret, &size, &alloc, "") == -1) {
+          free (out);
+          return NULL;
+        }
       } else {
-	if (add_string (&ret, &size, &alloc, colon) == -1) {
-	  free (out);
-	  return NULL;
-	}
+        if (add_string (&ret, &size, &alloc, colon) == -1) {
+          free (out);
+          return NULL;
+        }
       }
     }
     else {
       if (add_string (&ret, &size, &alloc, p) == -1) {
-	free (out);
-	return NULL;
+        free (out);
+        return NULL;
       }
       if (add_string (&ret, &size, &alloc, "") == -1) {
-	free (out);
-	return NULL;
+        free (out);
+        return NULL;
       }
     }
 
@@ -117,13 +115,11 @@ do_tune2fs_l (char *device)
 }
 
 int
-do_set_e2label (char *device, char *label)
+do_set_e2label (const char *device, const char *label)
 {
   int r;
   char *err;
 
-  IS_DEVICE (device, -1);
-
   r = command (NULL, &err, "/sbin/e2label", device, label, NULL);
   if (r == -1) {
     reply_with_error ("e2label: %s", err);
@@ -136,13 +132,11 @@ do_set_e2label (char *device, char *label)
 }
 
 char *
-do_get_e2label (char *device)
+do_get_e2label (const char *device)
 {
   int r, len;
   char *out, *err;
 
-  IS_DEVICE (device, NULL);
-
   r = command (&out, &err, "/sbin/e2label", device, NULL);
   if (r == -1) {
     reply_with_error ("e2label: %s", err);
@@ -162,13 +156,11 @@ do_get_e2label (char *device)
 }
 
 int
-do_set_e2uuid (char *device, char *uuid)
+do_set_e2uuid (const char *device, const char *uuid)
 {
   int r;
   char *err;
 
-  IS_DEVICE (device, -1);
-
   r = command (NULL, &err, "/sbin/tune2fs", "-U", uuid, device, NULL);
   if (r == -1) {
     reply_with_error ("tune2fs -U: %s", err);
@@ -181,13 +173,11 @@ do_set_e2uuid (char *device, char *uuid)
 }
 
 char *
-do_get_e2uuid (char *device)
+do_get_e2uuid (const char *device)
 {
   int r;
   char *out, *err, *p, *q;
 
-  IS_DEVICE (device, NULL);
-
   /* It's not so straightforward to get the volume UUID.  We have
    * to use tune2fs -l and then look for a particular string in
    * the output.
@@ -244,13 +234,11 @@ do_get_e2uuid (char *device)
 }
 
 int
-do_resize2fs (char *device)
+do_resize2fs (const char *device)
 {
   char *err;
   int r;
 
-  IS_DEVICE (device, -1);
-
   r = command (NULL, &err, "/sbin/resize2fs", device, NULL);
   if (r == -1) {
     reply_with_error ("resize2fs: %s", err);
@@ -263,13 +251,11 @@ do_resize2fs (char *device)
 }
 
 int
-do_e2fsck_f (char *device)
+do_e2fsck_f (const char *device)
 {
   char *err;
   int r;
 
-  IS_DEVICE (device, -1);
-
   r = command (NULL, &err, "/sbin/e2fsck", "-p", "-f", device, NULL);
   if (r == -1) {
     reply_with_error ("e2fsck: %s", err);