diff options
| author |   nicm <nicm@openbsd.org> | 2016-10-10 21:51:39 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2016-10-10 21:51:39 +0000 |
| commit | dc1f0f5f6762d20526d28a4fea8505b8be833e1c (patch) | |
| tree | 014a6f76677b5aa63dc7adf2af341d2ac92983f8 /usr.bin/tmux/cmd-string.c | |
| parent | Loads more static, except for cmd-*.c and window-*.c. (diff) | |
| download | wireguard-openbsd-dc1f0f5f6762d20526d28a4fea8505b8be833e1c.tar.xz wireguard-openbsd-dc1f0f5f6762d20526d28a4fea8505b8be833e1c.zip | |
Add static in cmd-* and fix a few other nits.
Diffstat (limited to 'usr.bin/tmux/cmd-string.c')
| -rw-r--r-- | usr.bin/tmux/cmd-string.c | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/usr.bin/tmux/cmd-string.c b/usr.bin/tmux/cmd-string.c index d1b70c4d532..7876d5d740b 100644 --- a/usr.bin/tmux/cmd-string.c +++ b/usr.bin/tmux/cmd-string.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd-string.c,v 1.22 2016/01/19 15:59:12 nicm Exp $ */ +/* $OpenBSD: cmd-string.c,v 1.23 2016/10/10 21:51:39 nicm Exp $ */ /* * Copyright (c) 2008 Nicholas Marriott <nicholas.marriott@gmail.com> @@ -31,14 +31,14 @@ * Parse a command from a string. */ -int cmd_string_getc(const char *, size_t *); -void cmd_string_ungetc(size_t *); -void cmd_string_copy(char **, char *, size_t *); -char *cmd_string_string(const char *, size_t *, char, int); -char *cmd_string_variable(const char *, size_t *); -char *cmd_string_expand_tilde(const char *, size_t *); +static int cmd_string_getc(const char *, size_t *); +static void cmd_string_ungetc(size_t *); +static void cmd_string_copy(char **, char *, size_t *); +static char *cmd_string_string(const char *, size_t *, char, int); +static char *cmd_string_variable(const char *, size_t *); +static char *cmd_string_expand_tilde(const char *, size_t *); -int +static int cmd_string_getc(const char *s, size_t *p) { const u_char *ucs = s; @@ -48,7 +48,7 @@ cmd_string_getc(const char *s, size_t *p) return (ucs[(*p)++]); } -void +static void cmd_string_ungetc(size_t *p) { (*p)--; @@ -173,7 +173,7 @@ out: return (rval); } -void +static void cmd_string_copy(char **dst, char *src, size_t *len) { size_t srclen; @@ -187,7 +187,7 @@ cmd_string_copy(char **dst, char *src, size_t *len) free(src); } -char * +static char * cmd_string_string(const char *s, size_t *p, char endch, int esc) { int ch; @@ -245,7 +245,7 @@ error: return (NULL); } -char * +static char * cmd_string_variable(const char *s, size_t *p) { int ch, fch; @@ -314,7 +314,7 @@ error: return (NULL); } -char * +static char * cmd_string_expand_tilde(const char *s, size_t *p) { struct passwd *pw; @@ -337,7 +337,10 @@ cmd_string_expand_tilde(const char *s, size_t *p) cp = user = xmalloc(strlen(s)); for (;;) { last = cmd_string_getc(s, p); - if (last == EOF || last == '/' || last == ' '|| last == '\t') + if (last == EOF || + last == '/' || + last == ' '|| + last == '\t') break; *cp++ = last; } |