diff options
| -rw-r--r-- | cmd-command-prompt.c | 2 | ||||
| -rw-r--r-- | cmd-load-buffer.c | 2 | ||||
| -rw-r--r-- | cmd-save-buffer.c | 2 | ||||
| -rw-r--r-- | cmd-switch-client.c | 2 |
4 files changed, 3 insertions, 5 deletions
diff --git a/cmd-command-prompt.c b/cmd-command-prompt.c index cbe9c538..dec40bf2 100644 --- a/cmd-command-prompt.c +++ b/cmd-command-prompt.c @@ -72,7 +72,6 @@ cmd_command_prompt_exec(struct cmd *self, struct cmdq_item *item) struct client *c = item->state.c; char *prompt, *ptr, *input = NULL; size_t n; - int flags; if (c->prompt_string != NULL) return (CMD_RETURN_NORMAL); @@ -117,7 +116,6 @@ cmd_command_prompt_exec(struct cmd *self, struct cmdq_item *item) input = strsep(&cdata->next_input, ","); } - flags = 0; if (args_has(args, '1')) cdata->flags |= PROMPT_SINGLE; else if (args_has(args, 'N')) diff --git a/cmd-load-buffer.c b/cmd-load-buffer.c index 8592ed39..5370390d 100644 --- a/cmd-load-buffer.c +++ b/cmd-load-buffer.c @@ -89,7 +89,7 @@ cmd_load_buffer_exec(struct cmd *self, struct cmdq_item *item) if (c != NULL && c->session == NULL && c->cwd != NULL) cwd = c->cwd; - else if ((s = c->session) != NULL && s->cwd != NULL) + else if (c != NULL && (s = c->session) != NULL && s->cwd != NULL) cwd = s->cwd; else cwd = "."; diff --git a/cmd-save-buffer.c b/cmd-save-buffer.c index 0db2d69a..167fdc2c 100644 --- a/cmd-save-buffer.c +++ b/cmd-save-buffer.c @@ -100,7 +100,7 @@ cmd_save_buffer_exec(struct cmd *self, struct cmdq_item *item) if (c != NULL && c->session == NULL && c->cwd != NULL) cwd = c->cwd; - else if ((s = c->session) != NULL && s->cwd != NULL) + else if (c != NULL && (s = c->session) != NULL && s->cwd != NULL) cwd = s->cwd; else cwd = "."; diff --git a/cmd-switch-client.c b/cmd-switch-client.c index eb7c5351..81f70d9c 100644 --- a/cmd-switch-client.c +++ b/cmd-switch-client.c @@ -102,7 +102,7 @@ cmd_switch_client_exec(struct cmd *self, struct cmdq_item *item) } } - if (c != NULL && !args_has(args, 'E')) { + if (!args_has(args, 'E')) { update = options_get_string(s->options, "update-environment"); environ_update(update, c->environ, s->environ); } |