commit 7b0c40c82789d19547f4af4e8da4d98f4dccb72f from: Omar Polo date: Mon May 23 17:10:06 2022 UTC drop unnecessary braces around case bodies commit - 225607eff40b77dc809fcbeb12af8cd159cfa78f commit + 7b0c40c82789d19547f4af4e8da4d98f4dccb72f blob - e306b210f55feedab9a96effdab669f0d6fd23e2 blob + 577a0e0f641066b49d635e2a1ad8060b843927bb --- mymenu.c +++ mymenu.c @@ -1268,7 +1268,10 @@ enum state loop(struct rendering *r, char **text, int *textlen, struct completions *cs, char **lines, char **vlines) { + enum action a; + char *input = NULL; enum state status = LOOPING; + int i; while (status == LOOPING) { XEvent e; @@ -1299,10 +1302,7 @@ loop(struct rendering *r, char **text, int *textlen, s break; case KeyPress: - case ButtonPress: { - enum action a; - char *input = NULL; - + case ButtonPress: if (e.type == KeyPress) a = parse_event(r->d, (XKeyPressedEvent *)&e, r->xic, &input); @@ -1318,31 +1318,27 @@ loop(struct rendering *r, char **text, int *textlen, s status = ERR; break; - case CONFIRM: { + case CONFIRM: status = OK; confirm(&status, r, cs, text, textlen); break; - } - case CONFIRM_CONTINUE: { + case CONFIRM_CONTINUE: status = OK_LOOP; confirm(&status, r, cs, text, textlen); break; - } - case PREV_COMPL: { + case PREV_COMPL: complete(cs, r->first_selected, 1, text, textlen, &status); r->offset = cs->selected; break; - } - - case NEXT_COMPL: { + + case NEXT_COMPL: complete(cs, r->first_selected, 0, text, textlen, &status); r->offset = cs->selected; break; - } case DEL_CHAR: popc(*text); @@ -1351,25 +1347,22 @@ loop(struct rendering *r, char **text, int *textlen, s r->offset = 0; break; - case DEL_WORD: { + case DEL_WORD: popw(*text); update_completions(cs, *text, lines, vlines, r->first_selected); break; - } - case DEL_LINE: { - int i; + case DEL_LINE: for (i = 0; i < *textlen; ++i) (*text)[i] = 0; update_completions(cs, *text, lines, vlines, r->first_selected); r->offset = 0; break; - } case ADD_CHAR: { - int str_len, i; + int str_len; str_len = strlen(input); @@ -1421,7 +1414,6 @@ loop(struct rendering *r, char **text, int *textlen, s break; } } - } draw(r, *text, cs); }