summaryrefslogtreecommitdiffstats
path: root/server.c
diff options
context:
space:
mode:
authorTiago Cunha <tcunha@gmx.com>2009-09-20 22:11:27 +0000
committerTiago Cunha <tcunha@gmx.com>2009-09-20 22:11:27 +0000
commit3266fb5441e99c809ee56806a0eb8d113a4d099f (patch)
treef52c08a3d9aed0b3861348f4a20f8ddf21e4e99d /server.c
parentab967724365e8210ad51bbaa8b2c2d28f548e188 (diff)
Sync OpenBSD patchset 332:
Regularise some fatal messages.
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 9101ac31..bdb8adde 100644
--- a/server.c
+++ b/server.c
@@ -1,4 +1,4 @@
-/* $Id: server.c,v 1.189 2009-09-19 18:53:01 tcunha Exp $ */
+/* $Id: server.c,v 1.190 2009-09-20 22:11:27 tcunha Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -438,7 +438,7 @@ server_child_signal(void)
case -1:
if (errno == ECHILD)
return;
- fatal("waitpid");
+ fatal("waitpid failed");
case 0:
return;
}
@@ -640,7 +640,7 @@ server_check_timers(struct client *c)
s = c->session;
if (gettimeofday(&tv, NULL) != 0)
- fatal("gettimeofday");
+ fatal("gettimeofday failed");
if (c->flags & CLIENT_IDENTIFY && timercmp(&tv, &c->identify_timer, >))
server_clear_identify(c);
@@ -808,7 +808,7 @@ server_handle_client(struct client *c)
xtimeout = options_get_number(&c->session->options, "repeat-time");
if (xtimeout != 0 && c->flags & CLIENT_REPEAT) {
if (gettimeofday(&tv, NULL) != 0)
- fatal("gettimeofday");
+ fatal("gettimeofday failed");
if (timercmp(&tv, &c->repeat_timer, >))
c->flags &= ~(CLIENT_PREFIX|CLIENT_REPEAT);
}
@@ -892,7 +892,7 @@ server_handle_client(struct client *c)
tv.tv_sec = xtimeout / 1000;
tv.tv_usec = (xtimeout % 1000) * 1000L;
if (gettimeofday(&c->repeat_timer, NULL) != 0)
- fatal("gettimeofday");
+ fatal("gettimeofday failed");
timeradd(&c->repeat_timer, &tv, &c->repeat_timer);
}