picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

wrap a few *_FOREACH macros in curly braces

Browse source 
cppcheck would give up with "syntax error" without them. This led
to reports of syntax errors in unrelated locations and potentially
hid other errors
This commit is contained in:
Thomas Hindoe Paaboel Andersen 2014-12-12 19:51:41 +01:00
parent 308b571076
commit abc08d4d08
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/core/load-fragment.c
View file

@ -3586,7 +3586,7 @@ int unit_load_fragment(Unit *u) {
return r;
/* Try to find an alias we can load this with */
if (u->load_state == UNIT_STUB)
if (u->load_state == UNIT_STUB) {
SET_FOREACH(t, u->names, i) {
if (t == u->id)
@ -3599,6 +3599,7 @@ int unit_load_fragment(Unit *u) {
if (u->load_state != UNIT_STUB)
break;
}
}
/* And now, try looking for it under the suggested (originally linked) path */
if (u->load_state == UNIT_STUB && u->fragment_path) {
@ -3628,7 +3629,7 @@ int unit_load_fragment(Unit *u) {
if (r < 0)
return r;
if (u->load_state == UNIT_STUB)
if (u->load_state == UNIT_STUB) {
SET_FOREACH(t, u->names, i) {
_cleanup_free_ char *z = NULL;
@ -3646,6 +3647,7 @@ int unit_load_fragment(Unit *u) {
if (u->load_state != UNIT_STUB)
break;
}
}
}
return 0;

4
src/journal-remote/journal-remote.c
View file

@ -1469,13 +1469,13 @@ static int setup_gnutls_logger(char **categories) {
gnutls_global_set_log_function(log_func_gnutls);
if (categories)
if (categories) {
STRV_FOREACH(cat, categories) {
r = log_enable_gnutls_category(*cat);
if (r < 0)
return r;
}
else
} else
log_reset_gnutls_level();
}
#endif