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/server-client.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/server-client.c')
| -rw-r--r-- | usr.bin/tmux/server-client.c | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/usr.bin/tmux/server-client.c b/usr.bin/tmux/server-client.c index d0f098fed52..db8e357fcac 100644 --- a/usr.bin/tmux/server-client.c +++ b/usr.bin/tmux/server-client.c @@ -1,4 +1,4 @@ -/* $OpenBSD: server-client.c,v 1.76 2012/06/20 12:55:55 nicm Exp $ */ +/* $OpenBSD: server-client.c,v 1.77 2012/07/10 11:53:01 nicm Exp $ */ /* * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net> @@ -23,6 +23,7 @@ #include <string.h> #include <time.h> #include <paths.h> +#include <stdlib.h> #include <unistd.h> #include "tmux.h" @@ -151,31 +152,25 @@ server_client_lost(struct client *c) status_free_jobs(&c->status_old); screen_free(&c->status); - if (c->title != NULL) - xfree(c->title); + free(c->title); evtimer_del(&c->repeat_timer); if (event_initialized(&c->identify_timer)) evtimer_del(&c->identify_timer); - if (c->message_string != NULL) - xfree(c->message_string); + free(c->message_string); if (event_initialized (&c->message_timer)) evtimer_del(&c->message_timer); for (i = 0; i < ARRAY_LENGTH(&c->message_log); i++) { msg = &ARRAY_ITEM(&c->message_log, i); - xfree(msg->msg); + free(msg->msg); } ARRAY_FREE(&c->message_log); - if (c->prompt_string != NULL) - xfree(c->prompt_string); - if (c->prompt_buffer != NULL) - xfree(c->prompt_buffer); - - if (c->cwd != NULL) - xfree(c->cwd); + free(c->prompt_string); + free(c->prompt_buffer); + free(c->cwd); environ_free(&c->environ); @@ -662,12 +657,11 @@ server_client_set_title(struct client *c) title = status_replace(c, NULL, NULL, NULL, template, time(NULL), 1); if (c->title == NULL || strcmp(title, c->title) != 0) { - if (c->title != NULL) - xfree(c->title); + free(c->title); c->title = xstrdup(title); tty_set_title(&c->tty, c->title); } - xfree(title); + free(title); } /* Dispatch message from client. */ |