diff options
| author |   nicm <nicm@openbsd.org> | 2012-07-10 11:53:01 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2012-07-10 11:53:01 +0000 |
| commit | 7d053cf95f3066c6e73307ead04fc57226a3af39 (patch) | |
| tree | efeaa09d389b020f6bce2de45058037a32cbbf0e /usr.bin/tmux/cmd-string.c | |
| parent | Instead of <arpa/inet.h> pulling in <netinet/in.h>, just copy in the (diff) | |
| download | wireguard-openbsd-7d053cf95f3066c6e73307ead04fc57226a3af39.tar.xz wireguard-openbsd-7d053cf95f3066c6e73307ead04fc57226a3af39.zip | |
xfree is not particularly helpful, remove it. From Thomas Adam.
Diffstat (limited to 'usr.bin/tmux/cmd-string.c')
| -rw-r--r-- | usr.bin/tmux/cmd-string.c | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/usr.bin/tmux/cmd-string.c b/usr.bin/tmux/cmd-string.c index 4b0c962e9e3..97500bd28ca 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.15 2010/12/13 22:53:14 nicm Exp $ */ +/* $OpenBSD: cmd-string.c,v 1.16 2012/07/10 11:53:01 nicm Exp $ */ /* * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net> @@ -87,7 +87,7 @@ cmd_string_parse(const char *s, struct cmd_list **cmdlist, char **cause) buf = xrealloc(buf, 1, len + strlen(t) + 1); strlcpy(buf + len, t, strlen(t) + 1); len += strlen(t); - xfree(t); + free(t); break; case '"': if ((t = cmd_string_string(s, &p, '"', 1)) == NULL) @@ -95,7 +95,7 @@ cmd_string_parse(const char *s, struct cmd_list **cmdlist, char **cause) buf = xrealloc(buf, 1, len + strlen(t) + 1); strlcpy(buf + len, t, strlen(t) + 1); len += strlen(t); - xfree(t); + free(t); break; case '$': if ((t = cmd_string_variable(s, &p)) == NULL) @@ -103,7 +103,7 @@ cmd_string_parse(const char *s, struct cmd_list **cmdlist, char **cause) buf = xrealloc(buf, 1, len + strlen(t) + 1); strlcpy(buf + len, t, strlen(t) + 1); len += strlen(t); - xfree(t); + free(t); break; case '#': /* Comment: discard rest of line. */ @@ -152,7 +152,7 @@ cmd_string_parse(const char *s, struct cmd_list **cmdlist, char **cause) buf = xrealloc(buf, 1, len + strlen(t) + 1); strlcpy(buf + len, t, strlen(t) + 1); len += strlen(t); - xfree(t); + free(t); break; } /* FALLTHROUGH */ @@ -170,13 +170,12 @@ error: xasprintf(cause, "invalid or unknown command: %s", s); out: - if (buf != NULL) - xfree(buf); + free(buf); if (argv != NULL) { for (i = 0; i < argc; i++) - xfree(argv[i]); - xfree(argv); + free(argv[i]); + free(argv); } return (rval); @@ -224,7 +223,7 @@ cmd_string_string(const char *s, size_t *p, char endch, int esc) buf = xrealloc(buf, 1, len + strlen(t) + 1); strlcpy(buf + len, t, strlen(t) + 1); len += strlen(t); - xfree(t); + free(t); continue; } @@ -239,8 +238,7 @@ cmd_string_string(const char *s, size_t *p, char endch, int esc) return (buf); error: - if (buf != NULL) - xfree(buf); + free(buf); return (NULL); } @@ -303,14 +301,13 @@ cmd_string_variable(const char *s, size_t *p) buf[len] = '\0'; envent = environ_find(&global_environ, buf); - xfree(buf); + free(buf); if (envent == NULL) return (xstrdup("")); return (xstrdup(envent->value)); error: - if (buf != NULL) - xfree(buf); + free(buf); return (NULL); } @@ -334,7 +331,7 @@ cmd_string_expand_tilde(const char *s, size_t *p) return (NULL); if ((pw = getpwnam(username)) != NULL) home = pw->pw_dir; - xfree(username); + free(username); } if (home == NULL) return (NULL); |