SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1820 from michich/errno-v2

Browse Source 
[v2] treewide: treatment of errno and other cleanups
This commit is contained in:
Daniel Mack
2015-11-09 21:56:49 +01:00
parent 70d54fca18 e1427b138f
commit b0bc8dbd73
45 changed files with 180 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shared/ask-password-api.c
+1 -1
View File
@@ -472,7 +472,7 @@ int ask_password_agent(
fd = mkostemp_safe(temp, O_WRONLY|O_CLOEXEC);
if (fd < 0) {
r = -errno;
r = fd;
goto finish;
}
src/shared/clean-ipc.c
+9 -18
View File
@@ -48,8 +48,7 @@ static int clean_sysvipc_shm(uid_t delete_uid) {
if (errno == ENOENT)
return 0;
log_warning_errno(errno, "Failed to open /proc/sysvipc/shm: %m");
return -errno;
return log_warning_errno(errno, "Failed to open /proc/sysvipc/shm: %m");
}
FOREACH_LINE(line, f, goto fail) {
@@ -91,8 +90,7 @@ static int clean_sysvipc_shm(uid_t delete_uid) {
return ret;
fail:
log_warning_errno(errno, "Failed to read /proc/sysvipc/shm: %m");
return -errno;
return log_warning_errno(errno, "Failed to read /proc/sysvipc/shm: %m");
}
static int clean_sysvipc_sem(uid_t delete_uid) {
@@ -106,8 +104,7 @@ static int clean_sysvipc_sem(uid_t delete_uid) {
if (errno == ENOENT)
return 0;
log_warning_errno(errno, "Failed to open /proc/sysvipc/sem: %m");
return -errno;
return log_warning_errno(errno, "Failed to open /proc/sysvipc/sem: %m");
}
FOREACH_LINE(line, f, goto fail) {
@@ -144,8 +141,7 @@ static int clean_sysvipc_sem(uid_t delete_uid) {
return ret;
fail:
log_warning_errno(errno, "Failed to read /proc/sysvipc/sem: %m");
return -errno;
return log_warning_errno(errno, "Failed to read /proc/sysvipc/sem: %m");
}
static int clean_sysvipc_msg(uid_t delete_uid) {
@@ -159,8 +155,7 @@ static int clean_sysvipc_msg(uid_t delete_uid) {
if (errno == ENOENT)
return 0;
log_warning_errno(errno, "Failed to open /proc/sysvipc/msg: %m");
return -errno;
return log_warning_errno(errno, "Failed to open /proc/sysvipc/msg: %m");
}
FOREACH_LINE(line, f, goto fail) {
@@ -198,8 +193,7 @@ static int clean_sysvipc_msg(uid_t delete_uid) {
return ret;
fail:
log_warning_errno(errno, "Failed to read /proc/sysvipc/msg: %m");
return -errno;
return log_warning_errno(errno, "Failed to read /proc/sysvipc/msg: %m");
}
static int clean_posix_shm_internal(DIR *dir, uid_t uid) {
@@ -277,8 +271,7 @@ static int clean_posix_shm(uid_t uid) {
if (errno == ENOENT)
return 0;
log_warning_errno(errno, "Failed to open /dev/shm: %m");
return -errno;
return log_warning_errno(errno, "Failed to open /dev/shm: %m");
}
return clean_posix_shm_internal(dir, uid);
@@ -294,8 +287,7 @@ static int clean_posix_mq(uid_t uid) {
if (errno == ENOENT)
return 0;
log_warning_errno(errno, "Failed to open /dev/mqueue: %m");
return -errno;
return log_warning_errno(errno, "Failed to open /dev/mqueue: %m");
}
FOREACH_DIRENT(de, dir, goto fail) {
@@ -334,8 +326,7 @@ static int clean_posix_mq(uid_t uid) {
return ret;
fail:
log_warning_errno(errno, "Failed to read /dev/mqueue: %m");
return -errno;
return log_warning_errno(errno, "Failed to read /dev/mqueue: %m");
}
int clean_ipc(uid_t uid) {