From: Art Cancro <ajc@uncensored.citadel.org>
Date: Sun, 13 Mar 2011 07:09:06 +0000 (-0400)
Subject: Indicate which function we were in when the connection to citserver broke
X-Git-Tag: v8.01~337
X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=f287f200e650178a95780bef232201828ea66ef1;p=citadel.git

Indicate which function we were in when the connection to citserver broke
---

diff --git a/citadel/modules/rssclient/serv_rssclient.c b/citadel/modules/rssclient/serv_rssclient.c
index 532ae7f99..0bb6c778d 100644
--- a/citadel/modules/rssclient/serv_rssclient.c
+++ b/citadel/modules/rssclient/serv_rssclient.c
@@ -458,7 +458,7 @@ void ExpandShortUrls(StrBuf *Message)
 	{
 		StrBuf *ShorterUrlStr;
 		HashPos *Pos;
-		const char *Key;
+		const char *RetrKey;
 		void *pv;
 		long len;
 
@@ -470,7 +470,7 @@ void ExpandShortUrls(StrBuf *Message)
 		pch = ChrPtr(Message);
 		pche = pch + StrLength(Message);
 		Pos = GetNewHashPos(pUrls, 1);
-		while (GetNextHashPos(pUrls, Pos, &len, &Key, &pv))
+		while (GetNextHashPos(pUrls, Pos, &len, &RetrKey, &pv))
 		{
 			pCUrl = (ConstStr*) pv;
 
diff --git a/webcit/tcp_sockets.c b/webcit/tcp_sockets.c
index 767c20a4c..b7ab06ba7 100644
--- a/webcit/tcp_sockets.c
+++ b/webcit/tcp_sockets.c
@@ -182,7 +182,7 @@ int StrBuf_ServGetln(StrBuf *buf)
 					       &ErrStr);
 	if (rc < 0)
 	{
-		syslog(1, "Server connection broken: %s\n",
+		syslog(1, "StrBuf_ServGetln(): Server connection broken: %s\n",
 			(ErrStr)?ErrStr:"");
 		wc_backtrace();
 		WCC->serv_sock = (-1);
@@ -217,7 +217,7 @@ int StrBuf_ServGetBLOBBuffered(StrBuf *buf, long BlobSize)
 				    &ErrStr);
 	if (rc < 0)
 	{
-		syslog(1, "Server connection broken: %s\n",
+		syslog(1, "StrBuf_ServGetBLOBBuffered(): Server connection broken: %s\n",
 			(ErrStr)?ErrStr:"");
 		wc_backtrace();
 		WCC->serv_sock = (-1);
@@ -242,7 +242,7 @@ int StrBuf_ServGetBLOB(StrBuf *buf, long BlobSize)
 	rc = StrBufReadBLOB(buf, &WCC->serv_sock, 1, BlobSize, &ErrStr);
 	if (rc < 0)
 	{
-		syslog(1, "Server connection broken: %s\n",
+		syslog(1, "StrBuf_ServGetBLOB(): Server connection broken: %s\n",
 			(ErrStr)?ErrStr:"");
 		wc_backtrace();
 		WCC->serv_sock = (-1);
@@ -310,7 +310,7 @@ void serv_write(const char *buf, int nbytes)
 			       nbytes - bytes_written);
 		if (retval < 1) {
 			const char *ErrStr = strerror(errno);
-			syslog(1, "Server connection broken: %s\n",
+			syslog(1, "serv_write(): Server connection broken: %s\n",
 				(ErrStr)?ErrStr:"");
 			close(WCC->serv_sock);
 			WCC->serv_sock = (-1);