aboutsummaryrefslogtreecommitdiff
path: root/server.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2009-06-25 16:34:50 +0000
committerNicholas Marriott <nicholas.marriott@gmail.com>2009-06-25 16:34:50 +0000
commitbb459beb032cfa9473cdef21ef645b350d61728c (patch)
treed924c499381cbc383fd139676d54c6dd9ae9e119 /server.c
parent8df98d1f5b92a085ef874389e2244de3a4f5ee43 (diff)
downloadrtmux-bb459beb032cfa9473cdef21ef645b350d61728c.tar.gz
rtmux-bb459beb032cfa9473cdef21ef645b350d61728c.tar.bz2
rtmux-bb459beb032cfa9473cdef21ef645b350d61728c.zip
Whitespace and more syncing.
Diffstat (limited to 'server.c')
-rw-r--r--server.c14
1 files changed, 3 insertions, 11 deletions
diff --git a/server.c b/server.c
index fb886c20..a2d00a97 100644
--- a/server.c
+++ b/server.c
@@ -1,4 +1,4 @@
-/* $Id: server.c,v 1.148 2009-06-25 16:21:32 nicm Exp $ */
+/* $Id: server.c,v 1.149 2009-06-25 16:34:50 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -131,7 +131,7 @@ server_client_index(struct client *c)
int
server_start(char *path)
{
- int retcode, pair[2], srv_fd;
+ int pair[2], srv_fd;
char *cause;
#ifdef HAVE_SETPROCTITLE
char rpathbuf[MAXPATHLEN];
@@ -152,10 +152,6 @@ server_start(char *path)
}
close(pair[0]);
-#ifdef DEBUG
- xmalloc_clear();
-#endif
-
/*
* Must daemonise before loading configuration as the PID changes so
* $TMUX would be wrong for sessions created in the config file.
@@ -194,11 +190,7 @@ server_start(char *path)
srv_fd = server_create_socket();
server_create_client(pair[1]);
- retcode = server_main(srv_fd);
-#ifdef DEBUG
- xmalloc_report(getpid(), "server");
-#endif
- exit(retcode);
+ exit(server_main(srv_fd));
}
/* Create server socket. */