Merge pull request #1820 from michich/errno-v2
[v2] treewide: treatment of errno and other cleanups
This commit is contained in:
@@ -278,10 +278,8 @@ int drop_privileges(uid_t uid, gid_t gid, uint64_t keep_capabilities) {
|
||||
assert(keep_capabilities & (1ULL << (i - 1)));
|
||||
|
||||
if (cap_set_flag(d, CAP_EFFECTIVE, j, bits, CAP_SET) < 0 ||
|
||||
cap_set_flag(d, CAP_PERMITTED, j, bits, CAP_SET) < 0) {
|
||||
log_error_errno(errno, "Failed to enable capabilities bits: %m");
|
||||
return -errno;
|
||||
}
|
||||
cap_set_flag(d, CAP_PERMITTED, j, bits, CAP_SET) < 0)
|
||||
return log_error_errno(errno, "Failed to enable capabilities bits: %m");
|
||||
|
||||
if (cap_set_proc(d) < 0)
|
||||
return log_error_errno(errno, "Failed to increase capabilities: %m");
|
||||
|
||||
+6
-6
@@ -445,7 +445,7 @@ static int write_to_syslog(
|
||||
static int write_to_kmsg(
|
||||
int level,
|
||||
int error,
|
||||
const char*file,
|
||||
const char *file,
|
||||
int line,
|
||||
const char *func,
|
||||
const char *object_field,
|
||||
@@ -516,7 +516,7 @@ static int log_do_header(
|
||||
static int write_to_journal(
|
||||
int level,
|
||||
int error,
|
||||
const char*file,
|
||||
const char *file,
|
||||
int line,
|
||||
const char *func,
|
||||
const char *object_field,
|
||||
@@ -650,7 +650,7 @@ int log_dump_internal(
|
||||
int log_internalv(
|
||||
int level,
|
||||
int error,
|
||||
const char*file,
|
||||
const char *file,
|
||||
int line,
|
||||
const char *func,
|
||||
const char *format,
|
||||
@@ -677,7 +677,7 @@ int log_internalv(
|
||||
int log_internal(
|
||||
int level,
|
||||
int error,
|
||||
const char*file,
|
||||
const char *file,
|
||||
int line,
|
||||
const char *func,
|
||||
const char *format, ...) {
|
||||
@@ -695,7 +695,7 @@ int log_internal(
|
||||
int log_object_internalv(
|
||||
int level,
|
||||
int error,
|
||||
const char*file,
|
||||
const char *file,
|
||||
int line,
|
||||
const char *func,
|
||||
const char *object_field,
|
||||
@@ -739,7 +739,7 @@ int log_object_internalv(
|
||||
int log_object_internal(
|
||||
int level,
|
||||
int error,
|
||||
const char*file,
|
||||
const char *file,
|
||||
int line,
|
||||
const char *func,
|
||||
const char *object_field,
|
||||
|
||||
Reference in New Issue
Block a user