diff options
| author | nicm <nicm> | 2021-08-22 13:48:29 +0000 |
|---|---|---|
| committer | nicm <nicm> | 2021-08-22 13:48:29 +0000 |
| commit | 72d905f32c53ea1304b4b3206383502a23cfc0fd (patch) | |
| tree | 3604fd660df026d9bafc253115bd3b56fc8ab94a | |
| parent | c0048d6d20a056464a6b1b63e8bdc1793a29b029 (diff) | |
Do not double free expanded path in source-file, also remove some
unnecessary assignments.
| -rw-r--r-- | cmd-display-menu.c | 2 | ||||
| -rw-r--r-- | cmd-source-file.c | 2 | ||||
| -rw-r--r-- | file.c | 4 | ||||
| -rw-r--r-- | server-client.c | 2 |
4 files changed, 4 insertions, 6 deletions
diff --git a/cmd-display-menu.c b/cmd-display-menu.c index b80f8d46..347a7090 100644 --- a/cmd-display-menu.c +++ b/cmd-display-menu.c @@ -121,8 +121,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-source-file.c b/cmd-source-file.c index 63e1b28c..fbe871ca 100644 --- a/cmd-source-file.c +++ b/cmd-source-file.c @@ -180,12 +180,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; @@ -558,7 +558,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; } @@ -717,7 +717,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 8821ba57..ac9a7475 100644 --- a/server-client.c +++ b/server-client.c @@ -280,7 +280,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; |