cleanup includes

[citadel.git] / citadel / clientsocket.c

diff --git a/citadel/clientsocket.c b/citadel/clientsocket.c
index 594b5eb9664d969e8f8b2988e66a2909b9e99439..91485bedc88fce6f44f0336d4e25dd16a573ba9c 100644 (file)
--- a/citadel/clientsocket.c
+++ b/citadel/clientsocket.c
@@ -4,48 +4,21 @@
  * sockets for the Citadel client; for that you must look in ipc_c_tcp.c
  * (which, uncoincidentally, bears a striking similarity to this file).
  *
- * Copyright (c) 1987-2010 by the citadel.org team
+ * 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
- * (at your option) any later version.
+ * This program is open source software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License, version 3.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
- * 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
  */
 
-#include "sysdep.h"
-#include <stdlib.h>
-#include <unistd.h>
 #include <stdio.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <string.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
 #include <libcitadel.h>
-#include "citadel.h"
-#include "server.h"
-#ifndef HAVE_SNPRINTF
-#include "snprintf.h"
-#endif
-#include "sysdep_decls.h"
-#include "config.h"
-#include "clientsocket.h"
 #include "ctdl_module.h"
+#include "clientsocket.h"
 
 int sock_connect(char *host, char *service)
 {
@@ -85,7 +58,7 @@ int sock_connect(char *host, char *service)
 
        rc = getaddrinfo(host, service, &hints, &res);
        if (rc != 0) {
-               CtdlLogPrintf(CTDL_ERR, "%s: %s\n", host, gai_strerror(rc));
+               syslog(LOG_ERR, "%s: %s", host, gai_strerror(rc));
                return(-1);
        }
 
@@ -95,7 +68,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) {
-                       CtdlLogPrintf(CTDL_ERR, "socket() failed: %s\n", strerror(errno));
+                       syslog(LOG_ERR, "socket() failed: %s", strerror(errno));
                        freeaddrinfo(res);
                        return(-1);
                }
@@ -105,7 +78,7 @@ int sock_connect(char *host, char *service)
                        return(sock);
                }
                else {
-                       CtdlLogPrintf(CTDL_ERR, "connect() failed: %s\n", strerror(errno));
+                       syslog(LOG_ERR, "connect() failed: %s", strerror(errno));
                        close(sock);
                }
        }
@@ -136,12 +109,12 @@ int socket_read_blob(int *Socket, StrBuf * Target, int bytes, int timeout)
 
 
        retval = StrBufReadBLOBBuffered(Target,
-                                       CCC->sReadBuf,
-                                       &CCC->sPos,
+                                       CCC->SBuf.Buf,
+                                       &CCC->SBuf.ReadWritePointer,
                                        Socket, 1, bytes, O_TERM, &Error);
+       
        if (retval < 0) {
-               CtdlLogPrintf(CTDL_CRIT,
-                             "%s failed: %s\n", __FUNCTION__, Error);
+               syslog(LOG_CRIT, "socket_read_blob() failed: %s", Error);
        }
        return retval;
 }
@@ -155,12 +128,11 @@ int CtdlSockGetLine(int *sock, StrBuf * Target, int nSec)
 
        FlushStrBuf(Target);
        rc = StrBufTCP_read_buffered_line_fast(Target,
-                                              CCC->sReadBuf,
-                                              &CCC->sPos,
+                                              CCC->SBuf.Buf,
+                                              &CCC->SBuf.ReadWritePointer,
                                               sock, nSec, 1, &Error);
        if ((rc < 0) && (Error != NULL))
-               CtdlLogPrintf(CTDL_CRIT,
-                             "%s failed: %s\n", __FUNCTION__, Error);
+               syslog(LOG_CRIT, "CtdlSockGetLine() failed: %s", Error);
        return rc;
 }