From dd711f8cde9b89c23b19a4c5455b9bfe61975091 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Mon, 10 Nov 2008 17:03:57 +0000 Subject: [PATCH] Fix a gcc44 warning and remove a now-obsolete cast. --- jbsockets.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/jbsockets.c b/jbsockets.c index d601fb2d..0693fe49 100644 --- a/jbsockets.c +++ b/jbsockets.c @@ -1,4 +1,4 @@ -const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.47 2008/03/26 18:07:07 fabiankeil Exp $"; +const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.48 2008/09/04 08:13:58 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/jbsockets.c,v $ @@ -35,6 +35,10 @@ const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.47 2008/03/26 18:07:07 fabian * * Revisions : * $Log: jbsockets.c,v $ + * Revision 1.48 2008/09/04 08:13:58 fabiankeil + * Prepare for critical sections on Windows by adding a + * layer of indirection before the pthread mutex functions. + * * Revision 1.47 2008/03/26 18:07:07 fabiankeil * Add hostname directive. Closes PR#1918189. * @@ -335,7 +339,7 @@ const char jbsockets_h_rcs[] = JBSOCKETS_H_VERSION; * * Parameters : * 1 : host = hostname to connect to - * 2 : portnum = port to connent on + * 2 : portnum = port to connent on (XXX: should be unsigned) * 3 : csp = Current client state (buffers, headers, etc...) * Not modified, only used for source IP and ACL. * @@ -347,7 +351,7 @@ jb_socket connect_to(const char *host, int portnum, struct client_state *csp) { struct sockaddr_in inaddr; jb_socket fd; - int addr; + unsigned int addr; fd_set wfds; struct timeval tv[1]; #if !defined(_WIN32) && !defined(__BEOS__) && !defined(AMIGA) @@ -367,7 +371,7 @@ jb_socket connect_to(const char *host, int portnum, struct client_state *csp) } #ifdef FEATURE_ACL - dst->addr = ntohl((unsigned long) addr); + dst->addr = ntohl(addr); dst->port = portnum; if (block_acl(dst, csp)) -- 2.39.2