From b52f0cbfe64762605ec4a5814e712ca0d35aed73 Mon Sep 17 00:00:00 2001 From: nicm Date: Fri, 20 Aug 2021 17:50:42 +0000 Subject: [PATCH] Remove stray spaces after function names. --- usr.bin/tmux/cmd-list-keys.c | 7 +++---- usr.bin/tmux/format.c | 9 ++++----- usr.bin/tmux/input-keys.c | 4 ++-- usr.bin/tmux/mode-tree.c | 4 ++-- usr.bin/tmux/names.c | 4 ++-- usr.bin/tmux/screen.c | 4 ++-- usr.bin/tmux/server-client.c | 4 ++-- usr.bin/tmux/status.c | 6 +++--- usr.bin/tmux/window-copy.c | 8 ++++---- 9 files changed, 24 insertions(+), 26 deletions(-) diff --git a/usr.bin/tmux/cmd-list-keys.c b/usr.bin/tmux/cmd-list-keys.c index 03268e5809b..d0bd88be433 100644 --- a/usr.bin/tmux/cmd-list-keys.c +++ b/usr.bin/tmux/cmd-list-keys.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd-list-keys.c,v 1.63 2021/04/13 16:00:47 nicm Exp $ */ +/* $OpenBSD: cmd-list-keys.c,v 1.64 2021/08/20 17:50:42 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -211,7 +211,7 @@ cmd_list_keys_exec(struct cmd *self, struct cmdq_item *item) repeat = 0; tablewidth = keywidth = 0; - table = key_bindings_first_table (); + table = key_bindings_first_table(); while (table != NULL) { if (tablename != NULL && strcmp(table->name, tablename) != 0) { table = key_bindings_next_table(table); @@ -243,8 +243,7 @@ cmd_list_keys_exec(struct cmd *self, struct cmdq_item *item) tmpsize = 256; tmp = xmalloc(tmpsize); - - table = key_bindings_first_table (); + table = key_bindings_first_table(); while (table != NULL) { if (tablename != NULL && strcmp(table->name, tablename) != 0) { table = key_bindings_next_table(table); diff --git a/usr.bin/tmux/format.c b/usr.bin/tmux/format.c index 61106c23c65..ff0e6c89c23 100644 --- a/usr.bin/tmux/format.c +++ b/usr.bin/tmux/format.c @@ -1,4 +1,4 @@ -/* $OpenBSD: format.c,v 1.291 2021/08/12 19:47:05 nicm Exp $ */ +/* $OpenBSD: format.c,v 1.292 2021/08/20 17:50:42 nicm Exp $ */ /* * Copyright (c) 2011 Nicholas Marriott @@ -4078,8 +4078,7 @@ format_replace(struct format_expand_state *es, const char *key, size_t keylen, case 's': if (fm->argc < 2) break; - sub = xreallocarray (sub, nsub + 1, - sizeof *sub); + sub = xreallocarray(sub, nsub + 1, sizeof *sub); sub[nsub++] = fm; break; case '=': @@ -4188,7 +4187,7 @@ format_replace(struct format_expand_state *es, const char *key, size_t keylen, value = xstrdup(""); else xasprintf(&value, "%c", c); - free (new); + free(new); goto done; } @@ -4752,7 +4751,7 @@ format_defaults(struct format_tree *ft, struct client *c, struct session *s, if (wp != NULL) format_defaults_pane(ft, wp); - pb = paste_get_top (NULL); + pb = paste_get_top(NULL); if (pb != NULL) format_defaults_paste_buffer(ft, pb); } diff --git a/usr.bin/tmux/input-keys.c b/usr.bin/tmux/input-keys.c index 90fa852583e..fef255532f8 100644 --- a/usr.bin/tmux/input-keys.c +++ b/usr.bin/tmux/input-keys.c @@ -1,4 +1,4 @@ -/* $OpenBSD: input-keys.c,v 1.85 2021/06/10 07:52:07 nicm Exp $ */ +/* $OpenBSD: input-keys.c,v 1.86 2021/08/20 17:50:42 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -334,7 +334,7 @@ input_key_cmp(struct input_key_entry *ike1, struct input_key_entry *ike2) /* Look for key in tree. */ static struct input_key_entry * -input_key_get (key_code key) +input_key_get(key_code key) { struct input_key_entry entry = { .key = key }; diff --git a/usr.bin/tmux/mode-tree.c b/usr.bin/tmux/mode-tree.c index 4cffe38d862..e1960d1d4b7 100644 --- a/usr.bin/tmux/mode-tree.c +++ b/usr.bin/tmux/mode-tree.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mode-tree.c,v 1.54 2021/06/10 07:50:03 nicm Exp $ */ +/* $OpenBSD: mode-tree.c,v 1.55 2021/08/20 17:50:42 nicm Exp $ */ /* * Copyright (c) 2017 Nicholas Marriott @@ -922,7 +922,7 @@ mode_tree_menu_callback(__unused struct menu *menu, __unused u_int idx, if (mti->itemdata != mtm->itemdata) goto out; mtd->current = mtm->line; - mtd->menucb (mtd->modedata, mtm->c, key); + mtd->menucb(mtd->modedata, mtm->c, key); out: mode_tree_remove_ref(mtd); diff --git a/usr.bin/tmux/names.c b/usr.bin/tmux/names.c index 01462c4778c..53b3858af08 100644 --- a/usr.bin/tmux/names.c +++ b/usr.bin/tmux/names.c @@ -1,4 +1,4 @@ -/* $OpenBSD: names.c,v 1.44 2021/03/02 11:00:38 nicm Exp $ */ +/* $OpenBSD: names.c,v 1.45 2021/08/20 17:50:42 nicm Exp $ */ /* * Copyright (c) 2009 Nicholas Marriott @@ -146,7 +146,7 @@ parse_window_name(const char *in) name = copy = xstrdup(in); if (*name == '"') name++; - name[strcspn (name, "\"")] = '\0'; + name[strcspn(name, "\"")] = '\0'; if (strncmp(name, "exec ", (sizeof "exec ") - 1) == 0) name = name + (sizeof "exec ") - 1; diff --git a/usr.bin/tmux/screen.c b/usr.bin/tmux/screen.c index d81011765cf..8a9aacc2cc2 100644 --- a/usr.bin/tmux/screen.c +++ b/usr.bin/tmux/screen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: screen.c,v 1.73 2021/06/10 07:43:44 nicm Exp $ */ +/* $OpenBSD: screen.c,v 1.74 2021/08/20 17:50:42 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -698,6 +698,6 @@ screen_mode_to_string(int mode) strlcat(tmp, "CRLF,", sizeof tmp); if (mode & MODE_KEXTENDED) strlcat(tmp, "KEXTENDED,", sizeof tmp); - tmp[strlen (tmp) - 1] = '\0'; + tmp[strlen(tmp) - 1] = '\0'; return (tmp); } diff --git a/usr.bin/tmux/server-client.c b/usr.bin/tmux/server-client.c index 73c1b21e0c5..099e72065db 100644 --- a/usr.bin/tmux/server-client.c +++ b/usr.bin/tmux/server-client.c @@ -1,4 +1,4 @@ -/* $OpenBSD: server-client.c,v 1.380 2021/08/13 18:54:54 nicm Exp $ */ +/* $OpenBSD: server-client.c,v 1.381 2021/08/20 17:50:42 nicm Exp $ */ /* * Copyright (c) 2009 Nicholas Marriott @@ -2378,7 +2378,7 @@ server_client_set_flags(struct client *c, const char *flags) uint64_t flag; int not; - s = copy = xstrdup (flags); + s = copy = xstrdup(flags); while ((next = strsep(&s, ",")) != NULL) { not = (*next == '!'); if (not) diff --git a/usr.bin/tmux/status.c b/usr.bin/tmux/status.c index 6254a40a74f..827002554b2 100644 --- a/usr.bin/tmux/status.c +++ b/usr.bin/tmux/status.c @@ -1,4 +1,4 @@ -/* $OpenBSD: status.c,v 1.226 2021/08/12 20:09:34 nicm Exp $ */ +/* $OpenBSD: status.c,v 1.227 2021/08/20 17:50:42 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -1413,7 +1413,7 @@ process_key: break; if (c->prompt_buffer[0].size == 0) { prefix = '='; - free (c->prompt_buffer); + free(c->prompt_buffer); c->prompt_buffer = utf8_fromcstr(c->prompt_last); c->prompt_index = utf8_strlen(c->prompt_buffer); } else @@ -1424,7 +1424,7 @@ process_key: break; if (c->prompt_buffer[0].size == 0) { prefix = '='; - free (c->prompt_buffer); + free(c->prompt_buffer); c->prompt_buffer = utf8_fromcstr(c->prompt_last); c->prompt_index = utf8_strlen(c->prompt_buffer); } else diff --git a/usr.bin/tmux/window-copy.c b/usr.bin/tmux/window-copy.c index 6812603e7b7..481ee9de7bf 100644 --- a/usr.bin/tmux/window-copy.c +++ b/usr.bin/tmux/window-copy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: window-copy.c,v 1.326 2021/08/11 20:35:46 nicm Exp $ */ +/* $OpenBSD: window-copy.c,v 1.327 2021/08/20 17:50:42 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -2226,7 +2226,7 @@ window_copy_cmd_search_backward_incremental(struct window_copy_cmd_state *cs) data->timeout = 0; - log_debug ("%s: %s", __func__, argument); + log_debug("%s: %s", __func__, argument); prefix = *argument++; if (data->searchx == -1 || data->searchy == -1) { @@ -2281,7 +2281,7 @@ window_copy_cmd_search_forward_incremental(struct window_copy_cmd_state *cs) data->timeout = 0; - log_debug ("%s: %s", __func__, argument); + log_debug("%s: %s", __func__, argument); prefix = *argument++; if (data->searchx == -1 || data->searchy == -1) { @@ -2859,7 +2859,7 @@ window_copy_command(struct window_mode_entry *wme, struct client *c, args->argc - 1 > window_copy_cmd_table[i].maxargs) break; clear = window_copy_cmd_table[i].clear; - action = window_copy_cmd_table[i].f (&cs); + action = window_copy_cmd_table[i].f(&cs); break; } } -- 2.20.1