shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-10-28 03:25:27 +03:00
Code

Merge pull request #3785 from keszybz/less-return-errno

Browse Source 
Use "return log_error_errno(...)" in more places + related fixes
This commit is contained in:
Martin Pitt 2016-07-23 10:10:53 +02:00 committed by GitHub
commit 1415e04603
12 changed files with 31 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/coredump/coredump.c
View File

@ -157,10 +157,8 @@ static int fix_acl(int fd, uid_t uid) {
if (acl_create_entry(&acl, &entry) < 0 ||
acl_set_tag_type(entry, ACL_USER) < 0 ||
acl_set_qualifier(entry, &uid) < 0) {
log_error_errno(errno, "Failed to patch ACL: %m");
return -errno;
}
acl_set_qualifier(entry, &uid) < 0)
return log_error_errno(errno, "Failed to patch ACL: %m");
if (acl_get_permset(entry, &permset) < 0 ||
acl_add_perm(permset, ACL_READ) < 0)

26
src/fstab-generator/fstab-generator.c
View File

@ -85,13 +85,12 @@ static int add_swap(
return log_oom();
f = fopen(unit, "wxe");
if (!f) {
if (errno == EEXIST)
log_error("Failed to create swap unit file %s, as it already exists. Duplicate entry in /etc/fstab?", unit);
else
log_error_errno(errno, "Failed to create unit file %s: %m", unit);
return -errno;
}
if (!f)
return log_error_errno(errno,
errno == EEXIST ?
"Failed to create swap unit file %s, as it already exists. Duplicate entry in /etc/fstab?" :
"Failed to create unit file %s: %m",
unit);
fprintf(f,
"# Automatically generated by systemd-fstab-generator\n\n"
@ -281,13 +280,12 @@ static int add_mount(
return log_oom();
f = fopen(unit, "wxe");
if (!f) {
if (errno == EEXIST)
log_error("Failed to create mount unit file %s, as it already exists. Duplicate entry in /etc/fstab?", unit);
else
log_error_errno(errno, "Failed to create unit file %s: %m", unit);
return -errno;
}
if (!f)
return log_error_errno(errno,
errno == EEXIST ?
"Failed to create mount unit file %s, as it already exists. Duplicate entry in /etc/fstab?" :
"Failed to create unit file %s: %m",
unit);
fprintf(f,
"# Automatically generated by systemd-fstab-generator\n\n"

6
src/gpt-auto-generator/gpt-auto-generator.c
View File

@ -489,10 +489,8 @@ static int add_boot(const char *what) {
return 0;
}
if (r < 0) {
log_error_errno(r, "Failed to read ESP partition UUID: %m");
return r;
}
if (r < 0)
return log_error_errno(r, "Failed to read ESP partition UUID: %m");
errno = 0;
b = blkid_new_probe_from_filename(what);

4
src/import/import.c
View File

@ -90,7 +90,7 @@ static int import_tar(int argc, char *argv[], void *userdata) {
if (r < 0)
return log_error_errno(r, "Failed to check whether image '%s' exists: %m", local);
else if (r > 0) {
log_error_errno(EEXIST, "Image '%s' already exists.", local);
log_error("Image '%s' already exists.", local);
return -EEXIST;
}
}
@ -185,7 +185,7 @@ static int import_raw(int argc, char *argv[], void *userdata) {
if (r < 0)
return log_error_errno(r, "Failed to check whether image '%s' exists: %m", local);
else if (r > 0) {
log_error_errno(EEXIST, "Image '%s' already exists.", local);
log_error("Image '%s' already exists.", local);
return -EEXIST;
}
}

4
src/import/pull.c
View File

@ -97,7 +97,7 @@ static int pull_tar(int argc, char *argv[], void *userdata) {
if (r < 0)
return log_error_errno(r, "Failed to check whether image '%s' exists: %m", local);
else if (r > 0) {
log_error_errno(EEXIST, "Image '%s' already exists.", local);
log_error("Image '%s' already exists.", local);
return -EEXIST;
}
}
@ -183,7 +183,7 @@ static int pull_raw(int argc, char *argv[], void *userdata) {
if (r < 0)
return log_error_errno(r, "Failed to check whether image '%s' exists: %m", local);
else if (r > 0) {
log_error_errno(EEXIST, "Image '%s' already exists.", local);
log_error("Image '%s' already exists.", local);
return -EEXIST;
}
}

3
src/login/logind-user.c
View File

@ -311,8 +311,7 @@ int user_load(User *u) {
if (r == -ENOENT)
return 0;
log_error_errno(r, "Failed to read %s: %m", u->state_file);
return r;
return log_error_errno(r, "Failed to read %s: %m", u->state_file);
}
if (display)

6
src/nspawn/nspawn-seccomp.c
View File

@ -119,10 +119,8 @@ static int seccomp_add_default_syscall_filter(scmp_filter_ctx ctx,
r = seccomp_rule_add(ctx, SCMP_ACT_ERRNO(EPERM), blacklist[i].syscall_num, 0);
if (r == -EFAULT)
continue; /* unknown syscall */
if (r < 0) {
log_error_errno(r, "Failed to block syscall: %m");
return r;
}
if (r < 0)
return log_error_errno(r, "Failed to block syscall: %m");
}
return 0;

7
src/nspawn/nspawn-setuid.c
View File

@ -124,14 +124,12 @@ int change_uid_gid(const char *user, char **_home) {
fd = -1;
if (!fgets(line, sizeof(line), f)) {
if (!ferror(f)) {
log_error("Failed to resolve user %s.", user);
return -ESRCH;
}
log_error_errno(errno, "Failed to read from getent: %m");
return -errno;
return log_error_errno(errno, "Failed to read from getent: %m");
}
truncate_nl(line);
@ -214,8 +212,7 @@ int change_uid_gid(const char *user, char **_home) {
return -ESRCH;
}
log_error_errno(errno, "Failed to read from getent: %m");
return -errno;
return log_error_errno(errno, "Failed to read from getent: %m");
}
truncate_nl(line);

2
src/nspawn/nspawn.c
View File

@ -3553,7 +3553,7 @@ int main(int argc, char *argv[]) {
}
if (r < 0) {
log_error_errno(r, "Failed to lock %s: %m", arg_directory);
return r;
goto finish;
}
if (arg_template) {

3
src/shared/conf-parser.c
View File

@ -323,8 +323,7 @@ int config_parse(const char *unit,
if (feof(f))
break;
log_error_errno(errno, "Failed to read configuration file '%s': %m", filename);
return -errno;
return log_error_errno(errno, "Failed to read configuration file '%s': %m", filename);
}
l = buf;

6
src/systemctl/systemctl.c
View File

@ -5537,10 +5537,8 @@ static int enable_sysv_units(const char *verb, char **args) {
}
j = wait_for_terminate(pid, &status);
if (j < 0) {
log_error_errno(j, "Failed to wait for child: %m");
return j;
}
if (j < 0)
return log_error_errno(j, "Failed to wait for child: %m");
if (status.si_code == CLD_EXITED) {
if (streq(verb, "is-enabled")) {

5
src/tmpfiles/tmpfiles.c
View File

@ -1575,13 +1575,12 @@ static int clean_item_instance(Item *i, const char* instance) {
d = opendir_nomod(instance);
if (!d) {
if (errno == ENOENT || errno == ENOTDIR) {
if (IN_SET(errno, ENOENT, ENOTDIR)) {
log_debug_errno(errno, "Directory \"%s\": %m", instance);
return 0;
}
log_error_errno(errno, "Failed to open directory %s: %m", instance);
return -errno;
return log_error_errno(errno, "Failed to open directory %s: %m", instance);
}
if (fstat(dirfd(d), &s) < 0)