Did away with lprintf all together now its called CtdlLogPrintf()

[citadel.git] / citadel / clientsocket.c

diff --git a/citadel/clientsocket.c b/citadel/clientsocket.c
index 1d65e2ca8bf58084b23d3d03a8c5cb2b167a8c95..08e72a20ff9964ab24ee150059c2a6d22dc6cbab 100644 (file)
--- a/citadel/clientsocket.c
+++ b/citadel/clientsocket.c
@@ -60,7 +60,7 @@ int sock_connect(char *host, char *service, char *protocol)
        if (pse) {
                sin.sin_port = pse->s_port;
        } else if ((sin.sin_port = htons((u_short) atoi(service))) == 0) {
-               lprintf(CTDL_CRIT, "Can't get %s service entry: %s\n",
+               CtdlLogPrintf(CTDL_CRIT, "Can't get %s service entry: %s\n",
                        service, strerror(errno));
                return(-1);
        }
@@ -68,12 +68,12 @@ int sock_connect(char *host, char *service, char *protocol)
        if (phe) {
                memcpy(&sin.sin_addr, phe->h_addr, phe->h_length);
        } else if ((sin.sin_addr.s_addr = inet_addr(host)) == INADDR_NONE) {
-               lprintf(CTDL_ERR, "Can't get %s host entry: %s\n",
+               CtdlLogPrintf(CTDL_ERR, "Can't get %s host entry: %s\n",
                        host, strerror(errno));
                return(-1);
        }
        if ((ppe = getprotobyname(protocol)) == 0) {
-               lprintf(CTDL_CRIT, "Can't get %s protocol entry: %s\n",
+               CtdlLogPrintf(CTDL_CRIT, "Can't get %s protocol entry: %s\n",
                        protocol, strerror(errno));
                return(-1);
        }
@@ -85,7 +85,7 @@ int sock_connect(char *host, char *service, char *protocol)
 
        s = socket(PF_INET, type, ppe->p_proto);
        if (s < 0) {
-               lprintf(CTDL_CRIT, "Can't create socket: %s\n", strerror(errno));
+               CtdlLogPrintf(CTDL_CRIT, "Can't create socket: %s\n", strerror(errno));
                return(-1);
        }
 
@@ -106,7 +106,7 @@ int sock_connect(char *host, char *service, char *protocol)
 
        /* Now try to connect to the remote host. */
        if (connect(s, (struct sockaddr *) &sin, sizeof(sin)) < 0) {
-               lprintf(CTDL_ERR, "Can't connect to %s:%s: %s\n",
+               CtdlLogPrintf(CTDL_ERR, "Can't connect to %s:%s: %s\n",
                        host, service, strerror(errno));
                close(s);
                return(-1);
@@ -139,13 +139,13 @@ int sock_read_to(int sock, char *buf, int bytes, int timeout, int keep_reading_u
                retval = select(sock+1, &rfds, NULL, NULL, &tv);
 
                if (FD_ISSET(sock, &rfds) == 0) {       /* timed out */
-                       lprintf(CTDL_ERR, "sock_read() timed out.\n");
+                       CtdlLogPrintf(CTDL_ERR, "sock_read() timed out.\n");
                        return(-1);
                }
 
                rlen = read(sock, &buf[len], bytes-len);
                if (rlen<1) {
-                       lprintf(CTDL_ERR, "sock_read() failed: %s\n",
+                       CtdlLogPrintf(CTDL_ERR, "sock_read() failed: %s\n",
                                strerror(errno));
                        return(-1);
                }