[Pkg-wmaker-commits] [wmbiff] 25/38: warning message beautification

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to tag wmbiff_0_4_16
in repository wmbiff.

commit 5a850e2ccb90224a7ff9beb1e68ba80647faec0f
Author: bluehal <bluehal>
Date:   Mon Jun 30 23:42:00 2003 +0000

    warning message beautification
---
 wmbiff/Imap4Client.c | 2 ++
 wmbiff/tlsComm.c     | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/wmbiff/Imap4Client.c b/wmbiff/Imap4Client.c
index 9e00a89..acc0f6c 100644
--- a/wmbiff/Imap4Client.c
+++ b/wmbiff/Imap4Client.c
@@ -404,6 +404,8 @@ void imap_cacheHeaders( /*@notnull@ */ Pop3 pc)
 						IMAP_DM(pc, DEBUG_ERROR,
 								"timedout looking for headers.: %s",
 								hdrbuf);
+						strcpy(m->from, "wmbiff");
+						strcpy(m->subj, "failure");
 					}
 				}
 				IMAP_DM(pc, DEBUG_INFO, "From: '%s' Subj: '%s'\n", m->from,
diff --git a/wmbiff/tlsComm.c b/wmbiff/tlsComm.c
index b99e5e2..c6db9b0 100644
--- a/wmbiff/tlsComm.c
+++ b/wmbiff/tlsComm.c
@@ -229,8 +229,10 @@ int tlscomm_expect(struct connection_state *scs,
 		TDM(DEBUG_INFO, "%s: timed out while expecting '%s'\n",
 			scs->name, prefix);
 	} else {
-		TDM(DEBUG_ERROR, "%s: expecting: '%s', saw (%d): %s\n",
-			scs->name, prefix, readbytes, linebuf);
+		TDM(DEBUG_ERROR, "%s: expecting: '%s', saw (%d): %s%s",
+			scs->name, prefix, readbytes, linebuf,
+			/* only print the newline if the linebuf lacks it */
+			(linebuf[strlen(linebuf) - 1] == '\n') ? "\n" : "");
 	}
 	return 0;					/* wait_for_it failed */
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmbiff.git