circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-01-13 03:48:51 +00:00
Code Issues Projects Releases Wiki Activity

Sync OpenBSD patchset 270:

Browse Source 
Tag a few missed printf-like functions and fix a missing "%s".
This commit is contained in:
Tiago Cunha 2009-08-20 11:35:16 +00:00
parent 7ca3d7ac8e
commit 52b02850ca
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmd-server-info.c
View File

@ -1,4 +1,4 @@
/* $Id: cmd-server-info.c,v 1.25 2009-08-14 21:04:04 tcunha Exp $ */ /* $Id: cmd-server-info.c,v 1.26 2009-08-20 11:35:16 tcunha Exp $ */
/* /*
* Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@ -81,7 +81,7 @@ cmd_server_info_exec(unused struct cmd *self, struct cmd_ctx *ctx)
ctx->print(ctx, "protocol version is %d", PROTOCOL_VERSION); ctx->print(ctx, "protocol version is %d", PROTOCOL_VERSION);
ctx->print(ctx, "%u clients, %u sessions", ctx->print(ctx, "%u clients, %u sessions",
ARRAY_LENGTH(&clients), ARRAY_LENGTH(&sessions)); ARRAY_LENGTH(&clients), ARRAY_LENGTH(&sessions));
ctx->print(ctx, ""); ctx->print(ctx, "%s", "");
ctx->print(ctx, "Clients:"); ctx->print(ctx, "Clients:");
for (i = 0; i < ARRAY_LENGTH(&clients); i++) { for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
@ -94,7 +94,7 @@ cmd_server_info_exec(unused struct cmd *self, struct cmd_ctx *ctx)
c->session->name, c->tty.sx, c->tty.sy, c->tty.termname, c->session->name, c->tty.sx, c->tty.sy, c->tty.termname,
c->flags, c->tty.flags); c->flags, c->tty.flags);
} }
ctx->print(ctx, ""); ctx->print(ctx, "%s", "");
ctx->print(ctx, "Sessions: [%zu/%zu]", ctx->print(ctx, "Sessions: [%zu/%zu]",
sizeof (struct grid_cell), sizeof (struct grid_utf8)); sizeof (struct grid_cell), sizeof (struct grid_utf8));
@ -142,7 +142,7 @@ cmd_server_info_exec(unused struct cmd *self, struct cmd_ctx *ctx)
} }
} }
} }
ctx->print(ctx, ""); ctx->print(ctx, "%s", "");
ctx->print(ctx, "Terminals:"); ctx->print(ctx, "Terminals:");
SLIST_FOREACH(term, &tty_terms, entry) { SLIST_FOREACH(term, &tty_terms, entry) {
@ -174,7 +174,7 @@ cmd_server_info_exec(unused struct cmd *self, struct cmd_ctx *ctx)
} }
} }
} }
ctx->print(ctx, ""); ctx->print(ctx, "%s", "");
return (0); return (0);
} }

4
cmd-show-buffer.c
View File

@ -1,4 +1,4 @@
/* $Id: cmd-show-buffer.c,v 1.8 2009-08-20 11:33:13 tcunha Exp $ */ /* $Id: cmd-show-buffer.c,v 1.9 2009-08-20 11:35:16 tcunha Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -93,7 +93,7 @@ cmd_show_buffer_exec(struct cmd *self, struct cmd_ctx *ctx)
if (len != 0) { if (len != 0) {
buf[len] = '\0'; buf[len] = '\0';
ctx->print(ctx, buf); ctx->print(ctx, "%s", buf);
} }
xfree(buf); xfree(buf);

12
tmux.h
View File

@ -1,4 +1,4 @@
/* $Id: tmux.h,v 1.422 2009-08-20 11:22:48 tcunha Exp $ */ /* $Id: tmux.h,v 1.423 2009-08-20 11:35:16 tcunha Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -989,9 +989,9 @@ struct cmd_ctx {
struct msg_command_data *msgdata; struct msg_command_data *msgdata;
void (*print)(struct cmd_ctx *, const char *, ...); void printflike2 (*print)(struct cmd_ctx *, const char *, ...);
void (*info)(struct cmd_ctx *, const char *, ...); void printflike2 (*info)(struct cmd_ctx *, const char *, ...);
void (*error)(struct cmd_ctx *, const char *, ...); void printflike2 (*error)(struct cmd_ctx *, const char *, ...);
}; };
struct cmd { struct cmd {
@ -1720,8 +1720,8 @@ void printflike1 log_warnx(const char *, ...);
void printflike1 log_info(const char *, ...); void printflike1 log_info(const char *, ...);
void printflike1 log_debug(const char *, ...); void printflike1 log_debug(const char *, ...);
void printflike1 log_debug2(const char *, ...); void printflike1 log_debug2(const char *, ...);
__dead void log_fatal(const char *, ...); __dead void printflike1 log_fatal(const char *, ...);
__dead void log_fatalx(const char *, ...); __dead void printflike1 log_fatalx(const char *, ...);
/* xmalloc.c */ /* xmalloc.c */
char *xstrdup(const char *); char *xstrdup(const char *);