summaryrefslogtreecommitdiffstats
path: root/server.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@openbsd.org>2012-07-10 11:53:01 +0000
committerNicholas Marriott <nicm@openbsd.org>2012-07-10 11:53:01 +0000
commitdf912e3540968a2a0b266e523ecc08bb2dc0ca20 (patch)
treec2c59d025e08aab048b251d1711ed655cdf115f6 /server.c
parenta3391692ad5800ca034bbbdcd803924fc4e392ee (diff)
xfree is not particularly helpful, remove it. From Thomas Adam.
Diffstat (limited to 'server.c')
-rw-r--r--server.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/server.c b/server.c
index bc0e4ab9..740f71d9 100644
--- a/server.c
+++ b/server.c
@@ -162,7 +162,7 @@ server_start(int lockfd, char *lockfile)
server_client_create(pair[1]);
unlink(lockfile);
- xfree(lockfile);
+ free(lockfile);
close(lockfd);
if (access(SYSTEM_CFG, R_OK) == 0)
@@ -185,7 +185,7 @@ server_start(int lockfd, char *lockfile)
for (i = 0; i < ARRAY_LENGTH(&cfg_causes); i++) {
cause = ARRAY_ITEM(&cfg_causes, i);
window_copy_add(wp, "%s", cause);
- xfree(cause);
+ free(cause);
}
ARRAY_FREE(&cfg_causes);
}
@@ -275,8 +275,8 @@ server_clean_dead(void)
next_s = RB_NEXT(sessions, &dead_sessions, s);
if (s->references == 0) {
RB_REMOVE(sessions, &dead_sessions, s);
- xfree(s->name);
- xfree(s);
+ free(s->name);
+ free(s);
}
s = next_s;
}
@@ -286,7 +286,7 @@ server_clean_dead(void)
if (c == NULL || c->references != 0)
continue;
ARRAY_SET(&dead_clients, i, NULL);
- xfree(c);
+ free(c);
}
}