diff options
Diffstat (limited to 'src/portable')
-rw-r--r-- | src/portable/portabled-bus.c | 4 | ||||
-rw-r--r-- | src/portable/portabled-image-bus.c | 4 | ||||
-rw-r--r-- | src/portable/portabled-operation.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/portable/portabled-bus.c b/src/portable/portabled-bus.c index 72f685f76d..5b992d9df8 100644 --- a/src/portable/portabled-bus.c +++ b/src/portable/portabled-bus.c @@ -357,7 +357,7 @@ static int method_set_pool_limit(sd_bus_message *message, void *userdata, sd_bus if (r < 0) return r; if (!FILE_SIZE_VALID_OR_INFINITY(limit)) - return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "New limit out of range"); + return sd_bus_error_set(error, SD_BUS_ERROR_INVALID_ARGS, "New limit out of range"); r = bus_verify_polkit_async( message, @@ -377,7 +377,7 @@ static int method_set_pool_limit(sd_bus_message *message, void *userdata, sd_bus r = btrfs_subvol_set_subtree_quota_limit("/var/lib/portables", 0, limit); if (r == -ENOTTY) - return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED, "Quota is only supported on btrfs."); + return sd_bus_error_set(error, SD_BUS_ERROR_NOT_SUPPORTED, "Quota is only supported on btrfs."); if (r < 0) return sd_bus_error_set_errnof(error, r, "Failed to adjust quota limit: %m"); diff --git a/src/portable/portabled-image-bus.c b/src/portable/portabled-image-bus.c index 88d8f914e0..595fe8a60a 100644 --- a/src/portable/portabled-image-bus.c +++ b/src/portable/portabled-image-bus.c @@ -443,7 +443,7 @@ int bus_image_common_remove( } if (m->n_operations >= OPERATIONS_MAX) - return sd_bus_error_setf(error, SD_BUS_ERROR_LIMITS_EXCEEDED, "Too many ongoing operations."); + return sd_bus_error_set(error, SD_BUS_ERROR_LIMITS_EXCEEDED, "Too many ongoing operations."); r = bus_image_acquire(m, message, @@ -781,7 +781,7 @@ int bus_image_common_set_limit( if (r < 0) return r; if (!FILE_SIZE_VALID_OR_INFINITY(limit)) - return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "New limit out of range"); + return sd_bus_error_set(error, SD_BUS_ERROR_INVALID_ARGS, "New limit out of range"); r = bus_image_acquire(m, message, diff --git a/src/portable/portabled-operation.c b/src/portable/portabled-operation.c index 848b784908..6f06367d20 100644 --- a/src/portable/portabled-operation.c +++ b/src/portable/portabled-operation.c @@ -20,14 +20,14 @@ static int operation_done(sd_event_source *s, const siginfo_t *si, void *userdat o->pid = 0; if (si->si_code != CLD_EXITED) { - r = sd_bus_error_setf(&error, SD_BUS_ERROR_FAILED, "Child died abnormally."); + r = sd_bus_error_set(&error, SD_BUS_ERROR_FAILED, "Child died abnormally."); goto fail; } if (si->si_status == EXIT_SUCCESS) r = 0; else if (read(o->errno_fd, &r, sizeof(r)) != sizeof(r)) { /* Try to acquire error code for failed operation */ - r = sd_bus_error_setf(&error, SD_BUS_ERROR_FAILED, "Child failed."); + r = sd_bus_error_set(&error, SD_BUS_ERROR_FAILED, "Child failed."); goto fail; } |