X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fsysdep.c;h=afcde00696e20a26940f9afb58e89248ddcd9771;hb=6f22e06d1c771f2c5ceca1362300c8309d618065;hp=6c721e206e6301ee7f15803b504d964face30207;hpb=a78724d8ec8701a801eec79a6f70a829602d26b7;p=citadel.git

diff --git a/citadel/sysdep.c b/citadel/sysdep.c
index 6c721e206..afcde0069 100644
--- a/citadel/sysdep.c
+++ b/citadel/sysdep.c
@@ -583,7 +583,7 @@ int client_read_blob(StrBuf *Target, int bytes, int timeout)
 #endif
 		retval = client_read_sslblob(Target, bytes, timeout);
 		if (retval < 0) {
-			syslog(LOG_CRIT, "%s failed", __FUNCTION__);
+			syslog(LOG_CRIT, "client_read_blob() failed");
 		}
 #ifdef BIGBAD_IODBG
 		snprintf(fn, SIZ, "/tmp/foolog_%s.%d", CCC->ServiceName, CCC->cs_pid);
@@ -626,7 +626,7 @@ int client_read_blob(StrBuf *Target, int bytes, int timeout)
 						O_TERM,
 						&Error);
 		if (retval < 0) {
-			syslog(LOG_CRIT, "%s failed: %s\n", __FUNCTION__, Error);
+			syslog(LOG_CRIT, "client_read_blob() failed: %s", Error);
 			client_close();
 			return retval;
 		}
@@ -806,10 +806,9 @@ int CtdlClientGetLine(StrBuf *Target)
                         StrLength(Target), ChrPtr(Target));
                 fclose(fd);
 
-		if (rc < 0)
-			syslog(LOG_CRIT, 
-				      "%s failed\n",
-				      __FUNCTION__);
+		if (rc < 0) {
+			syslog(LOG_CRIT, "CtdlClientGetLine() failed");
+		}
 #endif
 		return rc;
 	}
@@ -864,11 +863,9 @@ int CtdlClientGetLine(StrBuf *Target)
                         StrLength(Target), ChrPtr(Target));
                 fclose(fd);
 
-		if ((rc < 0) && (Error != NULL))
-			syslog(LOG_CRIT, 
-				      "%s failed: %s\n",
-				      __FUNCTION__,
-				      Error);
+		if ((rc < 0) && (Error != NULL)) {
+			syslog(LOG_CRIT, "CtdlClientGetLine() failed: %s", Error);
+		}
 #endif
 		return rc;
 	}
@@ -1329,7 +1326,6 @@ void *select_on_master(void *blah)
 	int m;
 	int i;
 	int retval;
-	struct CitContext select_on_master_CC;
 
 	CtdlFillSystemContext(&select_on_master_CC, "select_on_master");
 	pthread_setspecific(MyConKey, (void *)&select_on_master_CC);