if (r < 0)
return log_error_errno(r, "Failed to mangle unit name '%s': %m", *i);
- if (!endswith(mangled, ".service")) {
- log_error("Unit %s is not a service unit, refusing.", *i);
- return -EINVAL;
- }
+ if (!endswith(mangled, ".service"))
+ return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
+ "Unit %s is not a service unit, refusing.",
+ *i);
if (unit_name_is_valid(mangled, UNIT_NAME_TEMPLATE)) {
r = unit_name_replace_instance(mangled, "test-instance", &instance);
}
}
- *ret = expanded_patterns;
- expanded_patterns = NULL; /* do not free */
+ *ret = TAKE_PTR(expanded_patterns); /* do not free */
return 0;
}
/* Temporary fix for rc kernel bug: https://bugzilla.redhat.com/show_bug.cgi?id=1395896 */
(void) send(h->fd, NULL, 0, 0);
- *ret = h;
- h = NULL;
+ *ret = TAKE_PTR(h);
return 0;
}
if (p)
(void) touch(p);
- r = fd;
- fd = -1;
-
- return r;
+ return TAKE_FD(fd);
}
(void) pager_open(arg_pager_flags);
- if (arg_legend) {
+ if (arg_legend)
printf("%-*s %-*s %-*s %-*s %s\n",
(int) name_width, "NAME",
(int) type_width, "TYPE",
(int) signature_width, "SIGNATURE",
(int) result_width, "RESULT/VALUE",
"FLAGS");
- }
for (j = 0; j < k; j++) {
_cleanup_free_ char *ellipsized = NULL;
LIST_PREPEND(device_allow, c->device_allow, a);
}
- a->r = !!strchr(rwm, 'r');
- a->w = !!strchr(rwm, 'w');
- a->m = !!strchr(rwm, 'm');
+ a->r = strchr(rwm, 'r');
+ a->w = strchr(rwm, 'w');
+ a->m = strchr(rwm, 'm');
}
n++;
assert_not_reached("Unhandled option code.");
}
- if (optind < argc && getpid_cached() != 1) {
+ if (optind < argc && getpid_cached() != 1)
/* Hmm, when we aren't run as init system
* let's complain about excess arguments */
-
return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
"Excess arguments.");
- }
return 0;
}
log_open();
if (enforce > 0) {
- if (!initialized) {
- log_emergency("Failed to load SELinux policy.");
- return -EIO;
- }
+ if (!initialized)
+ return log_emergency_errno(SYNTHETIC_ERRNO(EIO),
+ "Failed to load SELinux policy.");
log_warning("Failed to load new SELinux policy. Continuing with old policy.");
} else
else
log_unit_debug(u, "D-Bus name %s now not owned by anyone.", s->bus_name);
- s->bus_name_good = !!new_owner;
+ s->bus_name_good = new_owner;
/* Track the current owner, so we can reconstruct changes after a daemon reload */
r = free_and_strdup(&s->bus_name_owner, new_owner);
if (r < 0)
return log_error_errno(r, "Failed to parse resource limit '%s': %m",
context->meta[META_ARGV_RLIMIT]);
- if (rlimit < page_size()) {
+ if (rlimit < page_size())
/* Is coredumping disabled? Then don't bother saving/processing the
* coredump. Anything below PAGE_SIZE cannot give a readable coredump
* (the kernel uses ELF_EXEC_PAGESIZE which is not easily accessible, but
return log_info_errno(SYNTHETIC_ERRNO(EBADSLT),
"Resource limits disable core dumping for process %s (%s).",
context->meta[META_ARGV_PID], context->meta[META_COMM]);
- }
process_limit = MAX(arg_process_size_max, storage_size_max());
if (process_limit == 0)
_cleanup_fclose_ FILE *f = NULL;
int r;
- if (arg_field) {
- log_error("Option --field/-F only makes sense with list");
- return -EINVAL;
- }
+ if (arg_field)
+ return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
+ "Option --field/-F only makes sense with list");
r = acquire_journal(&j, argv + 1);
if (r < 0)
if (!debugger)
return -ENOMEM;
- if (arg_field) {
- log_error("Option --field/-F only makes sense with list");
- return -EINVAL;
- }
+ if (arg_field)
+ return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
+ "Option --field/-F only makes sense with list");
r = acquire_journal(&j, argv + 1);
if (r < 0)
if (!exe)
return log_oom();
- if (endswith(exe, " (deleted)")) {
- log_error("Binary already deleted.");
- return -ENOENT;
- }
+ if (endswith(exe, " (deleted)"))
+ return log_error_errno(SYNTHETIC_ERRNO(ENOENT),
+ "Binary already deleted.");
- if (!path_is_absolute(exe)) {
- log_error("Binary is not an absolute path.");
- return -ENOENT;
- }
+ if (!path_is_absolute(exe))
+ return log_error_errno(SYNTHETIC_ERRNO(ENOENT),
+ "Binary is not an absolute path.");
r = save_core(j, NULL, &path, &unlink_path);
if (r < 0)
else
fprintf(f, "Requires=%s\n", unit);
- if (umount_unit) {
+ if (umount_unit)
fprintf(f,
"Wants=%s\n"
"Before=%s\n",
umount_unit,
umount_unit
);
- }
}
if (!nofail)
if (argc <= 1)
return help();
- if (argc < 3) {
- log_error("This program requires at least two arguments.");
- return -EINVAL;
- }
+ if (argc < 3)
+ return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
+ "This program requires at least two arguments.");
log_setup_service();
log_setup_service();
- if (argc > 2) {
- log_error("This program expects one or no arguments.");
- return -EINVAL;
- }
+ if (argc > 2)
+ return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
+ "This program expects one or no arguments.");
umask(0022);
if (stat(device, &st) < 0)
return log_error_errno(errno, "Failed to stat %s: %m", device);
- if (!S_ISBLK(st.st_mode)) {
- log_error("%s is not a block device.", device);
- return -EINVAL;
- }
+ if (!S_ISBLK(st.st_mode))
+ return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
+ "%s is not a block device.",
+ device);
r = sd_device_new_from_devnum(&dev, 'b', st.st_rdev);
if (r < 0)
return 0;
#else
- return log_error_errno(EOPNOTSUPP, "FIDO2 tokens not supported on this build.");
+ return log_error_errno(SYNTHETIC_ERRNO(EOPNOTSUPP),
+ "FIDO2 tokens not supported on this build.");
#endif
}
fido_dev_info_free(&di, allocated);
return r;
#else
- return log_error_errno(EOPNOTSUPP, "FIDO2 tokens not supported on this build.");
+ return log_error_errno(SYNTHETIC_ERRNO(EOPNOTSUPP),
+ "FIDO2 tokens not supported on this build.");
#endif
}
r = pkcs11_find_token(uri, pkcs11_callback, &data);
if (r == -EAGAIN) /* pkcs11_find_token() doesn't log about this error, but all others */
- return log_error_errno(ENXIO, "Specified PKCS#11 token with URI '%s' not found.", uri);
+ return log_error_errno(SYNTHETIC_ERRNO(ENXIO),
+ "Specified PKCS#11 token with URI '%s' not found.",
+ uri);
if (r < 0)
return r;
return 0;
#else
- return log_error_errno(EOPNOTSUPP, "PKCS#11 tokens not supported on this build.");
+ return log_error_errno(SYNTHETIC_ERRNO(EOPNOTSUPP),
+ "PKCS#11 tokens not supported on this build.");
#endif
}
return 0;
#else
- return log_error_errno(EOPNOTSUPP, "PKCS#11 tokens not supported on this build.");
+ return log_error_errno(SYNTHETIC_ERRNO(EOPNOTSUPP),
+ "PKCS#11 tokens not supported on this build.");
#endif
}
* the old literal password only (and do not care for the old PKCS#11 token) */
if (strv_isempty(h->hashed_password))
- return log_error_errno(EINVAL, "User record has no hashed passwords, refusing.");
+ return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
+ "User record has no hashed passwords, refusing.");
/* Generates the list of plaintext passwords to propagate to LUKS/fscrypt devices, and checks whether
* we have a plaintext password for each hashed one. If we are missing one we'll fail, since we
if (arg_pretty || arg_static || arg_transient) {
const char *attr;
- if (!!arg_static + !!arg_pretty + !!arg_transient > 1) {
- log_error("Cannot query more than one name type at a time");
- return -EINVAL;
- }
+ if (!!arg_static + !!arg_pretty + !!arg_transient > 1)
+ return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
+ "Cannot query more than one name type at a time");
attr = arg_pretty ? "PrettyHostname" :
arg_static ? "StaticHostname" : "Hostname";
local = empty_or_dash_to_null(local);
if (local) {
- if (!machine_name_is_valid(local)) {
- log_error("Local image name '%s' is not valid.", local);
- return -EINVAL;
- }
+ if (!machine_name_is_valid(local))
+ return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
+ "Local image name '%s' is not valid.",
+ local);
if (!arg_force) {
r = image_find(IMAGE_MACHINE, local, NULL);
if (r != -ENOENT)
return log_error_errno(r, "Failed to check whether image '%s' exists: %m", local);
} else {
- log_error("Image '%s' already exists.", local);
- return -EEXIST;
+ return log_error_errno(SYNTHETIC_ERRNO(EEXIST),
+ "Image '%s' already exists.",
+ local);
}
}
} else
local = ll;
- if (!machine_name_is_valid(local)) {
- log_error("Local image name '%s' is not valid.", local);
- return -EINVAL;
- }
+ if (!machine_name_is_valid(local))
+ return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
+ "Local image name '%s' is not valid.",
+ local);
if (!arg_force) {
r = image_find(IMAGE_MACHINE, local, NULL);
if (r != -ENOENT)
return log_error_errno(r, "Failed to check whether image '%s' exists: %m", local);
} else {
- log_error("Image '%s' already exists.", local);
- return -EEXIST;
+ return log_error_errno(SYNTHETIC_ERRNO(EEXIST),
+ "Image '%s' already exists.",
+ local);
}
}
} else
local = ll;
- if (!machine_name_is_valid(local)) {
- log_error("Local image name '%s' is not valid.", local);
- return -EINVAL;
- }
+ if (!machine_name_is_valid(local))
+ return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
+ "Local image name '%s' is not valid.",
+ local);
if (!arg_force) {
r = image_find(IMAGE_MACHINE, local, NULL);
if (r != -ENOENT)
return log_error_errno(r, "Failed to check whether image '%s' exists: %m", local);
} else {
- log_error("Image '%s' already exists.", local);
- return -EEXIST;
+ return log_error_errno(SYNTHETIC_ERRNO(EEXIST),
+ "Image '%s' already exists.",
+ local);
}
}
} else
assert(checksum_job->state == PULL_JOB_DONE);
- if (!checksum_job->payload || checksum_job->payload_size <= 0) {
- log_error("Checksum is empty, cannot verify.");
- return -EBADMSG;
- }
+ if (!checksum_job->payload || checksum_job->payload_size <= 0)
+ return log_error_errno(SYNTHETIC_ERRNO(EBADMSG),
+ "Checksum is empty, cannot verify.");
r = verify_one(checksum_job, main_job);
if (r < 0)
assert(signature_job->state == PULL_JOB_DONE);
- if (!signature_job->payload || signature_job->payload_size <= 0) {
- log_error("Signature is empty, cannot verify.");
- return -EBADMSG;
- }
+ if (!signature_job->payload || signature_job->payload_size <= 0)
+ return log_error_errno(SYNTHETIC_ERRNO(EBADMSG),
+ "Signature is empty, cannot verify.");
r = pipe2(gpg_pipe, O_CLOEXEC);
if (r < 0)
int r;
url = argv[1];
- if (!http_url_is_valid(url)) {
- log_error("URL '%s' is not valid.", url);
- return -EINVAL;
- }
+ if (!http_url_is_valid(url))
+ return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
+ "URL '%s' is not valid.", url);
if (argc >= 3)
local = argv[2];
local = ll;
- if (!machine_name_is_valid(local)) {
- log_error("Local image name '%s' is not valid.", local);
- return -EINVAL;
- }
+ if (!machine_name_is_valid(local))
+ return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
+ "Local image name '%s' is not valid.",
+ local);
if (!arg_force) {
r = image_find(IMAGE_MACHINE, local, NULL);
if (r != -ENOENT)
return log_error_errno(r, "Failed to check whether image '%s' exists: %m", local);
} else {
- log_error("Image '%s' already exists.", local);
- return -EEXIST;
+ return log_error_errno(SYNTHETIC_ERRNO(EEXIST),
+ "Image '%s' already exists.",
+ local);
}
}
int r;
url = argv[1];
- if (!http_url_is_valid(url)) {
- log_error("URL '%s' is not valid.", url);
- return -EINVAL;
- }
+ if (!http_url_is_valid(url))
+ return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
+ "URL '%s' is not valid.", url);
if (argc >= 3)
local = argv[2];
local = ll;
- if (!machine_name_is_valid(local)) {
- log_error("Local image name '%s' is not valid.", local);
- return -EINVAL;
- }
+ if (!machine_name_is_valid(local))
+ return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
+ "Local image name '%s' is not valid.",
+ local);
if (!arg_force) {
r = image_find(IMAGE_MACHINE, local, NULL);
if (r != -ENOENT)
return log_error_errno(r, "Failed to check whether image '%s' exists: %m", local);
} else {
- log_error("Image '%s' already exists.", local);
- return -EEXIST;
+ return log_error_errno(SYNTHETIC_ERRNO(EEXIST),
+ "Image '%s' already exists.",
+ local);
}
}
assert(fdt >= 0);
ret = lzma_easy_encoder(&s, LZMA_PRESET_DEFAULT, LZMA_CHECK_CRC64);
- if (ret != LZMA_OK) {
- log_error("Failed to initialize XZ encoder: code %u", ret);
- return -EINVAL;
- }
+ if (ret != LZMA_OK)
+ return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
+ "Failed to initialize XZ encoder: code %u",
+ ret);
for (;;) {
if (s.avail_in == 0 && action == LZMA_RUN) {
}
ret = lzma_code(&s, action);
- if (!IN_SET(ret, LZMA_OK, LZMA_STREAM_END)) {
- log_error("Compression failed: code %u", ret);
- return -EBADMSG;
- }
+ if (!IN_SET(ret, LZMA_OK, LZMA_STREAM_END))
+ return log_error_errno(SYNTHETIC_ERRNO(EBADMSG),
+ "Compression failed: code %u",
+ ret);
if (s.avail_out == 0 || ret == LZMA_STREAM_END) {
ssize_t n, k;
offset += n;
total_out += n;
- if (max_bytes != (uint64_t) -1 && total_out > (size_t) max_bytes) {
- log_debug("Compressed stream longer than %"PRIu64" bytes", max_bytes);
- return -EFBIG;
- }
+ if (max_bytes != (uint64_t) -1 && total_out > (size_t) max_bytes)
+ return log_debug_errno(SYNTHETIC_ERRNO(EFBIG),
+ "Compressed stream longer than %" PRIu64 " bytes",
+ max_bytes);
if (size - offset < frame_size + 4) {
k = loop_write(fdt, buf, offset, false);
assert(fdt >= 0);
ret = lzma_stream_decoder(&s, UINT64_MAX, 0);
- if (ret != LZMA_OK) {
- log_debug("Failed to initialize XZ decoder: code %u", ret);
- return -ENOMEM;
- }
+ if (ret != LZMA_OK)
+ return log_debug_errno(SYNTHETIC_ERRNO(ENOMEM),
+ "Failed to initialize XZ decoder: code %u",
+ ret);
for (;;) {
if (s.avail_in == 0 && action == LZMA_RUN) {
}
ret = lzma_code(&s, action);
- if (!IN_SET(ret, LZMA_OK, LZMA_STREAM_END)) {
- log_debug("Decompression failed: code %u", ret);
- return -EBADMSG;
- }
+ if (!IN_SET(ret, LZMA_OK, LZMA_STREAM_END))
+ return log_debug_errno(SYNTHETIC_ERRNO(EBADMSG),
+ "Decompression failed: code %u",
+ ret);
if (s.avail_out == 0 || ret == LZMA_STREAM_END) {
ssize_t n, k;
}
}
#else
- log_debug("Cannot decompress file. Compiled without XZ support.");
- return -EPROTONOSUPPORT;
+ return log_debug_errno(SYNTHETIC_ERRNO(EPROTONOSUPPORT),
+ "Cannot decompress file. Compiled without XZ support.");
#endif
}
munmap(src, st.st_size);
return r;
#else
- log_debug("Cannot decompress file. Compiled without LZ4 support.");
- return -EPROTONOSUPPORT;
+ return log_debug_errno(SYNTHETIC_ERRNO(EPROTONOSUPPORT),
+ "Cannot decompress file. Compiled without LZ4 support.");
#endif
}
(double) (max_bytes - left) / in_bytes * 100);
return 0;
#else
- log_debug("Cannot decompress file. Compiled without ZSTD support.");
- return -EPROTONOSUPPORT;
+ return log_debug_errno(SYNTHETIC_ERRNO(EPROTONOSUPPORT),
+ "Cannot decompress file. Compiled without ZSTD support.");
#endif
}
if (i >= n) {
n = MAX(i*2, 4);
- c = realloc(iov, n * sizeof(struct iovec));
+ c = reallocarray(iov, n, sizeof(struct iovec));
if (!c) {
r = -ENOMEM;
goto fail;
assert(j);
assert(devpath);
- if (!path_startswith(devpath, "/dev/")) {
- log_error("Devpath does not start with /dev/");
- return -EINVAL;
- }
+ if (!path_startswith(devpath, "/dev/"))
+ return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
+ "Devpath does not start with /dev/");
if (stat(devpath, &st) < 0)
return log_error_errno(errno, "Couldn't stat file: %m");
if (arg_follow && !arg_no_tail && !arg_since && arg_lines == ARG_LINES_DEFAULT)
arg_lines = 10;
- if (!!arg_directory + !!arg_file + !!arg_machine + !!arg_root + !!arg_image > 1) {
- log_error("Please specify at most one of -D/--directory=, --file=, -M/--machine=, --root=, --image=.");
- return -EINVAL;
- }
+ if (!!arg_directory + !!arg_file + !!arg_machine + !!arg_root + !!arg_image > 1)
+ return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
+ "Please specify at most one of -D/--directory=, --file=, -M/--machine=, --root=, --image=.");
- if (arg_since_set && arg_until_set && arg_since > arg_until) {
- log_error("--since= must be before --until=.");
- return -EINVAL;
- }
+ if (arg_since_set && arg_until_set && arg_since > arg_until)
+ return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
+ "--since= must be before --until=.");
- if (!!arg_cursor + !!arg_after_cursor + !!arg_since_set > 1) {
- log_error("Please specify only one of --since=, --cursor=, and --after-cursor.");
- return -EINVAL;
- }
+ if (!!arg_cursor + !!arg_after_cursor + !!arg_since_set > 1)
+ return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
+ "Please specify only one of --since=, --cursor=, and --after-cursor.");
- if (arg_follow && arg_reverse) {
- log_error("Please specify either --reverse= or --follow=, not both.");
- return -EINVAL;
- }
+ if (arg_follow && arg_reverse)
+ return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
+ "Please specify either --reverse= or --follow=, not both.");
- if (!IN_SET(arg_action, ACTION_SHOW, ACTION_DUMP_CATALOG, ACTION_LIST_CATALOG) && optind < argc) {
- log_error("Extraneous arguments starting with '%s'", argv[optind]);
- return -EINVAL;
- }
+ if (!IN_SET(arg_action, ACTION_SHOW, ACTION_DUMP_CATALOG, ACTION_LIST_CATALOG) && optind < argc)
+ return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
+ "Extraneous arguments starting with '%s'",
+ argv[optind]);
- if ((arg_boot || arg_action == ACTION_LIST_BOOTS) && arg_merge) {
- log_error("Using --boot or --list-boots with --merge is not supported.");
- return -EINVAL;
- }
+ if ((arg_boot || arg_action == ACTION_LIST_BOOTS) && arg_merge)
+ return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
+ "Using --boot or --list-boots with --merge is not supported.");
if (!strv_isempty(arg_system_units) && arg_journal_type == SD_JOURNAL_CURRENT_USER) {
/* Specifying --user and --unit= at the same time makes no sense (as the former excludes the user
"Please write down the following %ssecret verification key%s. It should be stored\n"
"in a safe location and should not be saved locally on disk.\n"
"\n\t%s",
- hn ?: "", hn ? "/" : "", SD_ID128_FORMAT_VAL(machine),
+ strempty(hn), hn ? "/" : "",
+ SD_ID128_FORMAT_VAL(machine),
ansi_highlight(), ansi_normal(),
p,
format_timespan(tsb, sizeof(tsb), arg_interval, 0),
after_cursor = true;
}
} else
- after_cursor = !!arg_after_cursor;
+ after_cursor = arg_after_cursor;
if (cursor) {
r = sd_journal_seek_cursor(j, cursor);
#include "alloc-util.h"
#include "chattr-util.h"
+#include "io-util.h"
#include "journal-file.h"
#include "journal-internal.h"
#include "log.h"
previous_ts = ts;
assert_se(asprintf(&p, "NUMBER=%u", i) >= 0);
- iovec[0].iov_base = p;
- iovec[0].iov_len = strlen(p);
+ iovec[0] = IOVEC_MAKE(p, strlen(p));
assert_se(asprintf(&q, "MAGIC=%s", i % 5 == 0 ? "quux" : "waldo") >= 0);
- iovec[1].iov_base = q;
- iovec[1].iov_len = strlen(q);
+ iovec[1] = IOVEC_MAKE(q, strlen(q));
if (i % 10 == 0)
assert_se(journal_file_append_entry(three, &ts, NULL, iovec, 2, NULL, NULL, NULL) == 0);
return -ENOMEM;
if (!strv_isempty(a)) {
- lease->search_domains = a;
- a = NULL;
+ lease->search_domains = TAKE_PTR(a);
}
}
static int test_basic(sd_event *event) {
_cleanup_(sd_dhcp_server_unrefp) sd_dhcp_server *server = NULL;
struct in_addr address_lo = {
- .s_addr = htonl(INADDR_LOOPBACK),
+ .s_addr = htobe32(INADDR_LOOPBACK),
};
struct in_addr address_any = {
- .s_addr = htonl(INADDR_ANY),
+ .s_addr = htobe32(INADDR_ANY),
};
int r;
.end = SD_DHCP_OPTION_END,
};
struct in_addr address_lo = {
- .s_addr = htonl(INADDR_LOOPBACK),
+ .s_addr = htobe32(INADDR_LOOPBACK),
};
assert_se(sd_dhcp_server_new(&server, 1) >= 0);
assert_se(streq(hello, "hello"));
if (pipe2(pp, O_CLOEXEC|O_NONBLOCK) < 0) {
- log_error_errno(errno, "Failed to allocate pipe: %m");
- r = -errno;
+ r = log_error_errno(errno, "Failed to allocate pipe: %m");
goto finish;
}
assert_se(sigprocmask_many(SIG_BLOCK, NULL, SIGCHLD, -1) >= 0);
pid = fork();
- if (pid == 0) {
+ if (pid == 0)
/* child */
_exit(66);
- }
assert_se(pid > 1);
return log_debug_errno(errno, "Failed to map %s: %m", hwdb_bin_path);
if (memcmp(hwdb->map, sig, sizeof(hwdb->head->signature)) != 0 ||
- (size_t) hwdb->st.st_size != le64toh(hwdb->head->file_size)) {
- log_debug("Failed to recognize the format of %s", hwdb_bin_path);
- return -EINVAL;
- }
+ (size_t) hwdb->st.st_size != le64toh(hwdb->head->file_size))
+ return log_debug_errno(SYNTHETIC_ERRNO(EINVAL),
+ "Failed to recognize the format of %s",
+ hwdb_bin_path);
log_debug("=== trie on-disk ===");
log_debug("tool version: %"PRIu64, le64toh(hwdb->head->tool_version));
return;
}
- addr.s_addr = htonl(INADDR_LOOPBACK);
+ addr.s_addr = htobe32(INADDR_LOOPBACK);
r = sd_netlink_message_append_in_addr(req, RTA_GATEWAY, &addr);
if (r < 0) {
struct sockaddr_in sa = {
.sin_family = AF_INET,
- .sin_port = htons(80)
+ .sin_port = htobe16(80)
};
assert_se(sd_resolve_default(&resolve) >= 0);
printf("\t Unit: %s\n", i.scope);
show_unit_cgroup(bus, "org.freedesktop.systemd1.Scope", i.scope, i.leader);
- if (arg_transport == BUS_TRANSPORT_LOCAL) {
-
+ if (arg_transport == BUS_TRANSPORT_LOCAL)
show_journal_by_unit(
stdout,
i.scope,
SD_JOURNAL_LOCAL_ONLY,
true,
NULL);
- }
}
return 0;
#include "parse-util.h"
#include "path-util.h"
#include "process-util.h"
+#include "stdio-util.h"
#include "strv.h"
#include "terminal-util.h"
#include "udev-util.h"
return -EBUSY;
}
- snprintf(name, sizeof(name), "autovt@tty%u.service", vtnr);
+ xsprintf(name, "autovt@tty%u.service", vtnr);
r = sd_bus_call_method(
m->bus,
"org.freedesktop.systemd1",
assert(bus);
- if (!strv_isempty(arg_setenv) || arg_uid) {
- log_error("--setenv= and --uid= are not supported for 'login'. Use 'shell' instead.");
- return -EINVAL;
- }
+ if (!strv_isempty(arg_setenv) || arg_uid)
+ return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
+ "--setenv= and --uid= are not supported for 'login'. Use 'shell' instead.");
- if (!IN_SET(arg_transport, BUS_TRANSPORT_LOCAL, BUS_TRANSPORT_MACHINE)) {
- log_error("Login only supported on local machines.");
- return -EOPNOTSUPP;
- }
+ if (!IN_SET(arg_transport, BUS_TRANSPORT_LOCAL, BUS_TRANSPORT_MACHINE))
+ return log_error_errno(SYNTHETIC_ERRNO(EOPNOTSUPP),
+ "Login only supported on local machines.");
polkit_agent_open_if_enabled(arg_transport, arg_ask_password);
assert(bus);
- if (!IN_SET(arg_transport, BUS_TRANSPORT_LOCAL, BUS_TRANSPORT_MACHINE)) {
- log_error("Shell only supported on local machines.");
- return -EOPNOTSUPP;
- }
+ if (!IN_SET(arg_transport, BUS_TRANSPORT_LOCAL, BUS_TRANSPORT_MACHINE))
+ return log_error_errno(SYNTHETIC_ERRNO(EOPNOTSUPP),
+ "Shell only supported on local machines.");
/* Pass $TERM to shell session, if not explicitly specified. */
if (!strv_find_prefix(arg_setenv, "TERM=")) {
if (argc > 2) {
b = parse_boolean(argv[2]);
- if (b < 0) {
- log_error("Failed to parse boolean argument: %s", argv[2]);
- return -EINVAL;
- }
+ if (b < 0)
+ return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
+ "Failed to parse boolean argument: %s",
+ argv[2]);
}
polkit_agent_open_if_enabled(arg_transport, arg_ask_password);
r = image_exists(bus, argv[i]);
if (r < 0)
return r;
- if (r == 0) {
- log_error("Machine image '%s' does not exist.", argv[i]);
- return -ENXIO;
- }
+ if (r == 0)
+ return log_error_errno(SYNTHETIC_ERRNO(ENXIO),
+ "Machine image '%s' does not exist.",
+ argv[i]);
r = sd_bus_call_method(
bus,
r = image_exists(bus, argv[i]);
if (r < 0)
return r;
- if (r == 0) {
- log_error("Machine image '%s' does not exist.", argv[i]);
- return -ENXIO;
- }
+ if (r == 0)
+ return log_error_errno(SYNTHETIC_ERRNO(ENXIO),
+ "Machine image '%s' does not exist.",
+ argv[i]);
r = sd_bus_message_append(m, "s", unit);
if (r < 0)
local = fn;
}
- if (!local) {
- log_error("Need either path or local name.");
- return -EINVAL;
- }
+ if (!local)
+ return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
+ "Need either path or local name.");
r = tar_strip_suffixes(local, &ll);
if (r < 0)
local = ll;
- if (!machine_name_is_valid(local)) {
- log_error("Local name %s is not a suitable machine name.", local);
- return -EINVAL;
- }
+ if (!machine_name_is_valid(local))
+ return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
+ "Local name %s is not a suitable machine name.",
+ local);
if (path) {
fd = open(path, O_RDONLY|O_CLOEXEC|O_NOCTTY);
local = fn;
}
- if (!local) {
- log_error("Need either path or local name.");
- return -EINVAL;
- }
+ if (!local)
+ return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
+ "Need either path or local name.");
r = raw_strip_suffixes(local, &ll);
if (r < 0)
local = ll;
- if (!machine_name_is_valid(local)) {
- log_error("Local name %s is not a suitable machine name.", local);
- return -EINVAL;
- }
+ if (!machine_name_is_valid(local))
+ return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
+ "Local name %s is not a suitable machine name.",
+ local);
if (path) {
fd = open(path, O_RDONLY|O_CLOEXEC|O_NOCTTY);
local = fn;
}
- if (!local) {
- log_error("Need either path or local name.");
- return -EINVAL;
- }
+ if (!local)
+ return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
+ "Need either path or local name.");
- if (!machine_name_is_valid(local)) {
- log_error("Local name %s is not a suitable machine name.", local);
- return -EINVAL;
- }
+ if (!machine_name_is_valid(local))
+ return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
+ "Local name %s is not a suitable machine name.",
+ local);
if (path) {
fd = open(path, O_DIRECTORY|O_RDONLY|O_CLOEXEC);
assert(bus);
local = argv[1];
- if (!machine_name_is_valid(local)) {
- log_error("Machine name %s is not valid.", local);
- return -EINVAL;
- }
+ if (!machine_name_is_valid(local))
+ return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
+ "Machine name %s is not valid.", local);
if (argc >= 3)
path = argv[2];
assert(bus);
local = argv[1];
- if (!machine_name_is_valid(local)) {
- log_error("Machine name %s is not valid.", local);
- return -EINVAL;
- }
+ if (!machine_name_is_valid(local))
+ return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
+ "Machine name %s is not valid.", local);
if (argc >= 3)
path = argv[2];
assert(bus);
remote = argv[1];
- if (!http_url_is_valid(remote)) {
- log_error("URL '%s' is not valid.", remote);
- return -EINVAL;
- }
+ if (!http_url_is_valid(remote))
+ return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
+ "URL '%s' is not valid.", remote);
if (argc >= 3)
local = argv[2];
local = ll;
- if (!machine_name_is_valid(local)) {
- log_error("Local name %s is not a suitable machine name.", local);
- return -EINVAL;
- }
+ if (!machine_name_is_valid(local))
+ return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
+ "Local name %s is not a suitable machine name.",
+ local);
}
r = bus_message_new_method_call(bus, &m, bus_import_mgr, "PullTar");
assert(bus);
remote = argv[1];
- if (!http_url_is_valid(remote)) {
- log_error("URL '%s' is not valid.", remote);
- return -EINVAL;
- }
+ if (!http_url_is_valid(remote))
+ return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
+ "URL '%s' is not valid.", remote);
if (argc >= 3)
local = argv[2];
local = ll;
- if (!machine_name_is_valid(local)) {
- log_error("Local name %s is not a suitable machine name.", local);
- return -EINVAL;
- }
+ if (!machine_name_is_valid(local))
+ return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
+ "Local name %s is not a suitable machine name.",
+ local);
}
r = bus_message_new_method_call(bus, &m, bus_import_mgr, "PullRaw");
if (stat(what, &st) < 0)
return log_error_errno(errno, "Can't stat %s: %m", what);
- if (!S_ISBLK(st.st_mode)) {
- log_error("Not a block device: %s", what);
- return -ENOTBLK;
- }
+ if (!S_ISBLK(st.st_mode))
+ return log_error_errno(SYNTHETIC_ERRNO(ENOTBLK),
+ "Not a block device: %s", what);
r = sd_device_new_from_devnum(&d, 'b', st.st_rdev);
if (r < 0)
escaped = xescape(basename(arg_mount_what), "\\");
if (!escaped)
return log_oom();
- if (!filename_is_valid(escaped)) {
- log_error("Escaped name %s is not a valid filename.", escaped);
- return -EINVAL;
- }
+ if (!filename_is_valid(escaped))
+ return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
+ "Escaped name %s is not a valid filename.",
+ escaped);
arg_mount_where = path_join("/run/media/system", escaped);
if (!arg_mount_where)
if (stat(loop_dev, &st) < 0)
return log_error_errno(errno, "Can't stat %s: %m", loop_dev);
- if (!S_ISBLK(st.st_mode)) {
- log_error("Invalid file type: %s", loop_dev);
- return -EINVAL;
- }
+ if (!S_ISBLK(st.st_mode))
+ return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
+ "Invalid file type: %s", loop_dev);
r = sd_device_new_from_devnum(&d, 'b', st.st_rdev);
if (r < 0)
if (S_ISREG(st.st_mode))
return discover_loop_backing_file();
- if (!S_ISBLK(st.st_mode)) {
- log_error("Invalid file type: %s", arg_mount_what);
- return -EINVAL;
- }
+ if (!S_ISBLK(st.st_mode))
+ return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
+ "Invalid file type: %s",
+ arg_mount_what);
r = sd_device_new_from_devnum(&d, 'b', st.st_rdev);
if (r < 0)
return log_error_errno(r, "Failed to get device from device number: %m");
- if (sd_device_get_property_value(d, "ID_FS_USAGE", &v) < 0 || !streq(v, "filesystem")) {
- log_error("%s does not contain a known file system.", arg_mount_what);
- return -EINVAL;
- }
+ if (sd_device_get_property_value(d, "ID_FS_USAGE", &v) < 0 || !streq(v, "filesystem"))
+ return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
+ "%s does not contain a known file system.",
+ arg_mount_what);
r = acquire_mount_type(d);
if (r < 0)
return action_umount(bus, argc, argv);
if ((!arg_mount_type || fstype_is_blockdev_backed(arg_mount_type))
- && !path_is_normalized(arg_mount_what)) {
- log_error("Path contains non-normalized components: %s", arg_mount_what);
- return -EINVAL;
- }
+ && !path_is_normalized(arg_mount_what))
+ return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
+ "Path contains non-normalized components: %s",
+ arg_mount_what);
if (arg_discover) {
r = discover_device();
return r;
}
- if (!arg_mount_where) {
- log_error("Can't figure out where to mount %s.", arg_mount_what);
- return -EINVAL;
- }
+ if (!arg_mount_where)
+ return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
+ "Can't figure out where to mount %s.",
+ arg_mount_what);
- if (path_equal(arg_mount_where, "/")) {
- log_error("Refusing to operate on root directory.");
- return -EINVAL;
- }
+ if (path_equal(arg_mount_where, "/"))
+ return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
+ "Refusing to operate on root directory.");
- if (!path_is_normalized(arg_mount_where)) {
- log_error("Path contains non-normalized components: %s", arg_mount_where);
- return -EINVAL;
- }
+ if (!path_is_normalized(arg_mount_where))
+ return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
+ "Path contains non-normalized components: %s",
+ arg_mount_where);
if (streq_ptr(arg_mount_type, "auto"))
arg_mount_type = mfree(arg_mount_type);
if (arg_mount_type &&
!streq(arg_mount_type, "auto") &&
arg_uid != UID_INVALID &&
- !fstype_can_uid_gid(arg_mount_type)) {
- log_error("File system type %s is not known to support uid=/gid=, refusing.",
- arg_mount_type);
- return -EOPNOTSUPP;
- }
+ !fstype_can_uid_gid(arg_mount_type))
+ return log_error_errno(SYNTHETIC_ERRNO(EOPNOTSUPP),
+ "File system type %s is not known to support uid=/gid=, refusing.",
+ arg_mount_type);
switch (arg_action) {
}
case DHCP_OPTION_DATA_STRING:
sz = cunescape(p, UNESCAPE_ACCEPT_NUL, &q);
- if (sz < 0) {
+ if (sz < 0)
log_syntax(unit, LOG_WARNING, filename, line, sz,
"Failed to decode DHCP option data, ignoring assignment: %s", p);
- }
udata = q;
break;
return 0;
}
- if (v > MAX_DPs) {
+ if (v > MAX_DPs)
log_syntax(unit, LOG_WARNING, filename, line, 0,
"Invalid '%s=', ignoring assignment: %s",
lvalue, rvalue);
- }
*p = v;
qdisc = NULL;
lvalue, rvalue);
return 0;
}
- if (id > INT_MAX) {
+ if (id > INT_MAX)
log_syntax(unit, LOG_WARNING, filename, line, 0,
"'%s=' is too large, ignoring assignment: %s",
lvalue, rvalue);
- }
teql->id = id;
s->network_namespace_path = data.path;
}
- if (FLAGS_SET(n, data.type)) {
+ if (FLAGS_SET(n, data.type))
return json_log(e, flags, SYNTHETIC_ERRNO(EINVAL),
"Duplicate namespace specification, refusing.");
- }
n |= data.type;
}
}
v = json_variant_by_key(oci, "ociVersion");
- if (!v) {
- log_error("JSON file '%s' is not an OCI bundle configuration file. Refusing.", path);
- return -EINVAL;
- }
- if (!streq_ptr(json_variant_string(v), "1.0.0")) {
- log_error("OCI bundle version not supported: %s", strna(json_variant_string(v)));
- return -EINVAL;
- }
+ if (!v)
+ return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
+ "JSON file '%s' is not an OCI bundle configuration file. Refusing.",
+ path);
+ if (!streq_ptr(json_variant_string(v), "1.0.0"))
+ return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
+ "OCI bundle version not supported: %s",
+ strna(json_variant_string(v)));
// {
// _cleanup_free_ char *formatted = NULL;
/* If all settings are masked, there's no point in looking for
* the settings file */
- if ((arg_settings_mask & _SETTINGS_MASK_ALL) == _SETTINGS_MASK_ALL)
+ if (FLAGS_SET(arg_settings_mask, _SETTINGS_MASK_ALL))
return 0;
fn = strjoina(arg_machine, ".nspawn");
new_size = limit;
/* Enlarge buffer */
- new_groups = realloc(*groupsp, new_size * sizeof(**groupsp));
+ new_groups = reallocarray(*groupsp, new_size, sizeof(**groupsp));
if (!new_groups) {
UNPROTECT_ERRNO;
*errnop = ENOMEM;
if (isempty(name) && fd < 0)
break;
- if (isempty(name) || fd < 0) {
- log_debug("Invalid item sent from child.");
- return -EINVAL;
- }
+ if (isempty(name) || fd < 0)
+ return log_debug_errno(SYNTHETIC_ERRNO(EINVAL),
+ "Invalid item sent from child.");
add = portable_metadata_new(name, fd);
if (!add)
(int) strlen(name), c == 0 ? name : "", c == 0 ? ":" : " ",
canonical);
- if (c == 0) {
- log_error("%s: no addresses found", name);
- return -ESRCH;
- }
+ if (c == 0)
+ return log_error_errno(SYNTHETIC_ERRNO(ESRCH),
+ "%s: no addresses found", name);
print_source(flags, ts);
if (r < 0)
return bus_log_parse_error(r);
- if (c == 0) {
- log_error("%s: no names found", pretty);
- return -ESRCH;
- }
+ if (c == 0)
+ return log_error_errno(SYNTHETIC_ERRNO(ESRCH),
+ "%s: no names found", pretty);
print_source(flags, ts);
r = dns_name_is_valid(n);
if (r < 0)
return log_error_errno(r, "Failed to validate specified domain %s: %m", n);
- if (r == 0) {
- log_error("Domain not valid: %s", n);
- return -EINVAL;
- }
+ if (r == 0)
+ return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
+ "Domain not valid: %s",
+ n);
r = sd_bus_message_append(req, "(sb)", n, **p == '~');
if (r < 0)
r = dns_name_is_valid(*p);
if (r < 0)
return log_error_errno(r, "Failed to validate specified domain %s: %m", *p);
- if (r == 0) {
- log_error("Domain not valid: %s", *p);
- return -EINVAL;
- }
+ if (r == 0)
+ return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
+ "Domain not valid: %s",
+ *p);
}
r = call_nta(bus, clear ? NULL : argv + 2, bus_resolve_mgr, &error);
n += r;
continue;
- } else if (allow_compression && (c & 0xc0) == 0xc0) {
+ } else if (allow_compression && FLAGS_SET(c, 0xc0)) {
uint16_t ptr;
/* Pointer */
if (DNS_PACKET_QR(p)) {
/* Additional checks for responses */
- if (!DNS_RESOURCE_RECORD_OPT_VERSION_SUPPORTED(rr)) {
+ if (!DNS_RESOURCE_RECORD_OPT_VERSION_SUPPORTED(rr))
/* If this is a reply and we don't know the EDNS version
* then something is weird... */
- log_debug("EDNS version newer that our request, bad server.");
- return -EBADMSG;
- }
+ return log_debug_errno(SYNTHETIC_ERRNO(EBADMSG),
+ "EDNS version newer that our request, bad server.");
if (has_rfc6975) {
/* If the OPT RR contains RFC6975 algorithm data, then this
if (r < 0)
return r;
- if (!service->name_template) {
- log_error("%s doesn't define service instance name", service->name);
- return -EINVAL;
- }
-
- if (!service->type) {
- log_error("%s doesn't define service type", service->name);
- return -EINVAL;
- }
+ if (!service->name_template)
+ return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
+ "%s doesn't define service instance name",
+ service->name);
+
+ if (!service->type)
+ return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
+ "%s doesn't define service type",
+ service->name);
if (LIST_IS_EMPTY(service->txt_data_items)) {
txt_data = new0(DnssdTxtData, 1);
l = recvmsg_safe(fd, &mh, 0);
if (IN_SET(l, -EAGAIN, -EINTR))
return 0;
- if (l < 0)
+ if (l <= 0)
return l;
- if (l == 0)
- return 0;
assert(!(mh.msg_flags & MSG_TRUNC));
if (c.cpu_usage_nsec != NSEC_INFINITY) {
char ts[FORMAT_TIMESPAN_MAX];
log_info("CPU time consumed: %s",
- format_timespan(ts, sizeof ts, (c.cpu_usage_nsec + NSEC_PER_USEC - 1) / NSEC_PER_USEC, USEC_PER_MSEC));
+ format_timespan(ts, sizeof ts, DIV_ROUND_UP(c.cpu_usage_nsec, NSEC_PER_USEC), USEC_PER_MSEC));
}
if (c.ip_ingress_bytes != UINT64_MAX) {
if (user)
r = sd_bus_default_user(&bus);
else {
- if (sd_booted() <= 0) {
+ if (sd_booted() <= 0)
/* Print a friendly message when the local system is actually not running systemd as PID 1. */
- log_error("System has not been booted with systemd as init system (PID 1). Can't operate.");
-
- return -EHOSTDOWN;
- }
+ return log_error_errno(SYNTHETIC_ERRNO(EHOSTDOWN),
+ "System has not been booted with systemd as init system (PID 1). Can't operate.");
r = sd_bus_default_system(&bus);
}
break;
if (r < 0)
return r;
if (r == 0)
- return log_debug_errno(EPROTONOSUPPORT,
+ return log_debug_errno(SYNTHETIC_ERRNO(EPROTONOSUPPORT),
"Device is a loop device and partition scanning is off!");
return -EINVAL; /* original error */
rv = m->C_GetTokenInfo(slotid, &token_info);
if (rv == CKR_TOKEN_NOT_PRESENT) {
- log_debug("Token not present in slot, ignoring.");
- return -EAGAIN;
+ return log_debug_errno(SYNTHETIC_ERRNO(EAGAIN),
+ "Token not present in slot, ignoring.");
} else if (rv != CKR_OK) {
log_warning("Failed to acquire token info for slot %lu, ignoring slot: %s", slotid, p11_kit_strerror(rv));
return -EAGAIN;
return -EAGAIN;
}
- if (search_uri && !p11_kit_uri_match_token_info(search_uri, &token_info)) {
- log_debug("Found non-matching token with URI %s.", token_uri_string);
- return -EAGAIN;
- }
+ if (search_uri && !p11_kit_uri_match_token_info(search_uri, &token_info))
+ return log_debug_errno(SYNTHETIC_ERRNO(EAGAIN),
+ "Found non-matching token with URI %s.",
+ token_uri_string);
log_debug("Found matching token with URI %s.", token_uri_string);
log_warning("Failed to get slot list, ignoring module: %s", p11_kit_strerror(rv));
return -EAGAIN;
}
- if (n_slotids == 0) {
- log_debug("This module has no slots? Ignoring module.");
- return -EAGAIN;
- }
+ if (n_slotids == 0)
+ return log_debug_errno(SYNTHETIC_ERRNO(EAGAIN),
+ "This module has no slots? Ignoring module.");
for (k = 0; k < n_slotids; k++) {
r = slot_process(
}
/* NOOP? */
- if ((retain & NAMESPACE_FLAGS_ALL) == NAMESPACE_FLAGS_ALL)
+ if (FLAGS_SET(retain, NAMESPACE_FLAGS_ALL))
return 0;
SECCOMP_FOREACH_LOCAL_ARCH(arch) {
unsigned long f;
f = namespace_flag_map[i].flag;
- if ((retain & f) == f) {
+ if (FLAGS_SET(retain, f)) {
log_debug("Permitting %s.", namespace_flag_map[i].name);
continue;
}
if (c <= 0)
return 0;
- log_error("Please retry operation after closing inhibitors and logging out other users.\n"
- "Alternatively, ignore inhibitors and users with 'systemctl %s -i'.",
- action_table[a].verb);
-
- return -EPERM;
+ return log_error_errno(SYNTHETIC_ERRNO(EPERM),
+ "Please retry operation after closing inhibitors and logging out other users.\n"
+ "Alternatively, ignore inhibitors and users with 'systemctl %s -i'.",
+ action_table[a].verb);
#else
return 0;
#endif
log_info("/* %s, device %s */", __func__, syspath);
device = udev_device_new_from_syspath(udev, syspath);
- if (device == NULL)
+ if (!device)
return;
log_info("looking at parents");
log_info("looking up device: '%s:%s'", subsys, dev);
device = udev_device_new_from_subsystem_sysname(udev, subsys, dev);
- if (device == NULL)
+ if (!device)
log_warning_errno(errno, "udev_device_new_from_subsystem_sysname: %m");
else
print_device(device);
for (i = 0; i < fdcount; i++) {
if (ev[i].data.fd == fd_udev && ev[i].events & EPOLLIN) {
device = udev_monitor_receive_device(udev_monitor);
- if (device == NULL) {
+ if (!device) {
printf("no device from socket\n");
continue;
}
if (fstat(fd, &stbuf) < 0)
return log_error_errno(errno, "stat(%s) failed: %m", path);
- if (!S_ISREG(stbuf.st_mode)) {
- log_error("%s exists and is not a regular file.", path);
- return -EEXIST;
- }
+ if (!S_ISREG(stbuf.st_mode))
+ return log_error_errno(SYNTHETIC_ERRNO(EEXIST),
+ "%s exists and is not a regular file.",
+ path);
st = &stbuf;
} else {
fd = openat(dir_fd, bn, O_NOFOLLOW|O_CLOEXEC|O_PATH, i->mode);
if (fd < 0) {
- if (errno == ENOENT) {
- log_error("Cannot create file %s on a read-only file system.", path);
- return -EROFS;
- }
+ if (errno == ENOENT)
+ return log_error_errno(SYNTHETIC_ERRNO(EROFS),
+ "Cannot create file %s on a read-only file system.",
+ path);
return log_error_errno(errno, "Failed to re-open file %s: %m", path);
}
if (fstat(fd, &stbuf) < 0)
return log_error_errno(errno, "stat(%s) failed: %m", path);
- if (!S_ISREG(stbuf.st_mode)) {
- log_error("%s exists and is not a regular file.", path);
- return -EEXIST;
- }
+ if (!S_ISREG(stbuf.st_mode))
+ return log_error_errno(SYNTHETIC_ERRNO(EEXIST),
+ "%s exists and is not a regular file.",
+ path);
if (stbuf.st_size > 0) {
if (ftruncate(fd, 0) < 0) {
projects / thirdparty / systemd.git / commitdiff
