From 3266fb5441e99c809ee56806a0eb8d113a4d099f Mon Sep 17 00:00:00 2001 From: Tiago Cunha Date: Sun, 20 Sep 2009 22:11:27 +0000 Subject: [PATCH] Sync OpenBSD patchset 332: Regularise some fatal messages. --- client.c | 4 ++-- names.c | 4 ++-- paste.c | 6 +++--- server-fn.c | 4 ++-- server.c | 10 +++++----- session.c | 4 ++-- status.c | 8 ++++---- tty-keys.c | 6 +++--- window.c | 4 ++-- 9 files changed, 25 insertions(+), 25 deletions(-) diff --git a/client.c b/client.c index b0f175b9..75e46b28 100644 --- a/client.c +++ b/client.c @@ -1,4 +1,4 @@ -/* $Id: client.c,v 1.70 2009-09-03 21:06:30 tcunha Exp $ */ +/* $Id: client.c,v 1.71 2009-09-20 22:11:27 tcunha Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -78,7 +78,7 @@ client_init(char *path, struct client_ctx *cctx, int cmdflags, int flags) } if ((fd = socket(AF_UNIX, SOCK_STREAM, 0)) == -1) - fatal("socket"); + fatal("socket failed"); if (connect(fd, (struct sockaddr *) &sa, SUN_LEN(&sa)) == -1) { if (errno == ECONNREFUSED) { diff --git a/names.c b/names.c index ee366aba..4d9b00ee 100644 --- a/names.c +++ b/names.c @@ -1,4 +1,4 @@ -/* $Id: names.c,v 1.15 2009-09-02 01:02:44 tcunha Exp $ */ +/* $Id: names.c,v 1.16 2009-09-20 22:11:27 tcunha Exp $ */ /* * Copyright (c) 2009 Nicholas Marriott @@ -36,7 +36,7 @@ set_window_names(void) struct timeval tv, tv2; if (gettimeofday(&tv, NULL) != 0) - fatal("gettimeofday"); + fatal("gettimeofday failed"); for (i = 0; i < ARRAY_LENGTH(&windows); i++) { w = ARRAY_ITEM(&windows, i); diff --git a/paste.c b/paste.c index 9e41ce54..69579e07 100644 --- a/paste.c +++ b/paste.c @@ -1,4 +1,4 @@ -/* $Id: paste.c,v 1.9 2009-09-07 23:48:54 tcunha Exp $ */ +/* $Id: paste.c,v 1.10 2009-09-20 22:11:27 tcunha Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -117,7 +117,7 @@ paste_add(struct paste_stack *ps, u_char *data, size_t size, u_int limit) pb->data = data; pb->size = size; if (gettimeofday(&pb->tv, NULL) != 0) - fatal("gettimeofday"); + fatal("gettimeofday failed"); } int @@ -134,7 +134,7 @@ paste_replace(struct paste_stack *ps, u_int idx, u_char *data, size_t size) pb->data = data; pb->size = size; if (gettimeofday(&pb->tv, NULL) != 0) - fatal("gettimeofday"); + fatal("gettimeofday failed"); return (0); } diff --git a/server-fn.c b/server-fn.c index d686d568..0af2a16b 100644 --- a/server-fn.c +++ b/server-fn.c @@ -1,4 +1,4 @@ -/* $Id: server-fn.c,v 1.87 2009-09-13 20:37:37 tcunha Exp $ */ +/* $Id: server-fn.c,v 1.88 2009-09-20 22:11:27 tcunha Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -321,7 +321,7 @@ server_set_identify(struct client *c) tv.tv_usec = (delay % 1000) * 1000L; if (gettimeofday(&c->identify_timer, NULL) != 0) - fatal("gettimeofday"); + fatal("gettimeofday failed"); timeradd(&c->identify_timer, &tv, &c->identify_timer); c->flags |= CLIENT_IDENTIFY; 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 @@ -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); } diff --git a/session.c b/session.c index 0282e545..b02cb06e 100644 --- a/session.c +++ b/session.c @@ -1,4 +1,4 @@ -/* $Id: session.c,v 1.66 2009-09-16 12:36:27 nicm Exp $ */ +/* $Id: session.c,v 1.67 2009-09-20 22:11:27 tcunha Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -125,7 +125,7 @@ session_create(const char *name, const char *cmd, const char *cwd, s->flags = 0; if (gettimeofday(&s->tv, NULL) != 0) - fatal("gettimeofday"); + fatal("gettimeofday failed"); s->curw = NULL; SLIST_INIT(&s->lastw); diff --git a/status.c b/status.c index 9cf5dbc8..85970282 100644 --- a/status.c +++ b/status.c @@ -1,4 +1,4 @@ -/* $Id: status.c,v 1.118 2009-09-11 14:13:52 tcunha Exp $ */ +/* $Id: status.c,v 1.119 2009-09-20 22:11:27 tcunha Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -64,7 +64,7 @@ status_redraw(struct client *c) screen_init(&c->status, c->tty.sx, 1, 0); if (gettimeofday(&c->status_timer, NULL) != 0) - fatal("gettimeofday"); + fatal("gettimeofday failed"); memcpy(&stdgc, &grid_default_cell, sizeof gc); colour_set_fg(&stdgc, options_get_number(&s->options, "status-fg")); colour_set_bg(&stdgc, options_get_number(&s->options, "status-bg")); @@ -361,7 +361,7 @@ status_replace(struct session *s, const char *fmt, time_t t) case 'H': if (ptr == NULL) { if (gethostname(tmp, sizeof tmp) != 0) - fatal("gethostname"); + fatal("gethostname failed"); ptr = tmp; } /* FALLTHROUGH */ @@ -565,7 +565,7 @@ status_message_set(struct client *c, const char *fmt, ...) tv.tv_usec = (delay % 1000) * 1000L; if (gettimeofday(&c->message_timer, NULL) != 0) - fatal("gettimeofday"); + fatal("gettimeofday failed"); timeradd(&c->message_timer, &tv, &c->message_timer); c->tty.flags |= (TTY_NOCURSOR|TTY_FREEZE); diff --git a/tty-keys.c b/tty-keys.c index 62ecced8..d6bd5f2e 100644 --- a/tty-keys.c +++ b/tty-keys.c @@ -1,4 +1,4 @@ -/* $Id: tty-keys.c,v 1.29 2009-07-28 22:37:02 tcunha Exp $ */ +/* $Id: tty-keys.c,v 1.30 2009-09-20 22:11:27 tcunha Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -287,7 +287,7 @@ tty_keys_next(struct tty *tty, int *key, u_char *mouse) tv.tv_sec = 0; tv.tv_usec = ESCAPE_PERIOD * 1000L; if (gettimeofday(&tty->key_timer, NULL) != 0) - fatal("gettimeofday"); + fatal("gettimeofday failed"); timeradd(&tty->key_timer, &tv, &tty->key_timer); tty->flags |= TTY_ESCAPE; @@ -317,7 +317,7 @@ tty_keys_next(struct tty *tty, int *key, u_char *mouse) /* If the timer hasn't expired, keep waiting. */ if (gettimeofday(&tv, NULL) != 0) - fatal("gettimeofday"); + fatal("gettimeofday failed"); if (timercmp(&tty->key_timer, &tv, >)) return (1); diff --git a/window.c b/window.c index 2d86b9f3..e5a902ba 100644 --- a/window.c +++ b/window.c @@ -1,4 +1,4 @@ -/* $Id: window.c,v 1.107 2009-09-16 12:36:28 nicm Exp $ */ +/* $Id: window.c,v 1.108 2009-09-20 22:11:27 tcunha Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -478,7 +478,7 @@ window_pane_spawn(struct window_pane *wp, const char *cmd, const char *shell, ws.ws_row = screen_size_y(&wp->base); if (gettimeofday(&wp->window->name_timer, NULL) != 0) - fatal("gettimeofday"); + fatal("gettimeofday failed"); tv.tv_sec = 0; tv.tv_usec = NAME_INTERVAL * 1000L; timeradd(&wp->window->name_timer, &tv, &wp->window->name_timer);