summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xhwdb/parse_hwdb.py3
-rw-r--r--src/journal/journald-server.c2
2 files changed, 2 insertions, 3 deletions
diff --git a/hwdb/parse_hwdb.py b/hwdb/parse_hwdb.py
index 556b859191..5d4c5ea64d 100755
--- a/hwdb/parse_hwdb.py
+++ b/hwdb/parse_hwdb.py
@@ -133,8 +133,7 @@ def convert_properties(group):
def parse(fname):
grammar = hwdb_grammar()
try:
- with open(fname, 'r', encoding='UTF-8') as f:
- parsed = grammar.parseFile(f)
+ parsed = grammar.parseFile(fname)
except ParseBaseException as e:
error('Cannot parse {}: {}', fname, e)
return []
diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
index 567f06515f..28487a9451 100644
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -1480,7 +1480,7 @@ static int setup_signals(Server *s) {
assert(s);
- assert(sigprocmask_many(SIG_SETMASK, NULL, SIGINT, SIGTERM, SIGUSR1, SIGUSR2, SIGRTMIN+1, -1) >= 0);
+ assert_se(sigprocmask_many(SIG_SETMASK, NULL, SIGINT, SIGTERM, SIGUSR1, SIGUSR2, SIGRTMIN+1, -1) >= 0);
r = sd_event_add_signal(s->event, &s->sigusr1_event_source, SIGUSR1, dispatch_sigusr1, s);
if (r < 0)