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 532ae7f993b38f3f0c65b9d5769746d4182576a8..0bb6c778d1270fcd85d7e32e22181f254051f3bf 100644 (file)
--- 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 767c20a4ced602ba1473527704416423519dd85f..b7ab06ba7cdf9a6ef0edddac5ea40d2a93e1c9a2 100644 (file)
--- 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);