mirror of
https://github.com/labwc/labwc.git
synced 2026-02-20 01:40:22 -05:00
treewide: remove empty statements in switch cases
For longer cases, factor out the logic to new functions. For very short cases, just move the declaration before the switch. v2: in one case, replace the switch with if/else.
This commit is contained in:
parent
fbb92e2e30
commit
a3d6226728
5 changed files with 59 additions and 50 deletions
28
src/action.c
28
src/action.c
|
|
@ -557,6 +557,22 @@ action_list_is_valid(struct wl_list *actions)
|
|||
return true;
|
||||
}
|
||||
|
||||
static bool
|
||||
action_branches_are_valid(struct action *action)
|
||||
{
|
||||
static const char * const branches[] = { "then", "else", "none" };
|
||||
for (size_t i = 0; i < ARRAY_SIZE(branches); i++) {
|
||||
struct wl_list *children =
|
||||
action_get_actionlist(action, branches[i]);
|
||||
if (children && !action_list_is_valid(children)) {
|
||||
wlr_log(WLR_ERROR, "Invalid action in %s '%s' branch",
|
||||
action_names[action->type], branches[i]);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
/* Checks for *required* arguments */
|
||||
bool
|
||||
action_is_valid(struct action *action)
|
||||
|
|
@ -589,17 +605,7 @@ action_is_valid(struct action *action)
|
|||
break;
|
||||
case ACTION_TYPE_IF:
|
||||
case ACTION_TYPE_FOR_EACH:
|
||||
; /* works around "a label can only be part of a statement" */
|
||||
static const char * const branches[] = { "then", "else", "none" };
|
||||
for (size_t i = 0; i < ARRAY_SIZE(branches); i++) {
|
||||
struct wl_list *children = action_get_actionlist(action, branches[i]);
|
||||
if (children && !action_list_is_valid(children)) {
|
||||
wlr_log(WLR_ERROR, "Invalid action in %s '%s' branch",
|
||||
action_names[action->type], branches[i]);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
return action_branches_are_valid(action);
|
||||
default:
|
||||
/* No arguments required */
|
||||
return true;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue