diff options
| author | emersion <contact@emersion.fr> | 2018-07-02 09:06:02 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-02 09:06:02 +0100 |
| commit | defb73596fedec846280b9155bb3e9d210da49bb (patch) | |
| tree | 0a3e6c9e5efaf0e8bb5f01ab7691350cd063ebcb /sway/commands/bar | |
| parent | 649e084f41295be761c0e9137831281b220dd970 (diff) | |
| parent | 2725185aeba3ae5dd4ab129158cb4677a8a63042 (diff) | |
| download | sway-defb73596fedec846280b9155bb3e9d210da49bb.tar.xz | |
Merge pull request #2186 from martinetd/static-analysis
Static analysis fixes
Diffstat (limited to 'sway/commands/bar')
| -rw-r--r-- | sway/commands/bar/font.c | 2 | ||||
| -rw-r--r-- | sway/commands/bar/modifier.c | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/sway/commands/bar/font.c b/sway/commands/bar/font.c index 80b7a593..f036cbc3 100644 --- a/sway/commands/bar/font.c +++ b/sway/commands/bar/font.c @@ -14,7 +14,7 @@ struct cmd_results *bar_cmd_font(int argc, char **argv) { } char *font = join_args(argv, argc); free(config->current_bar->font); - config->current_bar->font = strdup(font); + config->current_bar->font = font; wlr_log(L_DEBUG, "Settings font '%s' for bar: %s", config->current_bar->font, config->current_bar->id); return cmd_results_new(CMD_SUCCESS, NULL, NULL); diff --git a/sway/commands/bar/modifier.c b/sway/commands/bar/modifier.c index 7ba4b125..02f845e6 100644 --- a/sway/commands/bar/modifier.c +++ b/sway/commands/bar/modifier.c @@ -22,9 +22,10 @@ struct cmd_results *bar_cmd_modifier(int argc, char **argv) { mod |= tmp_mod; continue; } else { + error = cmd_results_new(CMD_INVALID, "modifier", + "Unknown modifier '%s'", split->items[i]); free_flat_list(split); - return cmd_results_new(CMD_INVALID, "modifier", - "Unknown modifier '%s'", split->items[i]); + return error; } } free_flat_list(split); |