shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-25 01:34:28 +03:00
Code

tree-wide: yet another batch of coccinelle recommendations

Browse Source 
Prettify certain parts of the codebase using coccinelle transformations
(no functional changes).
This commit is contained in:
Frantisek Sumsal 2020-01-01 19:17:15 +01:00 committed by Lennart Poettering
parent 48d0248e6d
commit e514aa1eea
4 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/basic/memory-util.h
View File

@ -7,6 +7,7 @@
#include <string.h>
#include <sys/types.h>
#include "alloc-util.h"
#include "macro.h"
size_t page_size(void) _pure_;
@ -88,9 +89,7 @@ static inline void* erase_and_free(void *p) {
l = malloc_usable_size(p);
explicit_bzero_safe(p, l);
free(p);
return NULL;
return mfree(p);
}
static inline void erase_and_freep(void *p) {

2
src/basic/unit-name.c
View File

@ -621,7 +621,7 @@ int unit_name_mangle_with_suffix(const char *name, const char *operation, UnitNa
goto good;
log_full(flags & UNIT_NAME_MANGLE_WARN ? LOG_NOTICE : LOG_DEBUG,
"Glob pattern passed%s%s, but globs are not supported for this.",
operation ? " " : "", operation ?: "");
operation ? " " : "", strempty(operation));
suggest_escape = false;
}

8
src/cryptsetup/cryptsetup.c
View File

@ -455,10 +455,10 @@ static int attach_tcrypt(
assert(name);
assert(key_file || (passwords && passwords[0]));
if (arg_pkcs11_uri) {
log_error("Sorry, but tcrypt devices are currently not supported in conjunction with pkcs11 support.");
return -EAGAIN; /* Ask for a regular password */
}
if (arg_pkcs11_uri)
/* Ask for a regular password */
return log_error_errno(SYNTHETIC_ERRNO(EAGAIN),
"Sorry, but tcrypt devices are currently not supported in conjunction with pkcs11 support.");
if (arg_tcrypt_hidden)
params.flags |= CRYPT_TCRYPT_HIDDEN_HEADER;

4
src/libsystemd/sd-event/sd-event.c
View File

@ -828,9 +828,7 @@ static void source_disconnect(sd_event_source *s) {
if (s->prepare)
prioq_remove(s->event->prepare, s, &s->prepare_index);
event = s->event;
s->event = NULL;
event = TAKE_PTR(s->event);
LIST_REMOVE(sources, event->sources, s);
event->n_sources--;