summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
f647962)
The one in tmpfiles.c:create_item() even looks like it fixes a bug.
}
int rtnl_log_parse_error(int r) {
}
int rtnl_log_parse_error(int r) {
- log_error_errno(r, "Failed to parse netlink message: %m");
- return r;
+ return log_error_errno(r, "Failed to parse netlink message: %m");
}
int rtnl_log_create_error(int r) {
}
int rtnl_log_create_error(int r) {
- log_error_errno(r, "Failed to create netlink message: %m");
- return r;
+ return log_error_errno(r, "Failed to create netlink message: %m");
if (r == -ENOENT)
return 0;
if (r == -ENOENT)
return 0;
- log_error_errno(r, "Failed to read %s: %m", m->state_file);
- return r;
+ return log_error_errno(r, "Failed to read %s: %m", m->state_file);
if (ignore_enoent && r == -ENOENT)
return 0;
if (ignore_enoent && r == -ENOENT)
return 0;
- log_error_errno(r, "Failed to open %s, ignoring: %m", path);
- return r;
+ return log_error_errno(r, "Failed to open %s, ignoring: %m", path);
}
log_debug("apply: %s", path);
}
log_debug("apply: %s", path);
if (r == -EPERM)
/* kernels prior to 3.2 don't support polling this file. Ignore the failure. */
m->hostname_fd = safe_close(m->hostname_fd);
if (r == -EPERM)
/* kernels prior to 3.2 don't support polling this file. Ignore the failure. */
m->hostname_fd = safe_close(m->hostname_fd);
- else {
- log_error_errno(r, "Failed to add hostname event source: %m");
- return r;
- }
+ else
+ return log_error_errno(r, "Failed to add hostname event source: %m");
}
r = determine_hostname(&m->hostname);
}
r = determine_hostname(&m->hostname);
if (r == -ENOENT)
return 0;
if (r == -ENOENT)
return 0;
- log_error_errno(r, "Failed to get data: %m");
- return r;
+ return log_error_errno(r, "Failed to get data: %m");
if (ignore_enoent && r == -ENOENT)
return 0;
if (ignore_enoent && r == -ENOENT)
return 0;
- log_error_errno(r, "Failed to open file '%s', ignoring: %m", path);
- return r;
+ return log_error_errno(r, "Failed to open file '%s', ignoring: %m", path);
}
log_debug("parse: %s", path);
}
log_debug("parse: %s", path);
if (ignore_enoent && r == -ENOENT)
return 0;
if (ignore_enoent && r == -ENOENT)
return 0;
- log_error_errno(r, "Failed to open '%s', ignoring: %m", fn);
- return r;
+ return log_error_errno(r, "Failed to open '%s', ignoring: %m", fn);
if (r < 0) {
struct stat a, b;
if (r < 0) {
struct stat a, b;
- if (r != -EEXIST) {
- log_error_errno(r, "Failed to copy files to %s: %m", i->path);
- return -r;
- }
+ if (r != -EEXIST)
+ return log_error_errno(r, "Failed to copy files to %s: %m", i->path);
if (stat(i->argument, &a) < 0) {
log_error("stat(%s) failed: %m", i->argument);
if (stat(i->argument, &a) < 0) {
log_error("stat(%s) failed: %m", i->argument);
if (ignore_enoent && r == -ENOENT)
return 0;
if (ignore_enoent && r == -ENOENT)
return 0;
- log_error_errno(r, "Failed to open '%s', ignoring: %m", fn);
- return r;
+ return log_error_errno(r, "Failed to open '%s', ignoring: %m", fn);
}
FOREACH_LINE(line, f, break) {
}
FOREACH_LINE(line, f, break) {