char **ret = NULL;
int size = 0, alloc = 0;
- IS_DEVICE (device, NULL);
+ RESOLVE_DEVICE (device, return NULL);
r = command (&out, &err, "/sbin/tune2fs", "-l", device, NULL);
if (r == -1) {
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;
}
}
int r;
char *err;
- IS_DEVICE (device, -1);
+ RESOLVE_DEVICE (device, return -1);
r = command (NULL, &err, "/sbin/e2label", device, label, NULL);
if (r == -1) {
int r, len;
char *out, *err;
- IS_DEVICE (device, NULL);
+ RESOLVE_DEVICE (device, return NULL);
r = command (&out, &err, "/sbin/e2label", device, NULL);
if (r == -1) {
int r;
char *err;
- IS_DEVICE (device, -1);
+ RESOLVE_DEVICE (device, return -1);
r = command (NULL, &err, "/sbin/tune2fs", "-U", uuid, device, NULL);
if (r == -1) {
int r;
char *out, *err, *p, *q;
- IS_DEVICE (device, NULL);
+ RESOLVE_DEVICE (device, return 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
char *err;
int r;
- IS_DEVICE (device, -1);
+ RESOLVE_DEVICE (device, return -1);
r = command (NULL, &err, "/sbin/resize2fs", device, NULL);
if (r == -1) {
char *err;
int r;
- IS_DEVICE (device, -1);
+ RESOLVE_DEVICE (device, return -1);
r = command (NULL, &err, "/sbin/e2fsck", "-p", "-f", device, NULL);
if (r == -1) {