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

diff --git a/citadel/clientsocket.c b/citadel/clientsocket.c
index e4044d630..a4b521864 100644
--- a/citadel/clientsocket.c
+++ b/citadel/clientsocket.c
@@ -6,9 +6,9 @@
  *
  * Copyright (c) 1987-2011 by the citadel.org team
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
+ * This program is open source software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -18,7 +18,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
 #include "sysdep.h"
@@ -86,7 +86,7 @@ int sock_connect(char *host, char *service)
 
 	rc = getaddrinfo(host, service, &hints, &res);
 	if (rc != 0) {
-		syslog(LOG_ERR, "%s: %s\n", host, gai_strerror(rc));
+		syslog(LOG_ERR, "%s: %s", host, gai_strerror(rc));
 		return(-1);
 	}
 
@@ -96,7 +96,7 @@ int sock_connect(char *host, char *service)
 	for (ai = res; ai != NULL; ai = ai->ai_next) {
 		sock = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
 		if (sock < 0) {
-			syslog(LOG_ERR, "socket() failed: %s\n", strerror(errno));
+			syslog(LOG_ERR, "socket() failed: %s", strerror(errno));
 			freeaddrinfo(res);
 			return(-1);
 		}
@@ -106,7 +106,7 @@ int sock_connect(char *host, char *service)
 			return(sock);
 		}
 		else {
-			syslog(LOG_ERR, "connect() failed: %s\n", strerror(errno));
+			syslog(LOG_ERR, "connect() failed: %s", strerror(errno));
 			close(sock);
 		}
 	}
@@ -140,9 +140,9 @@ int socket_read_blob(int *Socket, StrBuf * Target, int bytes, int timeout)
 					CCC->SBuf.Buf,
 					&CCC->SBuf.ReadWritePointer,
 					Socket, 1, bytes, O_TERM, &Error);
+	
 	if (retval < 0) {
-		syslog(LOG_CRIT,
-			      "%s failed: %s\n", __FUNCTION__, Error);
+		syslog(LOG_CRIT, "socket_read_blob() failed: %s", Error);
 	}
 	return retval;
 }
@@ -160,8 +160,7 @@ int CtdlSockGetLine(int *sock, StrBuf * Target, int nSec)
 					       &CCC->SBuf.ReadWritePointer,
 					       sock, nSec, 1, &Error);
 	if ((rc < 0) && (Error != NULL))
-		syslog(LOG_CRIT,
-			      "%s failed: %s\n", __FUNCTION__, Error);
+		syslog(LOG_CRIT, "CtdlSockGetLine() failed: %s", Error);
 	return rc;
 }