[PATCH 25/65] prefix errors with "ii: "

From: Hiltjo Posthuma <hiltjo_AT_codemadness.org>
Date: Thu, 17 Apr 2014 17:10:11 +0200

Signed-off-by: Hiltjo Posthuma <hiltjo_AT_codemadness.org>

---
 ii.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/ii.c b/ii.c
index b662d4a..04ff9ec 100644
--- a/ii.c
+++ b/ii.c
_AT_@ -86,7 +86,7 @@ create_dirtree(const char *dir) {
 
 static void
 create_filepath(char *filepath, size_t len, char *channel, char *suffix) {
-	const char *e = "path to irc directory too long\n";
+	const char *e = "ii: path to irc directory too long\n";
 
 	if(channel && channel[0]) {
 		striplower(channel);
_AT_@ -121,12 +121,12 @@ add_channel(char *cname) {
 			return; /* already handled */
 
 	if((fd = open_channel(name)) == -1) {
-		weprintf("cannot create in channel: %s:", name);
+		weprintf("ii: cannot create in channel: %s:", name);
 		return;
 	}
 
 	if(!(c = calloc(1, sizeof(Channel))))
-		eprintf("cannot allocate memory:");
+		eprintf("ii: cannot allocate memory:");
 
 	if(!channels)
 		channels = c;
_AT_@ -173,16 +173,16 @@ tcpopen(const char *host, unsigned short port) {
 	struct hostent *hp;
 
 	if(!(hp = gethostbyname(host)))
-		eprintf("cannot retrieve host information:");
+		eprintf("ii: cannot retrieve host information:");
 	memset(&sin, 0, sizeof(struct sockaddr_in));
 	sin.sin_family = AF_INET;
 	/* TODO: don't use h_addr or h_addr_list here, but getaddrinfo() */
 	memcpy(&sin.sin_addr, hp->h_addr_list[0], hp->h_length);
 	sin.sin_port = htons(port);
 	if((fd = socket(AF_INET, SOCK_STREAM, 0)) < 0)
-		eprintf("cannot create socket:");
+		eprintf("ii: cannot create socket:");
 	if(connect(fd, (const struct sockaddr *) &sin, sizeof(sin)) < 0)
-		eprintf("cannot connect to host:");
+		eprintf("ii: cannot connect to host:");
 
 	return fd;
 }
_AT_@ -462,7 +462,7 @@ handle_server_output(int ircfd) {
 	char buf[BUFSIZ];
 
 	if(read_line(ircfd, buf, sizeof(buf)) == -1)
-		eprintf("remote host closed connection:");
+		eprintf("ii: remote host closed connection:");
 	proc_server_cmd(ircfd, buf);
 }
 
_AT_@ -491,7 +491,7 @@ run(int ircfd, char *host) {
 		if(r < 0) {
 			if(errno == EINTR)
 				continue;
-			eprintf("error on select():");
+			eprintf("ii: error on select():");
 		} else if(r == 0) {
 			if(time(NULL) - last_response >= PING_TIMEOUT) {
 				print_out(NULL, "-!- ii shutting down: ping timeout");
_AT_@ -520,7 +520,7 @@ main(int argc, char *argv[]) {
 
 	/* use nickname and home dir of user for ii by default */
 	if(!(spw = getpwuid(getuid())))
-		eprintf("getpwuid() failed:");
+		eprintf("ii: getpwuid() failed:");
 	strlcpy(nick, spw->pw_name, sizeof(nick));
 	snprintf(prefix, sizeof(prefix), "%s/irc", spw->pw_dir);
 
_AT_@ -544,7 +544,7 @@ main(int argc, char *argv[]) {
 		case 'k':
 			keyname = EARGF(usage());
 			if(!(key = getenv(keyname)))
-				eprintf("can't get password from $%s\n", keyname);
+				eprintf("ii: can't get password from $%s\n", keyname);
 			break;
 		case 'f':
 			fullname = EARGF(usage());
_AT_@ -559,7 +559,7 @@ main(int argc, char *argv[]) {
 
 	ircfd = tcpopen(host, port);
 	if(snprintf(path, sizeof(path), "%s/%s", prefix, host) <= 0)
-		eprintf("path to irc directory too long");
+		eprintf("ii: path to irc directory too long\n");
 	create_dirtree(path);
 
 	add_channel(""); /* master channel */
-- 
2.4.10
--Multipart=_Mon__9_May_2016_17_21_10_+0200_I.6cpFVydhq75aaE
Content-Type: text/x-diff;
 name="0026-add-comment-about-ipv6.patch"
Content-Disposition: attachment;
 filename="0026-add-comment-about-ipv6.patch"
Content-Transfer-Encoding: 7bit

Received on Mon Sep 17 2001 - 00:00:00 CEST