[Solidircd-CVS] solidircd-stable/src channel.c,1.10,1.11 dh.c,1.4,1.5 m_server.c,1.6,1.7 packet.c,1.1.1.1,1.2 probability.c,1.3,1.4 res.c,1.2,1.3 s_auth.c,1.1.1.1,1.2 s_bsd.c,1.6,1.7 s_conf.c,1.11,1.12 s_serv.c,1.14,1.15 send.c,1.5,1.6 zlink.c,1.4,1.5

[T.S. L. <try...@us...>]

Update of /cvsroot/solidircd/solidircd-stable/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27806/src

Modified Files:
	channel.c dh.c m_server.c packet.c probability.c res.c 
	s_auth.c s_bsd.c s_conf.c s_serv.c send.c zlink.c 
Log Message:
gcc4 warnings fixed

Index: dh.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/dh.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** dh.c	5 Jul 2005 21:53:41 -0000	1.4
--- dh.c	7 Jan 2006 22:13:26 -0000	1.5
***************
*** 260,264 ****
      si->session_shared_length = DH_size(si->dh);
      si->session_shared = (char *) malloc(DH_size(si->dh));
!     len = DH_compute_key(si->session_shared, tmp, si->dh);
      BN_free(tmp);
  
--- 260,264 ----
      si->session_shared_length = DH_size(si->dh);
      si->session_shared = (char *) malloc(DH_size(si->dh));
!     len = DH_compute_key((unsigned char *) si->session_shared, tmp, si->dh);
      BN_free(tmp);
  

Index: channel.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/channel.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** channel.c	4 Sep 2005 18:57:33 -0000	1.10
--- channel.c	7 Jan 2006 22:13:26 -0000	1.11
***************
*** 108,112 ****
          return 0;
  
!     for (c = msg; *c; c++)
      {
          /* not a control code */
--- 108,112 ----
          return 0;
  
!     for (c = (unsigned char *) msg; *c; c++)
      {
          /* not a control code */

Index: s_conf.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/s_conf.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** s_conf.c	26 Dec 2005 05:21:38 -0000	1.11
--- s_conf.c	7 Jan 2006 22:13:26 -0000	1.12
***************
*** 1310,1314 ****
              }
              /* validate server name, based on m_server() */
!             for (s = tmp->value; *s; s++)
              {
                  if (*s < ' ' || *s > '~')
--- 1310,1314 ----
              }
              /* validate server name, based on m_server() */
!             for (s = (unsigned char *) tmp->value; *s; s++)
              {
                  if (*s < ' ' || *s > '~')

Index: m_server.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/m_server.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** m_server.c	26 Dec 2005 05:21:38 -0000	1.6
--- m_server.c	7 Jan 2006 22:13:26 -0000	1.7
***************
*** 850,854 ****
                  return exit_client(sptr, sptr, sptr,
                                     "Could not setup encrypted session");
!             sptr->serv->rc4_in = rc4_initstate(keybuf, keylen);
  
              keylen = 1024;
--- 850,854 ----
                  return exit_client(sptr, sptr, sptr,
                                     "Could not setup encrypted session");
!             sptr->serv->rc4_in = rc4_initstate((unsigned char *) keybuf, keylen);
  
              keylen = 1024;
***************
*** 856,860 ****
                  return exit_client(sptr, sptr, sptr,
                                     "Could not setup encrypted session");
!             sptr->serv->rc4_out = rc4_initstate(keybuf, keylen);
  
              dh_end_session(sptr->serv->sessioninfo_in);
--- 856,860 ----
                  return exit_client(sptr, sptr, sptr,
                                     "Could not setup encrypted session");
!             sptr->serv->rc4_out = rc4_initstate((unsigned char *) keybuf, keylen);
  
              dh_end_session(sptr->serv->sessioninfo_in);

Index: s_serv.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/s_serv.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** s_serv.c	26 Dec 2005 05:21:38 -0000	1.14
--- s_serv.c	7 Jan 2006 22:13:26 -0000	1.15
***************
*** 71,76 ****
--- 71,78 ----
  /* Local function prototypes */
  
+ #if 0
  static int  isnumber(char *);   /* return 0 if not, else return number */
  static char *cluster(char *);
+ #endif
  
  int         send_motd(aClient *, aClient *, int, char **);
***************
*** 1913,1916 ****
--- 1915,1919 ----
   */
  
+ #if 0
  static char *cluster(char *hostname)
  {
***************
*** 2012,2016 ****
  }
  
- #if 0
  int m_kline(aClient *cptr, aClient *sptr, int parc, char *parv[])
  {
--- 2015,2018 ----
***************
*** 2356,2360 ****
   * (if someone types in maxint, oh well..) - lucas
   */
! 
  static int isnumber(char *p)
  {
--- 2358,2362 ----
   * (if someone types in maxint, oh well..) - lucas
   */
! #if 0
  static int isnumber(char *p)
  {
***************
*** 2391,2394 ****
--- 2393,2397 ----
      return (result);
  }
+ #endif
  
  #if 0

Index: send.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/send.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** send.c	30 Dec 2005 21:29:28 -0000	1.5
--- send.c	7 Jan 2006 22:13:26 -0000	1.6
***************
*** 230,234 ****
      {
          /* don't destroy the data in 'msg' */
!         rc4_process_stream_to_buf(to->serv->rc4_out, msg, rc4buf, len);
          msg = rc4buf;
      }
--- 230,234 ----
      {
          /* don't destroy the data in 'msg' */
!         rc4_process_stream_to_buf(to->serv->rc4_out, (const unsigned char *) msg, (unsigned char *) rc4buf, len);
          msg = rc4buf;
      }
***************
*** 334,338 ****
  #ifdef HAVE_ENCRYPTION_ON
              if(IsRC4OUT(to))
!                 rc4_process_stream(to->serv->rc4_out, msg, len);
  #endif
              /* silently stick this on the sendq... */
--- 334,338 ----
  #ifdef HAVE_ENCRYPTION_ON
              if(IsRC4OUT(to))
!                 rc4_process_stream(to->serv->rc4_out, (unsigned char *) msg, len);
  #endif
              /* silently stick this on the sendq... */
***************
*** 386,390 ****
  #ifdef HAVE_ENCRYPTION_ON
              if(IsRC4OUT(to))
!                 rc4_process_stream(to->serv->rc4_out, msg, len);
  #endif
              /* silently stick this on the sendq... */
--- 386,390 ----
  #ifdef HAVE_ENCRYPTION_ON
              if(IsRC4OUT(to))
!                 rc4_process_stream(to->serv->rc4_out, (unsigned char *) msg, len);
  #endif
              /* silently stick this on the sendq... */

Index: res.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/res.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** res.c	5 Jul 2005 02:40:02 -0000	1.2
--- res.c	7 Jan 2006 22:13:26 -0000	1.3
***************
*** 1100,1104 ****
      aCache     *cp = (aCache *) NULL;
      struct sockaddr_in sin;
!     int         rc, a, len = sizeof(sin), max;
      
      rc = recvfrom(resfd, buf, sizeof(buf), 0, (struct sockaddr *) &sin, &len);
--- 1100,1105 ----
      aCache     *cp = (aCache *) NULL;
      struct sockaddr_in sin;
!     int         rc, a, max;
!     socklen_t len = sizeof(sin);
      
      rc = recvfrom(resfd, buf, sizeof(buf), 0, (struct sockaddr *) &sin, &len);

Index: probability.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/probability.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** probability.c	5 Jul 2005 03:17:53 -0000	1.3
--- probability.c	7 Jan 2006 22:13:26 -0000	1.4
***************
*** 285,289 ****
              continue;
  
!         i = navgfunc(ac->name, PCS_NICK);
          if (i >= 0)
          {
--- 285,289 ----
              continue;
  
!         i = navgfunc((unsigned char *) ac->name, PCS_NICK);
          if (i >= 0)
          {
***************
*** 294,298 ****
          }
  
!         i = uavgfunc(ac->user->username, PCS_USER);
          if (i >= 0)
          {
--- 294,298 ----
          }
  
!         i = uavgfunc((unsigned char *) ac->user->username, PCS_USER);
          if (i >= 0)
          {
***************
*** 303,307 ****
          }
  
!         i = gavgfunc(ac->info, PCS_GCOS);
          if (i >= 0)
          {
--- 303,307 ----
          }
  
!         i = gavgfunc((unsigned char *) ac->info, PCS_GCOS);
          if (i >= 0)
          {
***************
*** 477,487 ****
      int p;
  
!     p = navgfunc(ac->name, PCS_NICK);
      *np = (p < 0 ? navg : p) * nscale;
  
!     p = uavgfunc(ac->user->username, PCS_USER);
      *up = (p < 0 ? uavg : p) * uscale;
  
!     p = gavgfunc(ac->info, PCS_GCOS);
      *gp = (p < 0 ? gavg : p) * gscale;
  }
--- 477,487 ----
      int p;
  
!     p = navgfunc((unsigned char *) ac->name, PCS_NICK);
      *np = (p < 0 ? navg : p) * nscale;
  
!     p = uavgfunc((unsigned char *) ac->user->username, PCS_USER);
      *up = (p < 0 ? uavg : p) * uscale;
  
!     p = gavgfunc((unsigned char *) ac->info, PCS_GCOS);
      *gp = (p < 0 ? gavg : p) * gscale;
  }

Index: s_auth.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/s_auth.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** s_auth.c	27 Jun 2005 03:02:10 -0000	1.1.1.1
--- s_auth.c	7 Jan 2006 22:13:26 -0000	1.2
***************
*** 55,59 ****
      struct sockaddr_in sock;
      struct sockaddr_in localaddr;
!     int         locallen;
  
      Debug((DEBUG_NOTICE, "start_auth(%x) fd %d status %d",
--- 55,59 ----
      struct sockaddr_in sock;
      struct sockaddr_in localaddr;
!     socklen_t locallen;
  
      Debug((DEBUG_NOTICE, "start_auth(%x) fd %d status %d",
***************
*** 65,70 ****
  	       get_client_name(cptr, TRUE));
  #endif
! 	ircstp->is_abad++;
! 	return;
      }
      if (cptr->authfd >= MAXCONNECTIONS)
--- 65,70 ----
  	       get_client_name(cptr, TRUE));
  #endif
! 	    ircstp->is_abad++;
! 	    return;
      }
      if (cptr->authfd >= MAXCONNECTIONS)
***************
*** 142,146 ****
      struct sockaddr_in us, them;
      char        authbuf[32];
!     int         ulen, tlen;
  
      Debug((DEBUG_NOTICE, "write_authports(%x) fd %d authfd %d stat %d",
--- 142,146 ----
      struct sockaddr_in us, them;
      char        authbuf[32];
!     socklen_t   ulen, tlen;
  
      Debug((DEBUG_NOTICE, "write_authports(%x) fd %d authfd %d stat %d",

Index: packet.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/packet.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** packet.c	27 Jun 2005 03:02:33 -0000	1.1.1.1
--- packet.c	7 Jan 2006 22:13:26 -0000	1.2
***************
*** 52,56 ****
  #ifdef HAVE_ENCRYPTION_ON
      if(IsRC4IN(cptr))
! 	rc4_process_stream(cptr->serv->rc4_in, buffer, length);
  #endif
      
--- 52,56 ----
  #ifdef HAVE_ENCRYPTION_ON
      if(IsRC4IN(cptr))
! 	rc4_process_stream(cptr->serv->rc4_in, (unsigned char *) buffer, length);
  #endif
      
***************
*** 146,150 ****
  	    case RC4_NEXT_BUFFER:
  		if(length)
! 		    rc4_process_stream(cptr->serv->rc4_in, ch2, length);
  		break;
  #endif
--- 146,150 ----
  	    case RC4_NEXT_BUFFER:
  		if(length)
! 		    rc4_process_stream(cptr->serv->rc4_in, (unsigned char *) ch2, length);
  		break;
  #endif

Index: zlink.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/zlink.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** zlink.c	9 Jul 2005 20:18:50 -0000	1.4
--- zlink.c	7 Jan 2006 22:13:26 -0000	1.5
***************
*** 138,144 ****
      *err = 0;
  
!     zin->next_in = buffer;
      zin->avail_in = *len;
!     zin->next_out = zipInBuf;
      zin->avail_out = zipInBufSize;   
  
--- 138,144 ----
      *err = 0;
  
!     zin->next_in = (Bytef *) buffer;
      zin->avail_in = *len;
!     zin->next_out = (Bytef *) zipInBuf;
      zin->avail_out = zipInBufSize;   
  
***************
*** 155,159 ****
  		return zin->msg ? zin->msg : "????";
  	    }
! 	    *nbuf = zin->next_in;
  	    *nbuflen = zin->avail_in;
  	    *len = zipInBufSize - zin->avail_out;
--- 155,159 ----
  		return zin->msg ? zin->msg : "????";
  	    }
! 	    *nbuf = (char *) zin->next_in;
  	    *nbuflen = zin->avail_in;
  	    *len = zipInBufSize - zin->avail_out;
***************
*** 212,218 ****
      }
      
!     zout->next_in = z->buf;
      zout->avail_in = z->bufsize;
!     zout->next_out = zipOutBuf;
      zout->avail_out = zipOutBufSize;
     
--- 212,218 ----
      }
      
!     zout->next_in = (Bytef *) z->buf;
      zout->avail_in = z->bufsize;
!     zout->next_out = (Bytef *) zipOutBuf;
      zout->avail_out = zipOutBufSize;
     

Index: s_bsd.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/s_bsd.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** s_bsd.c	1 Jan 2006 00:55:22 -0000	1.6
--- s_bsd.c	7 Jan 2006 22:13:26 -0000	1.7
***************
*** 177,181 ****
      int errtmp = errno;     /* debug may change 'errno' */
      char *host;
!     int err, len = sizeof(err);
      extern char *strerror();
  
--- 177,182 ----
      int errtmp = errno;     /* debug may change 'errno' */
      char *host;
!     int err;
!     socklen_t len = sizeof(err);
      extern char *strerror();
  
***************
*** 212,216 ****
      int errtmp = errno;          /* debug may change 'errno' */
      char *host;
!     int err, len = sizeof(err);
      extern char *strerror();
  
--- 213,218 ----
      int errtmp = errno;          /* debug may change 'errno' */
      char *host;
!     int err;
!     socklen_t len = sizeof(err);
      extern char *strerror();
  
***************
*** 274,278 ****
      aListener lstn;
      struct sockaddr_in server;
!     int ad[4], len = sizeof(server);
      char ipname[20];
  
--- 276,281 ----
      aListener lstn;
      struct sockaddr_in server;
!     int ad[4];
!     socklen_t len = sizeof(server);
      char ipname[20];
  
***************
*** 571,575 ****
  {
      struct sockaddr_in sk;
!     int len = sizeof(struct sockaddr_in);
  
      /* If descriptor is a tty, special checking... * IT can't EVER be a tty */
--- 574,578 ----
  {
      struct sockaddr_in sk;
!     socklen_t len = sizeof(struct sockaddr_in);
  
      /* If descriptor is a tty, special checking... * IT can't EVER be a tty */
***************
*** 965,969 ****
  static void set_sock_opts(int fd, aClient * cptr)
  {
!     int opt;
      
  #ifdef SO_REUSEADDR
--- 968,972 ----
  static void set_sock_opts(int fd, aClient * cptr)
  {
!     socklen_t opt;
      
  #ifdef SO_REUSEADDR
***************
*** 991,995 ****
      if (rcvbufmax == 0)
      {
!         int optlen;
  
          optlen = sizeof(rcvbufmax);
--- 994,998 ----
      if (rcvbufmax == 0)
      {
!         socklen_t optlen;
  
          optlen = sizeof(rcvbufmax);
***************
*** 1015,1019 ****
      if (sndbufmax == 0)
      {
!         int optlen;
      
          optlen = sizeof(sndbufmax);
--- 1018,1022 ----
      if (sndbufmax == 0)
      {
!         socklen_t optlen;
      
          optlen = sizeof(sndbufmax);
***************
*** 1090,1094 ****
      if (rcvbufmax == 0) 
      {
!         int optlen;
  
          optlen = sizeof(rcvbufmax);
--- 1093,1097 ----
      if (rcvbufmax == 0) 
      {
!         socklen_t optlen;
  
          optlen = sizeof(rcvbufmax);
***************
*** 1111,1115 ****
      if (sndbufmax == 0) 
      {
!         int optlen;
  
          optlen = sizeof(sndbufmax);
--- 1114,1118 ----
      if (sndbufmax == 0) 
      {
!         socklen_t optlen;
  
          optlen = sizeof(sndbufmax);
***************
*** 1132,1136 ****
  int get_sockerr(aClient * cptr)
  {
!     int errtmp = errno, err = 0, len = sizeof(err);
      
  #ifdef  SO_ERROR
--- 1135,1140 ----
  int get_sockerr(aClient * cptr)
  {
!     int errtmp = errno, err = 0;
!     socklen_t len = sizeof(err);
      
  #ifdef  SO_ERROR
***************
*** 1208,1212 ****
      char *s, *t;
      struct sockaddr_in addr;
!     int len = sizeof(struct sockaddr_in);
      struct userBan *ban;
      
--- 1212,1216 ----
      char *s, *t;
      struct sockaddr_in addr;
!     socklen_t len = sizeof(struct sockaddr_in);
      struct userBan *ban;
      
***************
*** 1580,1584 ****
  {
      static struct sockaddr_in addr;
!     int addrlen = sizeof(struct sockaddr_in);
      char host[HOSTLEN + 2];
      int newfd;
--- 1584,1588 ----
  {
      static struct sockaddr_in addr;
!     socklen_t addrlen = sizeof(struct sockaddr_in);
      char host[HOSTLEN + 2];
      int newfd;