diff options
| -rw-r--r-- | arguments.c | 9 | ||||
| -rw-r--r-- | paste.c | 22 | ||||
| -rw-r--r-- | tmux.h | 2 |
3 files changed, 16 insertions, 17 deletions
diff --git a/arguments.c b/arguments.c index f7f8f737..9e096353 100644 --- a/arguments.c +++ b/arguments.c @@ -34,12 +34,13 @@ struct args_entry { RB_ENTRY(args_entry) entry; }; -struct args_entry *args_find(struct args *, u_char); +static struct args_entry *args_find(struct args *, u_char); -RB_GENERATE(args_tree, args_entry, entry, args_cmp); +static int args_cmp(struct args_entry *, struct args_entry *); +RB_GENERATE_STATIC(args_tree, args_entry, entry, args_cmp); /* Arguments tree comparison function. */ -int +static int args_cmp(struct args_entry *a1, struct args_entry *a2) { return (a1->flag - a2->flag); @@ -70,7 +71,7 @@ args_create(int argc, ...) } /* Find a flag in the arguments tree. */ -struct args_entry * +static struct args_entry * args_find(struct args *args, u_char ch) { struct args_entry entry; @@ -42,27 +42,27 @@ struct paste_buffer { RB_ENTRY(paste_buffer) time_entry; }; -u_int paste_next_index; -u_int paste_next_order; -u_int paste_num_automatic; +static u_int paste_next_index; +static u_int paste_next_order; +static u_int paste_num_automatic; RB_HEAD(paste_name_tree, paste_buffer) paste_by_name; RB_HEAD(paste_time_tree, paste_buffer) paste_by_time; -int paste_cmp_names(const struct paste_buffer *, const struct paste_buffer *); -RB_PROTOTYPE(paste_name_tree, paste_buffer, name_entry, paste_cmp_names); -RB_GENERATE(paste_name_tree, paste_buffer, name_entry, paste_cmp_names); +static int paste_cmp_names(const struct paste_buffer *, + const struct paste_buffer *); +RB_GENERATE_STATIC(paste_name_tree, paste_buffer, name_entry, paste_cmp_names); -int paste_cmp_times(const struct paste_buffer *, const struct paste_buffer *); -RB_PROTOTYPE(paste_time_tree, paste_buffer, time_entry, paste_cmp_times); -RB_GENERATE(paste_time_tree, paste_buffer, time_entry, paste_cmp_times); +static int paste_cmp_times(const struct paste_buffer *, + const struct paste_buffer *); +RB_GENERATE_STATIC(paste_time_tree, paste_buffer, time_entry, paste_cmp_times); -int +static int paste_cmp_names(const struct paste_buffer *a, const struct paste_buffer *b) { return (strcmp(a->name, b->name)); } -int +static int paste_cmp_times(const struct paste_buffer *a, const struct paste_buffer *b) { if (a->order > b->order) @@ -1800,8 +1800,6 @@ void tty_keys_free(struct tty *); key_code tty_keys_next(struct tty *); /* arguments.c */ -int args_cmp(struct args_entry *, struct args_entry *); -RB_PROTOTYPE(args_tree, args_entry, entry, args_cmp); struct args *args_create(int, ...); struct args *args_parse(const char *, int, char **); void args_free(struct args *); |