X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=daemon%2Fext2.c;h=0f7a66c18c2dd209ad0125a1dd541d6423c094d1;hb=92ac2400a326256ef819e0195d7ecfa7f03645be;hp=4e1b398bfd4d23f58e86033e38f3da86ce6fe5e0;hpb=2df2f2854ed2d1f9857ef3c5aaca29810cf3c506;p=libguestfs.git diff --git a/daemon/ext2.c b/daemon/ext2.c index 4e1b398..0f7a66c 100644 --- a/daemon/ext2.c +++ b/daemon/ext2.c @@ -1,5 +1,5 @@ /* libguestfs - the guestfsd daemon - * Copyright (C) 2009 Red Hat Inc. + * Copyright (C) 2009 Red Hat Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -28,7 +28,7 @@ #include "actions.h" char ** -do_tune2fs_l (const char *device) +do_tune2fs_l (char *device) { int r; char *out, *err; @@ -77,31 +77,31 @@ do_tune2fs_l (const 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, "") == 0 || - strcmp (colon, "") == 0 || - strcmp (colon, "(none)") == 0) { - if (add_string (&ret, &size, &alloc, "") == -1) { - free (out); - return NULL; - } + strcmp (colon, "") == 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,7 +117,7 @@ do_tune2fs_l (const char *device) } int -do_set_e2label (const char *device, const char *label) +do_set_e2label (char *device, char *label) { int r; char *err; @@ -136,7 +136,7 @@ do_set_e2label (const char *device, const char *label) } char * -do_get_e2label (const char *device) +do_get_e2label (char *device) { int r, len; char *out, *err; @@ -162,7 +162,7 @@ do_get_e2label (const char *device) } int -do_set_e2uuid (const char *device, const char *uuid) +do_set_e2uuid (char *device, char *uuid) { int r; char *err; @@ -181,7 +181,7 @@ do_set_e2uuid (const char *device, const char *uuid) } char * -do_get_e2uuid (const char *device) +do_get_e2uuid (char *device) { int r; char *out, *err, *p, *q; @@ -244,7 +244,7 @@ do_get_e2uuid (const char *device) } int -do_resize2fs (const char *device) +do_resize2fs (char *device) { char *err; int r; @@ -263,7 +263,7 @@ do_resize2fs (const char *device) } int -do_e2fsck_f (const char *device) +do_e2fsck_f (char *device) { char *err; int r;