mirrors/libguestfs
1
0
Fork 0
mirror of https://github.com/libguestfs/libguestfs.git synced 2026-03-22 07:03:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

daemon: Use the new CLEANUP_* macros to simplify code.

Browse Source
This commit is contained in:
Richard W.M. Jones
2013-01-28 15:06:07 +00:00
parent 233055974d
commit 950951c67d
64 changed files with 431 additions and 1169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
daemon/zero.c
View File

@@ -88,19 +88,15 @@ wipefs_has_force_option (void)
{
static int flag = -1;
int r;
char *out, *err;
CLEANUP_FREE char *out = NULL, *err = NULL;
if (flag == -1) {
r = command (&out, &err, "wipefs", "--help", NULL);
if (r == -1) {
reply_with_error ("%s", err);
free (out);
free (err);
return -1;
}
free (err);
flag = strstr (out, "--force") != NULL;
free (out);
}
return flag;
@@ -111,7 +107,7 @@ do_wipefs (const char *device)
{
int force;
int r;
char *err = NULL;
CLEANUP_FREE char *err = NULL;
const size_t MAX_ARGS = 16;
const char *argv[MAX_ARGS];
size_t i = 0;
@@ -130,11 +126,9 @@ do_wipefs (const char *device)
r = commandv (NULL, &err, argv);
if (r == -1) {
reply_with_error ("%s", err);
free (err);
return -1;
}
free (err);
return 0;
}