diff options
| author | Tiago Cunha <tcunha@gmx.com> | 2011-01-03 23:30:43 +0000 |
|---|---|---|
| committer | Tiago Cunha <tcunha@gmx.com> | 2011-01-03 23:30:43 +0000 |
| commit | 9ad028e8ee183c96e0973aaf785bf849307e01a7 (patch) | |
| tree | 0e44f5c9a631caacd722fb27f4e1d71ce2ff4f82 | |
| parent | d9c848d3a61ab5debe19c97c84a7b0b8ce2e1edb (diff) | |
| download | rtmux-9ad028e8ee183c96e0973aaf785bf849307e01a7.tar.gz rtmux-9ad028e8ee183c96e0973aaf785bf849307e01a7.tar.bz2 rtmux-9ad028e8ee183c96e0973aaf785bf849307e01a7.zip | |
Sync OpenBSD patchset 822:
Another table that should be const.
| -rw-r--r-- | cmd-server-info.c | 38 | ||||
| -rw-r--r-- | tmux.h | 4 | ||||
| -rw-r--r-- | tty-term.c | 33 |
3 files changed, 38 insertions, 37 deletions
diff --git a/cmd-server-info.c b/cmd-server-info.c index 5140b6bb..f141afd2 100644 --- a/cmd-server-info.c +++ b/cmd-server-info.c @@ -1,4 +1,4 @@ -/* $Id: cmd-server-info.c,v 1.39 2010-12-31 22:12:33 nicm Exp $ */ +/* $Id: cmd-server-info.c,v 1.40 2011-01-03 23:30:43 tcunha Exp $ */ /* * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net> @@ -47,24 +47,24 @@ const struct cmd_entry cmd_server_info_entry = { int cmd_server_info_exec(unused struct cmd *self, struct cmd_ctx *ctx) { - struct tty_term *term; - struct client *c; - struct session *s; - struct winlink *wl; - struct window *w; - struct window_pane *wp; - struct tty_code *code; - struct tty_term_code_entry *ent; - struct utsname un; - struct job *job; - struct grid *gd; - struct grid_line *gl; - u_int i, j, k; - char out[80]; - char *tim; - time_t t; - u_int lines, ulines; - size_t size, usize; + struct tty_term *term; + struct client *c; + struct session *s; + struct winlink *wl; + struct window *w; + struct window_pane *wp; + struct tty_code *code; + const struct tty_term_code_entry *ent; + struct utsname un; + struct job *job; + struct grid *gd; + struct grid_line *gl; + u_int i, j, k; + char out[80]; + char *tim; + time_t t; + u_int lines, ulines; + size_t size, usize; tim = ctime(&start_time); *strchr(tim, '\n') = '\0'; @@ -1,4 +1,4 @@ -/* $Id: tmux.h,v 1.597 2011-01-03 23:27:54 tcunha Exp $ */ +/* $Id: tmux.h,v 1.598 2011-01-03 23:30:43 tcunha Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -1422,7 +1422,7 @@ void tty_cmd_reverseindex(struct tty *, const struct tty_ctx *); /* tty-term.c */ extern struct tty_terms tty_terms; -extern struct tty_term_code_entry tty_term_codes[NTTYCODE]; +extern const struct tty_term_code_entry tty_term_codes[NTTYCODE]; struct tty_term *tty_term_find(char *, int, const char *, char **); void tty_term_free(struct tty_term *); int tty_term_has(struct tty_term *, enum tty_code_code); @@ -1,4 +1,4 @@ -/* $Id: tty-term.c,v 1.44 2010-12-31 22:12:33 nicm Exp $ */ +/* $Id: tty-term.c,v 1.45 2011-01-03 23:30:43 tcunha Exp $ */ /* * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net> @@ -35,7 +35,7 @@ char *tty_term_strip(const char *); struct tty_terms tty_terms = SLIST_HEAD_INITIALIZER(tty_terms); -struct tty_term_code_entry tty_term_codes[NTTYCODE] = { +const struct tty_term_code_entry tty_term_codes[NTTYCODE] = { { TTYC_ACSC, TTYCODE_STRING, "acsc" }, { TTYC_AX, TTYCODE_FLAG, "AX" }, { TTYC_BEL, TTYCODE_STRING, "bel" }, @@ -217,13 +217,14 @@ tty_term_strip(const char *s) void tty_term_override(struct tty_term *term, const char *overrides) { - struct tty_term_code_entry *ent; - struct tty_code *code; - char *termnext, *termstr, *entnext, *entstr; - char *s, *ptr, *val; - const char *errstr; - u_int i; - int n, removeflag; + const struct tty_term_code_entry *ent; + struct tty_code *code; + char *termnext, *termstr; + char *entnext, *entstr; + char *s, *ptr, *val; + const char *errstr; + u_int i; + int n, removeflag; s = xstrdup(overrides); @@ -299,13 +300,13 @@ tty_term_override(struct tty_term *term, const char *overrides) struct tty_term * tty_term_find(char *name, int fd, const char *overrides, char **cause) { - struct tty_term *term; - struct tty_term_code_entry *ent; - struct tty_code *code; - u_int i; - int n, error; - char *s; - const char *acs; + struct tty_term *term; + const struct tty_term_code_entry *ent; + struct tty_code *code; + u_int i; + int n, error; + char *s; + const char *acs; SLIST_FOREACH(term, &tty_terms, entry) { if (strcmp(term->name, name) == 0) { |