* Cleaned up several compiler errors (-W)

* Changed many signed ints to unsigned, etc...


svn: 913

Makefile.in

@@ -36,7 +36,7 @@ STRIP = @STRIP@
 LIBS = @LIBS@ @ZLIB@ @RESLIB@
 
 DEBCFLAGS = -DDEBUG_ASSERT -DDEBUG_MEM -g3 -ggdb3
-CFLGS = -fno-strict-aliasing -Wno-format-y2k
+CFLGS = -fno-strict-aliasing -Wno-format-y2k -W -Wno-unused-parameter
 #-Wuninitialized -W -Wnested-externs -Wdisabled-optimization -Winline
 #-Wpadded -Wshadow -finline-functions
 MAKEFLAGS = -s -j4

src/botnet.c

@@ -1533,6 +1533,7 @@ struct dcc_table DCC_RELAY =
   NULL,
   display_relay,
   kill_relay,
+  NULL,
   NULL
 };
 
@@ -1556,7 +1557,8 @@ struct dcc_table DCC_RELAYING =
   NULL,
   display_relaying,
   kill_relay,
-  out_relay
+  out_relay,
+  NULL
 };
 
 struct dcc_table DCC_FORK_RELAY =
@@ -1569,6 +1571,7 @@ struct dcc_table DCC_FORK_RELAY =
   failed_tandem_relay,
   display_tandem_relay,
   kill_relay,
+  NULL,
   NULL
 };
 
@@ -1582,6 +1585,7 @@ struct dcc_table DCC_PRE_RELAY =
   NULL,
   display_pre_relay,
   kill_relay,
+  NULL,
   NULL
 };
 

src/cmds.c

@@ -1421,7 +1421,7 @@ static void cmd_chhandle(struct userrec *u, int idx, char *par)
 static void cmd_handle(struct userrec *u, int idx, char *par)
 {
   char oldhandle[HANDLEN + 1] = "", newhandle[HANDLEN + 1] = "";
-  int i;
+  size_t i;
 
   strncpy(newhandle, newsplit(&par), sizeof newhandle);
 
@@ -2141,7 +2141,7 @@ static void cmd_trace(struct userrec *u, int idx, char *par)
 /* After messing with someone's user flags, make sure the dcc-chat flags
  * are set correctly.
  */
-int check_dcc_attrs(struct userrec *u, int oatr)
+int check_dcc_attrs(struct userrec *u, flag_t oatr)
 {
   int i, stat;
  
@@ -2255,7 +2255,7 @@ int check_dcc_attrs(struct userrec *u, int oatr)
   return u->flags;
 }
 
-int check_dcc_chanattrs(struct userrec *u, char *chname, int chflags, int ochatr)
+int check_dcc_chanattrs(struct userrec *u, char *chname, flag_t chflags, flag_t ochatr)
 {
   int i, found = 0, atr = u ? u->flags : 0;
   struct chanset_t *chan = NULL;
@@ -2323,7 +2323,8 @@ static void cmd_chattr(struct userrec *u, int idx, char *par)
   		     mns = {0, 0, 0, 0},
 		     user = {0, 0, 0, 0},
 		     ouser = {0, 0, 0, 0};
-  int fl = -1, of = 0, ocf = 0;
+  /*int fl = -1, of = 0, ocf = 0;*/
+  flag_t fl = 0, of = 0, ocf = 0;
 
   if (!par[0]) {
     dprintf(idx, "Usage: chattr <handle> [changes] [channel]\n");
@@ -2403,8 +2404,9 @@ static void cmd_chattr(struct userrec *u, int idx, char *par)
         free(tmpchg);
       return;
     }
-
+/* FIXME: POSSIBLY WRONG BECAUSE OF SIGNNES CHANGE OF fl */
   user.match &= fl;
+
   if (chg) {
     pls.match = user.match;
     break_down_flags(chg, &pls, &mns);

src/cmds.h

@@ -32,8 +32,8 @@ typedef struct cmd_pass {
 extern mycmds 		cmdlist[]; 
 extern int		cmdi;
 
-int check_dcc_attrs(struct userrec *, int);
-int check_dcc_chanattrs(struct userrec *, char *, int, int);
+int check_dcc_attrs(struct userrec *, flag_t);
+int check_dcc_chanattrs(struct userrec *, char *, flag_t, flag_t);
 int stripmodes(char *);
 char *stripmasktype(int);
 void gotremotecmd(char * forbot, char * frombot, char * fromhand, char * fromidx, char * cmd);

src/compat/dirname.c

@@ -6,8 +6,8 @@
 char *
 dirname(const char *path)
 {
-        static char bname[MAXPATHLEN];
-        register const char *endp;
+        static char bname[MAXPATHLEN] = "";
+        register const char *endp = NULL;
 
         /* Empty or NULL string gets treated as "." */
         if (path == NULL || *path == '\0') {

src/dcc.c

@@ -466,6 +466,7 @@ struct dcc_table DCC_BOT_NEW =
   timeout_dcc_bot_new,
   display_dcc_bot_new,
   free_dcc_bot_,
+  NULL,
   NULL
 };
 /* Hash function for tandem bot commands */
@@ -986,7 +987,8 @@ struct dcc_table DCC_CHAT_SECPASS =
   tout_dcc_chat_secpass,
   display_dcc_chat_secpass,
   kill_dcc_general,
-  out_dcc_general
+  out_dcc_general,
+  NULL
 };
 
 struct dcc_table DCC_CHAT_PASS =
@@ -999,7 +1001,8 @@ struct dcc_table DCC_CHAT_PASS =
   tout_dcc_chat_pass,
   display_dcc_chat_pass,
   kill_dcc_general,
-  out_dcc_general
+  out_dcc_general,
+  NULL
 };
 
 
@@ -1183,7 +1186,8 @@ struct dcc_table DCC_CHAT =
   NULL,
   display_dcc_chat,
   kill_dcc_general,
-  out_dcc_general
+  out_dcc_general,
+  NULL
 };
 
 static int lasttelnets;
@@ -1452,6 +1456,7 @@ struct dcc_table DCC_DUPWAIT =
   timeout_dupwait,
   display_dupwait,
   kill_dupwait,
+  NULL,
   NULL
 };
 
@@ -1675,7 +1680,8 @@ struct dcc_table DCC_TELNET_ID =
   timeout_dcc_telnet_id,
   display_dcc_telnet_id,
   kill_dcc_general,
-  out_dcc_general
+  out_dcc_general,
+  NULL
 };
 
 static void dcc_socket(int idx, char *buf, int len)

src/dcc.h

@@ -85,17 +85,17 @@ struct xfer_info {
   char *filename;
   char *origname;
   char dir[DIRLEN];             /* used when uploads go to the current dir */
-  unsigned long length;
-  unsigned long acked;
+  long unsigned int length;
+  long unsigned int acked;
   char buf[4];                  /* you only need 5 bytes!                  */
   unsigned char sofar;          /* how much of the byte count received     */
   char from[NICKLEN];           /* [GET] user who offered the file         */
   FILE *f;                      /* pointer to file being sent/received     */
   unsigned int type;            /* xfer connection type, see enum below    */
   unsigned short ack_type;      /* type of ack                             */
-  unsigned long offset;         /* offset from beginning of file, during
+  long unsigned int offset;     /* offset from beginning of file, during
                                    resend.                                 */
-  unsigned long block_pending;  /* bytes of this DCC block which weren't
+  long unsigned int block_pending;  	/* bytes of this DCC block which weren't
                                    sent yet.                               */
   time_t start_time;            /* Time when a xfer was started.           */
 };
@@ -106,14 +106,14 @@ struct bot_info {
   char linker[NOTENAMELEN + 1]; /* who requested this link              */
   int  numver;
   char sysname[121];
-  int  port;                    /* base port                            */
+  unsigned int port;            /* base port                            */
   int  uff_flags;               /* user file feature flags              */
 };
 
 struct relay_info {
   struct chat_info *chat;
   int sock;
-  int port;
+  unsigned int port;
   int old_status;
 };
 

src/dccutil.c

@@ -359,7 +359,7 @@ void tell_dcc(int idx)
 
   /* calculate max nicklen */
   for (i = 0; i < dcc_total; i++) {
-      if(strlen(dcc[i].nick) > nicklen)
+      if(strlen(dcc[i].nick) > (unsigned) nicklen)
           nicklen = strlen(dcc[i].nick);
   }
   if(nicklen < 9) nicklen = 9;
@@ -369,7 +369,7 @@ void tell_dcc(int idx)
   dprintf(idx, format, "----", "---", "--------", "-----", "---------", 
                         "----------------------------------------", "----");
 
-  egg_snprintf(format, sizeof format, "%%-4d %%-4d %%08X %%5d %%-%us %%-40s %%s\n", nicklen);
+  egg_snprintf(format, sizeof format, "%%-4d %%-4d %%08X %%5ud %%-%us %%-40s %%s\n", nicklen);
 
   for (i = 0; i < dcc_total; i++) {
     j = strlen(dcc[i].host);
@@ -569,7 +569,8 @@ void do_boot(int idx, char *by, char *reason)
 
 int listen_all(int lport, int off)
 {
-  int i, idx = (-1), port, realport;
+  int i, idx = (-1);
+  unsigned int port, realport;
 #ifdef USE_IPV6
   int i6 = 0;
 #endif /* USE_IPV6 */

src/dccutil.h

@@ -8,8 +8,8 @@
 
 /* Public structure for the listening port map */
 struct portmap {
-  int realport;
-  int mappedto;
+  unsigned int realport;
+  unsigned int mappedto;
   struct portmap *next;
 };
 

src/dns.c

@@ -64,11 +64,12 @@ struct dcc_table DCC_DNSWAIT =
   DCT_VALIDIDX,
   eof_dcc_dnswait,
   dcc_dnswait,
-  0,
-  0,
+  NULL,
+  NULL,
   display_dcc_dnswait,
   kill_dcc_dnswait,
-  0
+  NULL,
+  NULL
 };
 
 

src/flags.c

@@ -18,7 +18,7 @@ static int                     allow_dk_cmds = 1;
 
 /* Some flags are mutually exclusive -- this roots them out
  */
-int sanity_check(int atr)
+int sanity_check(flag_t atr)
 {
 /* bots shouldnt have +pmcnaijlys */
   if ((atr & USER_BOT) &&

src/flags.h

@@ -13,12 +13,14 @@
 #define PRIV_VOICE 2
 
 
+typedef unsigned long flag_t;
+
 struct flag_record {
-  int match;
-  int global;
+  flag_t match;
+  flag_t global;
 /* FIXME: ALSO MAKE THESE LONG */
-  int bot;
-  int chan;
+  flag_t  bot;
+  flag_t chan;
 };
 
 #define FR_GLOBAL 0x00000001
@@ -186,7 +188,7 @@ void break_down_flags(const char *, struct flag_record *, struct flag_record *);
 int build_flags(char *, struct flag_record *, struct flag_record *);
 int flagrec_eq(struct flag_record *, struct flag_record *);
 int flagrec_ok(struct flag_record *, struct flag_record *);
-int sanity_check(int);
+int sanity_check(flag_t);
 int chan_sanity_check(int, int);
 char geticon(int);
 

src/log.c

@@ -50,7 +50,7 @@ static logmode_mapping_t logmode_mappings[] = {
 	{LOG_ERRORS, 'e', "errors"},
 	{LOG_GETIN, 'g', "getin"},
 	{LOG_WARN, 'u', "warnings"},
-	{0}
+	{0, 0, NULL}
 };
 #define LOG_LEVELS 18 		/* change this if you change the levels */
 

src/makehelp.c

@@ -179,7 +179,7 @@ help_t help[] = \n\
           } else
             fprintf(out, "  {2, \"%s\", 0, \"", cmd);
         } else {			/* END */
-          fprintf(out, "  {0, NULL}\n};\n");
+          fprintf(out, "  {0, NULL, 0, NULL}\n};\n");
         }
       } else {				/* CMD HELP INFO */
         fprintf(out, "%s\\n", replace(buffer, "\"", "\\\""));

src/misc.c

@@ -310,7 +310,7 @@ void maskhost(const char *s, char *nw)
 void dumplots(int idx, const char *prefix, char *data)
 {
   char		*p = data, *q = NULL, *n = NULL, c = 0;
-  const int	 max_data_len = 500 - strlen(prefix);
+  const size_t max_data_len = 500 - strlen(prefix);
 
   if (!*data) {
     dprintf(idx, "%s\n", prefix);
@@ -416,7 +416,9 @@ void daysdur(time_t now, time_t then, char *out)
 static char *fuckyou = " _   _ _      __            _                            ____\n| | | (_)    / _|_   _  ___| | __  _   _  ___  _   _   _|  _ \\\n| |_| | |   | |_| | | |/ __| |/ / | | | |/ _ \\| | | | (_) | | |\n|  _  | |_  |  _| |_| | (__|   <  | |_| | (_) | |_| |  _| |_| |\n|_| |_|_( ) |_|  \\__,_|\\___|_|\\_\\  \\__, |\\___/ \\__,_| (_)____/\n        |/                         |___/\n";
 
 char *wbanner() {
-  if (fuckyou) ;
+  if (fuckyou) {
+    ;
+  }
 
   switch (randint(9)) {
    case 0: return STR("                       .__  __  .__\n__  _  ______________  |__|/  |_|  |__\n\\ \\/ \\/ /\\_  __ \\__  \\ |  \\   __\\  |  \\\n \\     /  |  | \\// __ \\|  ||  | |   Y  \\\n  \\/\\_/   |__|  (____  /__||__| |___|  /\n                     \\/              \\/\n");
@@ -469,7 +471,8 @@ void show_channels(int idx, char *handle)
   struct chanset_t *chan = NULL;
   struct flag_record fr = { FR_CHAN | FR_GLOBAL, 0, 0, 0};
   struct userrec *u = NULL;
-  int first = 0, l = 0, total = 0;
+  int first = 0, total = 0;
+  size_t l = 0;
   char format[120] = "";
 
   if (handle)

src/mod/dns.mod/coredns.c

@@ -645,7 +645,7 @@ static void passrp(struct resolve *rp, long ttl, int type)
 
 /* Parses the response packets received.
  */
-static void parserespacket(u_8bit_t *s, int l)
+static void parserespacket(u_8bit_t *s, size_t l)
 {
     struct resolve *rp = NULL;
     packetheader *hp = NULL;
@@ -876,8 +876,9 @@ static void parserespacket(u_8bit_t *s, int l)
 		}
 		c += rdatalength;
 	    }
-	} else
+	} else {
 	    ddebug0(RES_ERR "No error returned but no answers given.");
+        }
 	break;
     case NXDOMAIN:
 	ddebug0(RES_MSG "Host not found.");
@@ -933,7 +934,7 @@ static void dns_ack(void)
         ddebug1(RES_ERR "Received reply from unknown source: %s",
 	       iptostr(from.sin_addr.s_addr));
     } else
-        parserespacket((u_8bit_t *) resrecvbuf, r);
+        parserespacket((u_8bit_t *) resrecvbuf, (size_t) r);
 }
 
 /* Remove or resend expired requests. Called once a second.

src/mod/irc.mod/cmdsirc.c

@@ -1173,7 +1173,7 @@ static void cmd_channel(struct userrec *u, int idx, char *par)
   char handle[HANDLEN + 1] = "", s[UHOSTLEN] = "", s1[UHOSTLEN] = "", atrflag = 0, chanflag[2] = "";
   struct chanset_t *chan = NULL;
   memberlist *m = NULL;
-  int maxnicklen, maxhandlen;
+  unsigned int maxnicklen, maxhandlen;
   char format[81] = "";
 
   chan = get_channel(idx, par);

src/mod/irc.mod/irc.c

@@ -71,7 +71,7 @@ static int bounce_bans = 0;
 static int bounce_exempts = 0;
 static int bounce_invites = 0;
 static int bounce_modes = 0;
-static int modesperline = 4;		/* Number of modes per line to send. */
+static unsigned int modesperline = 4;	/* Number of modes per line to send. */
 static int mode_buf_len = 200;		/* Maximum bytes to send in 1 mode. */
 static int use_354 = 0;			/* Use ircu's short 354 /who
 					   responses. */

src/mod/irc.mod/mode.c

@@ -453,13 +453,14 @@ static void flush_mode(struct chanset_t *chan, int pri)
 {
   char *p = NULL, out[512] = "", post[512] = "";
   size_t postsize = sizeof(post);
-  int i, plus = 2;              /* 0 = '-', 1 = '+', 2 = none */
+  int plus = 2;              /* 0 = '-', 1 = '+', 2 = none */
+  unsigned int i = 0;
 
 /* dequeue_op_deop(chan); */
   p = out;
   post[0] = 0, postsize--;
 
-/* new does +o first.. */
+/* now does +o first.. */
   if (chan->mns[0]) {
     *p++ = '-', plus = 0;
     for (i = 0; i < strlen(chan->mns); i++)
@@ -591,7 +592,8 @@ static void flush_mode(struct chanset_t *chan, int pri)
  */
 void add_mode(struct chanset_t *chan, char plus, char mode, char *op)
 {
-  int i, type, modes, l;
+  int type, modes, l;
+  unsigned int i;
   masklist *m = NULL;
   memberlist *mx = NULL;
   char s[21] = "";

src/mod/server.mod/server.c

@@ -62,7 +62,7 @@ static int strict_servernames;	/* don't update server list */
 static struct server_list *serverlist = NULL;	/* old-style queue, still used by
 					   server list */
 int cycle_time;			/* cycle time till next server connect */
-int default_port;		/* default IRC port */
+unsigned int default_port;		/* default IRC port */
 static char oldnick[NICKLEN] = "";	/* previous nickname *before* rehash */
 int trigger_on_ignore;	/* trigger bindings if user is ignored ? */
 int answer_ctcp;		/* answer how many stacked ctcp's ? */

src/mod/server.mod/server.h

@@ -24,7 +24,7 @@ struct server_list {
   struct server_list	*next;
 
   char			*name;
-  int			 port;
+  unsigned int		 port;
   char			*pass;
   char			*realname;
 };
@@ -48,10 +48,11 @@ extern bind_table_t	*BT_ctcp, *BT_ctcr;
 #ifdef S_MSGCMDS
 extern bind_table_t	*BT_msgc;
 #endif /* S_MSGCMDS */
-extern int 		serv, servidx, cycle_time, default_port, newserverport,
+extern int 		serv, servidx, cycle_time, newserverport,
 			nick_len, checked_hostmask, ctcp_mode, quiet_reject,
 			flud_thr, flud_time, flud_ctcp_thr, flud_ctcp_time,
 			answer_ctcp, trigger_on_ignore;
+extern unsigned int	default_port;
 extern time_t		server_online;
 extern char		cursrvname[], botrealname[], botuserhost[], ctcp_reply[],
 			newserver[], newserverpass[];

src/mod/server.mod/servmsg.c

@@ -974,6 +974,7 @@ static struct dcc_table SERVER_SOCKET =
   timeout_server,
   display_server,
   kill_server,
+  NULL,
   NULL
 };
 

src/mod/transfer.mod/transfer.c

@@ -35,7 +35,7 @@ static int copy_to_tmp = 1;	/* Copy files to /tmp before transmitting? */
 static int wait_dcc_xfer = 40;	/* Timeout time on DCC xfers */
 static int dcc_limit = 4;	/* Maximum number of simultaneous file
 				   downloads allowed */
-static int dcc_block = 0;	/* Size of one dcc block */
+static unsigned int dcc_block = 0;	/* Size of one dcc block */
 static int quiet_reject = 1;        /* Quietly reject dcc chat or sends from
                                    users without access? */
 
@@ -886,7 +886,7 @@ void tout_dcc_send(int idx)
 void display_dcc_get(int idx, char *buf)
 {
   if (dcc[idx].status == dcc[idx].u.xfer->length)
-    sprintf(buf,TRANSFER_SEND, dcc[idx].u.xfer->acked,
+    sprintf(buf, TRANSFER_SEND, dcc[idx].u.xfer->acked,
 	    dcc[idx].u.xfer->length, dcc[idx].u.xfer->origname);
   else
     sprintf(buf,TRANSFER_SEND, dcc[idx].status,
@@ -946,7 +946,8 @@ struct dcc_table DCC_SEND =
   tout_dcc_send,
   display_dcc_send,
   kill_dcc_xfer,
-  out_dcc_xfer
+  out_dcc_xfer,
+  NULL
 };
 
 void dcc_fork_send(int idx, char *x, int y);
@@ -961,7 +962,8 @@ struct dcc_table DCC_FORK_SEND =
   eof_dcc_fork_send,
   display_dcc_fork_send,
   kill_dcc_xfer,
-  out_dcc_xfer
+  out_dcc_xfer,
+  NULL
 };
 
 void dcc_fork_send(int idx, char *x, int y)
@@ -990,7 +992,7 @@ struct dcc_table DCC_GET =
   display_dcc_get,
   kill_dcc_xfer,
   out_dcc_xfer,
-  outdone_dcc_xfer
+  outdone_dcc_xfer,
 };
 
 struct dcc_table DCC_GET_PENDING =
@@ -1003,7 +1005,8 @@ struct dcc_table DCC_GET_PENDING =
   transfer_get_timeout,
   display_dcc_get_p,
   kill_dcc_xfer,
-  out_dcc_xfer
+  out_dcc_xfer,
+  NULL
 };
 
 static void dcc_get_pending(int idx, char *buf, int len)
@@ -1038,7 +1041,7 @@ static void dcc_get_pending(int idx, char *buf, int len)
 
   /* Are we resuming? */
   if (dcc[idx].u.xfer->type == XFER_RESUME_PEND) {
-    int l;
+    long unsigned int l;
 
     if (dcc_block == 0 || dcc[idx].u.xfer->length < dcc_block) {
       l = dcc[idx].u.xfer->length - dcc[idx].u.xfer->offset;
@@ -1049,7 +1052,6 @@ static void dcc_get_pending(int idx, char *buf, int len)
     }
 
     /* Seek forward ... */
-putlog(LOG_MISC, "*", "!! Resuming on transfer");
     fseek(dcc[idx].u.xfer->f, dcc[idx].u.xfer->offset, SEEK_SET);
     dcc[idx].u.xfer->block_pending = pump_file_to_sock(dcc[idx].u.xfer->f,
 						       dcc[idx].sock, l);

src/net.c

@@ -625,11 +625,12 @@ static int proxy_connect(int sock, char *host, int port, int proxy)
  *   -1  neterror() type error
  *   -2  can't resolve hostname
  */
-int open_telnet_raw(int sock, char *server, int sport)
+int open_telnet_raw(int sock, char *server, unsigned int sport)
 {
   union sockaddr_union so;
   char host[121] = "";
-  int i, error = 0, port, rc;
+  int i, error = 0, rc;
+  unsigned int port;
   volatile int proxy;
 
   /* firewall?  use socks */
@@ -709,7 +710,7 @@ int open_telnet_raw(int sock, char *server, int sport)
 }
 
 /* Ordinary non-binary connection attempt */
-int open_telnet(char *server, int port)
+int open_telnet(char *server, unsigned int port)
 {
 #ifdef USE_IPV6
   int sock = getsock(0, hostprotocol(server)) , ret = open_telnet_raw(sock, server, port);
@@ -726,7 +727,7 @@ int open_telnet(char *server, int port)
  * 'addr' is ignored if af_def is AF_INET6 -poptix (02/03/03)
  */
 #ifdef USE_IPV6
-int open_address_listen(IP addr, int af_def, int *port)
+int open_address_listen(IP addr, int af_def, unsigned int *port)
 #else
 int open_address_listen(IP addr, int *port)
 #endif /* USE_IPV6 */
@@ -807,7 +808,7 @@ int open_address_listen(IP addr, int *port)
 /* Returns a socket number for a listening socket that will accept any
  * connection -- port # is returned in port
  */
-inline int open_listen(int *port)
+inline int open_listen(unsigned int *port)
 {
 #ifdef USE_IPV6
   return open_address_listen(conf.bot->ip ? getmyip() : INADDR_ANY, AF_INET, port);
@@ -820,7 +821,7 @@ inline int open_listen(int *port)
  * the above is being left in for compatibility, and should NOT LONGER BE USED IN THE CORE CODE.
  */
 
-inline int open_listen_by_af(int *port, int af_def)
+inline int open_listen_by_af(unsigned int *port, int af_def)
 {
 #ifdef USE_IPV6
   return open_address_listen(conf.bot->ip ? getmyip() : INADDR_ANY, af_def, port);
@@ -1489,7 +1490,7 @@ int sockgets(char *s, int *len)
  * 
  * NOTE: Do NOT put Contexts in here if you want DEBUG to be meaningful!!
  */
-void tputs(register int z, char *s, unsigned int len)
+void tputs(register int z, char *s, size_t len)
 {
   register int i, x, idx;
   char *p = NULL;
@@ -1574,7 +1575,7 @@ void tputs(register int z, char *s, unsigned int len)
         x = write(z, s, len);
       if (x == -1)
 	x = 0;
-      if (x < len) {
+      if ((size_t) x < len) {
 	/* Socket is full, queue it */
 	socklist[i].outbuf = calloc(1, len - x);
 	egg_memcpy(socklist[i].outbuf, &s[x], len - x);
@@ -1682,7 +1683,7 @@ void dequeue_sockets()
 	debug3("net: eof!(write) socket %d (%s,%d)", socklist[i].sock,
 	       strerror(errno), errno);
 	socklist[i].flags |= SOCK_EOFD;
-      } else if (x == socklist[i].outbuflen) {
+      } else if ((size_t) x == socklist[i].outbuflen) {
 	/* If the whole buffer was sent, nuke it */
 	free(socklist[i].outbuf);
 	socklist[i].outbuf = NULL;
@@ -1741,7 +1742,7 @@ void tell_netdebug(int idx)
       if (socklist[i].inbuf != NULL)
 	sprintf(&s[strlen(s)], " (inbuf: %04X)", strlen(socklist[i].inbuf));
       if (socklist[i].outbuf != NULL)
-	sprintf(&s[strlen(s)], " (outbuf: %06lX)", socklist[i].outbuflen);
+	sprintf(&s[strlen(s)], " (outbuf: %06lX)", (unsigned long) socklist[i].outbuflen);
       strcat(s, ",");
       dprintf(idx, "%s", s);
     }

src/net.h

@@ -102,14 +102,14 @@ typedef struct {
   short          flags;
   char          *inbuf;
   char          *outbuf;
-  unsigned long  outbuflen;             /* Outbuf could be binary data  */
+  size_t outbuflen;             /* Outbuf could be binary data  */
+  size_t inbuflen;              /* Inbuf could be binary data   */
   int encstatus;                        /* encrypted botlink */
   int oseed;                            /* botlink out seed */
   int iseed;                            /* botlink in seed */
   char okey[33];                        /* botlink enckey: out */
   char ikey[33];                        /* botlink enckey: in  */
   int gz; /* gzip compression */
-  unsigned long  inbuflen;              /* Inbuf could be binary data   */
 #ifdef USE_IPV6
   unsigned int af;
 #endif /* USE_IPV6 */
@@ -149,17 +149,17 @@ void dropssl(int);
 void real_killsock(int, const char *, int);
 int answer(int, char *, unsigned long *, unsigned short *, int);
 int findanyidx(register int);
-inline int open_listen(int *);
-inline int open_listen_by_af(int *, int);
+inline int open_listen(unsigned int *);
+inline int open_listen_by_af(unsigned int *, int);
 #ifdef USE_IPV6
-int open_address_listen(IP, int, int *);
+int open_address_listen(IP, int, unsigned int *);
 #else
-int open_address_listen(IP, int *);
+int open_address_listen(IP, unsigned int *);
 #endif /* USE_IPV6 */
-int open_telnet(char *, int);
+int open_telnet(char *, unsigned int);
 int open_telnet_dcc(int, char *, char *);
-int open_telnet_raw(int, char *, int);
-void tputs(int, char *, unsigned int);
+int open_telnet_raw(int, char *, unsigned int);
+void tputs(int, char *, size_t);
 void dequeue_sockets();
 int sockgets(char *, int *);
 void tell_netdebug(int);

src/users.h

@@ -61,12 +61,12 @@ struct laston_info {
 };
 
 struct bot_addr {
-  int telnet_port;
-  int relay_port;
-  int hublevel;
+  unsigned int telnet_port;
+  unsigned int relay_port;
+  unsigned int hublevel;
   char *address;
   char *uplink;
-  int roleid;
+  unsigned int roleid;
 };
 
 struct user_entry {
@@ -120,8 +120,7 @@ struct chanuserrec {
   struct chanuserrec *next;
   char channel[81];
   time_t laston;
-  unsigned long flags;
-  /* FIXME:rem unsigned long flags_udef; */
+  flag_t flags;
   char *info;
 };
 
@@ -130,8 +129,7 @@ struct chanuserrec {
 struct userrec {
   struct userrec *next;
   char handle[HANDLEN + 1];
-  unsigned long flags;
-  /* FIXME: rem unsigned long flags_udef; */
+  flag_t flags;
   struct chanuserrec *chanrec;
   struct user_entry *entries;
 };