Update of /cvsroot/tmux/tmux
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv12504
Modified Files:
cmd-server-info.c tmux.h tty-term.c
Log Message:
Sync OpenBSD patchset 822:
Another table that should be const.
Index: cmd-server-info.c
===================================================================
RCS file: /cvsroot/tmux/tmux/cmd-server-info.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- cmd-server-info.c 31 Dec 2010 22:12:33 -0000 1.39
+++ cmd-server-info.c 3 Jan 2011 23:30:43 -0000 1.40
@@ -47,24 +47,24 @@
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';
Index: tty-term.c
===================================================================
RCS file: /cvsroot/tmux/tmux/tty-term.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- tty-term.c 31 Dec 2010 22:12:33 -0000 1.44
+++ tty-term.c 3 Jan 2011 23:30:43 -0000 1.45
@@ -35,7 +35,7 @@
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 @@
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 @@
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) {
Index: tmux.h
===================================================================
RCS file: /cvsroot/tmux/tmux/tmux.h,v
retrieving revision 1.597
retrieving revision 1.598
diff -u -d -r1.597 -r1.598
--- tmux.h 3 Jan 2011 23:27:54 -0000 1.597
+++ tmux.h 3 Jan 2011 23:30:43 -0000 1.598
@@ -1422,7 +1422,7 @@
/* 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);
------------------------------------------------------------------------------
Learn how Oracle Real Application Clusters (RAC) One Node allows customers
to consolidate database storage, standardize their database environment, and,
should the need arise, upgrade to a full multi-node Oracle RAC database
without downtime or disruption
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
tmux-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tmux-cvs
