summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2017-02-21 16:41:33 -0500
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2017-02-21 16:41:33 -0500
commitb382db9f3b1f1ffa33ed4970cf2e01d2ee4e8d88 (patch)
treeb7024b52728909e7fd9998ed63e19a16addca315
parenta3d8d68cc1698d014575f0f66c58e253bd46c240 (diff)
tree-wide: simplify handling of blkid errors
-rw-r--r--src/boot/bootctl.c56
-rw-r--r--src/shared/dissect-image.c32
-rw-r--r--src/udev/udev-builtin-blkid.c2
3 files changed, 27 insertions, 63 deletions
diff --git a/src/boot/bootctl.c b/src/boot/bootctl.c
index b747a95133..7d6c008ea1 100644
--- a/src/boot/bootctl.c
+++ b/src/boot/bootctl.c
@@ -123,12 +123,8 @@ static int verify_esp(
errno = 0;
b = blkid_new_probe_from_filename(t);
- if (!b) {
- if (errno == 0)
- return log_oom();
-
- return log_error_errno(errno, "Failed to open file system \"%s\": %m", p);
- }
+ if (!b)
+ return log_error_errno(errno ?: ENOMEM, "Failed to open file system \"%s\": %m", p);
blkid_probe_enable_superblocks(b, 1);
blkid_probe_set_superblocks_flags(b, BLKID_SUBLKS_TYPE);
@@ -143,17 +139,13 @@ static int verify_esp(
} else if (r == 1) {
log_error("File system \"%s\" does not contain a label.", p);
return -ENODEV;
- } else if (r != 0) {
- r = errno ? -errno : -EIO;
- return log_error_errno(r, "Failed to probe file system \"%s\": %m", p);
- }
+ } else if (r != 0)
+ return log_error_errno(errno ?: EIO, "Failed to probe file system \"%s\": %m", p);
errno = 0;
r = blkid_probe_lookup_value(b, "TYPE", &v, NULL);
- if (r != 0) {
- r = errno ? -errno : -EIO;
- return log_error_errno(r, "Failed to probe file system type \"%s\": %m", p);
- }
+ if (r != 0)
+ return log_error_errno(errno ?: EIO, "Failed to probe file system type \"%s\": %m", p);
if (!streq(v, "vfat")) {
log_error("File system \"%s\" is not FAT.", p);
return -ENODEV;
@@ -161,10 +153,8 @@ static int verify_esp(
errno = 0;
r = blkid_probe_lookup_value(b, "PART_ENTRY_SCHEME", &v, NULL);
- if (r != 0) {
- r = errno ? -errno : -EIO;
- return log_error_errno(r, "Failed to probe partition scheme \"%s\": %m", p);
- }
+ if (r != 0)
+ return log_error_errno(errno ?: EIO, "Failed to probe partition scheme \"%s\": %m", p);
if (!streq(v, "gpt")) {
log_error("File system \"%s\" is not on a GPT partition table.", p);
return -ENODEV;
@@ -172,10 +162,8 @@ static int verify_esp(
errno = 0;
r = blkid_probe_lookup_value(b, "PART_ENTRY_TYPE", &v, NULL);
- if (r != 0) {
- r = errno ? -errno : -EIO;
- return log_error_errno(r, "Failed to probe partition type UUID \"%s\": %m", p);
- }
+ if (r != 0)
+ return log_error_errno(errno ?: EIO, "Failed to probe partition type UUID \"%s\": %m", p);
if (!streq(v, "c12a7328-f81f-11d2-ba4b-00a0c93ec93b")) {
log_error("File system \"%s\" has wrong type for an EFI System Partition (ESP).", p);
return -ENODEV;
@@ -183,10 +171,8 @@ static int verify_esp(
errno = 0;
r = blkid_probe_lookup_value(b, "PART_ENTRY_UUID", &v, NULL);
- if (r != 0) {
- r = errno ? -errno : -EIO;
- return log_error_errno(r, "Failed to probe partition entry UUID \"%s\": %m", p);
- }
+ if (r != 0)
+ return log_error_errno(errno ?: EIO, "Failed to probe partition entry UUID \"%s\": %m", p);
r = sd_id128_from_string(v, &uuid);
if (r < 0) {
log_error("Partition \"%s\" has invalid UUID \"%s\".", p, v);
@@ -195,30 +181,24 @@ static int verify_esp(
errno = 0;
r = blkid_probe_lookup_value(b, "PART_ENTRY_NUMBER", &v, NULL);
- if (r != 0) {
- r = errno ? -errno : -EIO;
- return log_error_errno(r, "Failed to probe partition number \"%s\": m", p);
- }
+ if (r != 0)
+ return log_error_errno(errno ?: EIO, "Failed to probe partition number \"%s\": m", p);
r = safe_atou32(v, &part);
if (r < 0)
return log_error_errno(r, "Failed to parse PART_ENTRY_NUMBER field.");
errno = 0;
r = blkid_probe_lookup_value(b, "PART_ENTRY_OFFSET", &v, NULL);
- if (r != 0) {
- r = errno ? -errno : -EIO;
- return log_error_errno(r, "Failed to probe partition offset \"%s\": %m", p);
- }
+ if (r != 0)
+ return log_error_errno(errno ?: EIO, "Failed to probe partition offset \"%s\": %m", p);
r = safe_atou64(v, &pstart);
if (r < 0)
return log_error_errno(r, "Failed to parse PART_ENTRY_OFFSET field.");
errno = 0;
r = blkid_probe_lookup_value(b, "PART_ENTRY_SIZE", &v, NULL);
- if (r != 0) {
- r = errno ? -errno : -EIO;
- return log_error_errno(r, "Failed to probe partition size \"%s\": %m", p);
- }
+ if (r != 0)
+ return log_error_errno(errno ?: EIO, "Failed to probe partition size \"%s\": %m", p);
r = safe_atou64(v, &psize);
if (r < 0)
return log_error_errno(r, "Failed to parse PART_ENTRY_SIZE field.");
diff --git a/src/shared/dissect-image.c b/src/shared/dissect-image.c
index 410a7764ed..39e724c51a 100644
--- a/src/shared/dissect-image.c
+++ b/src/shared/dissect-image.c
@@ -61,12 +61,8 @@ static int probe_filesystem(const char *node, char **ret_fstype) {
log_debug("Failed to identify any partition type on partition %s", node);
goto not_found;
}
- if (r != 0) {
- if (errno == 0)
- return -EIO;
-
- return -errno;
- }
+ if (r != 0)
+ return -errno ?: -EIO;
(void) blkid_probe_lookup_value(b, "TYPE", &fstype, NULL);
@@ -146,12 +142,8 @@ int dissect_image(int fd, const void *root_hash, size_t root_hash_size, DissectI
errno = 0;
r = blkid_probe_set_device(b, fd, 0, 0);
- if (r != 0) {
- if (errno == 0)
- return -ENOMEM;
-
- return -errno;
- }
+ if (r != 0)
+ return -errno ?: -ENOMEM;
if ((flags & DISSECT_IMAGE_GPT_ONLY) == 0) {
/* Look for file system superblocks, unless we only shall look for GPT partition tables */
@@ -168,12 +160,8 @@ int dissect_image(int fd, const void *root_hash, size_t root_hash_size, DissectI
log_debug("Failed to identify any partition table.");
return -ENOPKG;
}
- if (r != 0) {
- if (errno == 0)
- return -EIO;
-
- return -errno;
- }
+ if (r != 0)
+ return -errno ?: -EIO;
m = new0(DissectedImage, 1);
if (!m)
@@ -232,12 +220,8 @@ int dissect_image(int fd, const void *root_hash, size_t root_hash_size, DissectI
errno = 0;
pl = blkid_probe_get_partitions(b);
- if (!pl) {
- if (errno == 0)
- return -ENOMEM;
-
- return -errno;
- }
+ if (!pl)
+ return -errno ?: -ENOMEM;
udev = udev_new();
if (!udev)
diff --git a/src/udev/udev-builtin-blkid.c b/src/udev/udev-builtin-blkid.c
index 3c58445836..856376fc79 100644
--- a/src/udev/udev-builtin-blkid.c
+++ b/src/udev/udev-builtin-blkid.c
@@ -122,7 +122,7 @@ static int find_gpt_root(struct udev_device *dev, blkid_probe pr, bool test) {
errno = 0;
pl = blkid_probe_get_partitions(pr);
if (!pl)
- return errno > 0 ? -errno : -ENOMEM;
+ return -errno ?: -ENOMEM;
nvals = blkid_partlist_numof_partitions(pl);
for (i = 0; i < nvals; i++) {