diff options
| -rw-r--r-- | cmd-display-menu.c | 2 | ||||
| -rw-r--r-- | cmd-parse.y | 2 | ||||
| -rw-r--r-- | cmd-source-file.c | 2 | ||||
| -rw-r--r-- | file.c | 4 | ||||
| -rw-r--r-- | server-client.c | 2 |
5 files changed, 5 insertions, 7 deletions
diff --git a/cmd-display-menu.c b/cmd-display-menu.c index f57cf464..da1ca994 100644 --- a/cmd-display-menu.c +++ b/cmd-display-menu.c @@ -120,8 +120,6 @@ cmd_display_menu_get_position(struct client *tc, struct cmdq_item *item, if (sr != NULL) break; } - if (line == lines) - ranges = &tc->status.entries[0].ranges; if (sr != NULL) { format_add(ft, "popup_window_status_line_x", "%u", diff --git a/cmd-parse.y b/cmd-parse.y index 86917941..c27d530e 100644 --- a/cmd-parse.y +++ b/cmd-parse.y @@ -772,7 +772,7 @@ cmd_parse_expand_alias(struct cmd_parse_command *cmd, TAILQ_REMOVE(&cmd->arguments, first, entry); cmd_parse_free_argument(first); - after = TAILQ_NEXT(TAILQ_FIRST(&last->arguments), entry); + after = TAILQ_FIRST(&last->arguments); TAILQ_FOREACH_SAFE(arg, &cmd->arguments, entry, arg1) { TAILQ_REMOVE(&cmd->arguments, arg, entry); if (after == NULL) diff --git a/cmd-source-file.c b/cmd-source-file.c index 44a88fea..71f69d59 100644 --- a/cmd-source-file.c +++ b/cmd-source-file.c @@ -179,12 +179,12 @@ cmd_source_file_exec(struct cmd *self, struct cmdq_item *item) free(pattern); continue; } - free(expanded); free(pattern); for (j = 0; j < g.gl_pathc; j++) cmd_source_file_add(cdata, g.gl_pathv[j]); } + free(expanded); cdata->after = item; cdata->retval = retval; @@ -555,7 +555,7 @@ file_write_open(struct client_files *files, struct tmuxpeer *peer, log_debug("open write file %d %s", msg->stream, path); find.stream = msg->stream; - if ((cf = RB_FIND(client_files, files, &find)) != NULL) { + if (RB_FIND(client_files, files, &find) != NULL) { error = EBADF; goto reply; } @@ -714,7 +714,7 @@ file_read_open(struct client_files *files, struct tmuxpeer *peer, log_debug("open read file %d %s", msg->stream, path); find.stream = msg->stream; - if ((cf = RB_FIND(client_files, files, &find)) != NULL) { + if (RB_FIND(client_files, files, &find) != NULL) { error = EBADF; goto reply; } diff --git a/server-client.c b/server-client.c index d75735f3..3efee844 100644 --- a/server-client.c +++ b/server-client.c @@ -277,7 +277,7 @@ server_client_open(struct client *c, char **cause) static void server_client_attached_lost(struct client *c) { - struct session *s = c->session; + struct session *s; struct window *w; struct client *loop; struct client *found; |