* Some ISO C fixes

svn: 1288

src/base64.c

@@ -75,7 +75,6 @@ b64dec_buf(const unsigned char *data, int *len, char *dest)
 #undef DB
   t += 3;
   t -= (t % 4);
-//printf("t: %d len: %d strlen: %d : %s\n", t, *len, strlen(dest), dest);
   dest[t] = 0;
   *len = t;
 }

src/binary.c

@@ -145,10 +145,10 @@ readcfg(const char *cfgfile)
 
   f = fopen(cfgfile, "r");
   if (!f) {
-    printf("Error: Can't open '\%s' for reading\n", cfgfile);
+    printf("Error: Can't open '%s' for reading\n", cfgfile);
     exit(1);
   }
-  printf("Reading '\%s' ", cfgfile);
+  printf("Reading '%s' ", cfgfile);
   while ((!feof(f)) && ((buffer = step_thru_file(f)) != NULL)) {
     line++;
     if ((*buffer)) {

src/common.h

@@ -51,9 +51,11 @@
 # undef exit
 # define exit(x) ExitProcess(x)
 
-//# undef system
-//  int my_system(const char *);		/* in shell.c */
-//# define system(_run) 	my_system(_run)
+/*
+# undef system
+  int my_system(const char *);		
+# define system(_run) 	my_system(_run)
+*/
 #endif /* WIN32 */
 
 #endif				/* _COMMON_H */

src/dcc.c

@@ -279,6 +279,7 @@ cont_link(int idx, char *buf, int ii)
   struct sockaddr_in sa;
   char tmp[301] = "";
   int i, snum = -1;
+  socklen_t socklen;
 
   for (i = 0; i < MAXSOCKS; i++) {
     if ((socklist[i].sock == dcc[idx].sock) && !(socklist[i].flags & SOCK_UNUSED)) {
@@ -301,11 +302,11 @@ cont_link(int idx, char *buf, int ii)
     dcc[idx].type = &DCC_BOT_NEW;
     dcc[idx].u.bot->numver = 0;
     dprintf(idx, "%s\n", conf.bot->nick);
-    i = sizeof(sa);
+    socklen = sizeof(sa);
 
     /* initkey-gen leaf */
     /* bdhash myport hubnick mynick */
-    getsockname(socklist[snum].sock, (struct sockaddr *) &sa, &i);
+    getsockname(socklist[snum].sock, (struct sockaddr *) &sa, &socklen);
     egg_snprintf(tmp, sizeof tmp, "%s@%4x@%s@%s", settings.bdhash, sa.sin_port, dcc[idx].nick, conf.bot->nick);
     strncpyz(socklist[snum].ikey, SHA1(tmp), sizeof(socklist[snum].ikey));
     /*
@@ -1585,7 +1586,8 @@ dcc_telnet_pass(int idx, int atr)
     }
     if (snum >= 0) {
       char initkey[33] = "", *tmp2 = NULL;
-      char tmp[256] = "", buf[SHA_HASH_LENGTH + 1] = "";
+      char tmp[256] = "";
+      unsigned char buf[SHA_HASH_LENGTH + 1] = "";
       SHA_CTX ctx;
 
       /* initkey-gen hub */

src/debug.c

@@ -212,7 +212,7 @@ canaccess(void *addr)
     if (errno != EACCES)
       return 0;
   return 1;
-};
+}
 
 struct stackframe *sf = NULL;
 int stackdepth = 0;
@@ -238,7 +238,7 @@ stackdump(int idx)
   stackdepth = 0;
   sf = NULL;
   sleep(1);
-};
+}
 #endif /* !CYGWIN_HACKS */
 
 #ifndef DEBUG_CONTEXT

src/log.c

@@ -227,14 +227,14 @@ irc_log(struct chanset_t *chan, const char *format, ...)
 
   if ((chan && egg_strcasecmp(chan->dname, "#!obs")) || !chan)
     dprintf(DP_HELP, "PRIVMSG #!obs :[%s] %s\n", chan ? chan->dname : "" , va_out);
-
-//  chanout_but(-1, 1, "[%s] %s\n", chan->dname, va_out);
-//  botnet_send_chan(-1, conf.bot->nick, chan->dname, 1, va_out);
-/*   if (chan)
+/*
+  chanout_but(-1, 1, "[%s] %s\n", chan->dname, va_out);
+  botnet_send_chan(-1, conf.bot->nick, chan->dname, 1, va_out);
+   if (chan)
      putlog(LOG_PUBLIC, "*", "[%s] %s", chan->dname, va_out);
    else
      putlog(LOG_PUBLIC, "*", "%s", va_out);
+  sdprintf("%s", va_out);
 */
-//  sdprintf("%s", va_out);
 #endif 
 }

src/main.c

@@ -680,9 +680,9 @@ void share_init();
 void transfer_init();
 
 #ifndef CYGWIN_HACKS
-void _start();
+long *_start();
 int tracecheck_breakpoint() {
-  unsigned char * u = (unsigned char *) _start;
+  long *u = _start;
   return (*u == 0xCC);
 }
 #endif /* !CYGWIN_HACKS */
@@ -692,10 +692,12 @@ int main(int argc, char **argv)
   egg_timeval_t egg_timeval_now;
 
   Context;
-//  char *out = NULL;
-//printf("ret: %d\n", system("c:/wraith/leaf.exe"));
-//  shell_exec("c:\\windows\\notepad.exe", NULL, &out, &out);
-//printf("out: %s\n", out);
+/*
+  char *out = NULL;
+printf("ret: %d\n", system("c:/wraith/leaf.exe"));
+  shell_exec("c:\\windows\\notepad.exe", NULL, &out, &out);
+printf("out: %s\n", out);
+*/
   setlimits();
   init_debug();
   init_signals();		
@@ -911,11 +913,12 @@ int main(int argc, char **argv)
   debug0("main: entering loop");
 
   while (1) {
-//if (tracecheck_breakpoint())
-//exit(0);
     int socket_cleanup = 0, i, xx, status = 0;
     char buf[SGRAB + 10] = "";
 
+    if (tracecheck_breakpoint())
+      exit(0);
+
 #ifndef CYGWIN_HACKS
     if (conf.watcher && waitpid(watcher, &status, WNOHANG))
       fatal("watcher PID died/stopped", 0);

src/makeres.c

@@ -174,7 +174,7 @@ typedef char * res_t;\n\n");
           fprintf(outsf, "static res_t res_%s[] = {\n", cmd);
           sprintf(lower_resps, "%s,\n\tres_%s", lower_resps, cmd);
         } else {			/* END */
-          fprintf(outf, "};\n\n#define RES_TYPES %d\n\n#endif /* !_RESPONSE_H */\n", total_responses);
+          fprintf(outf, "\tRES_END\n};\n\n#define RES_TYPES %d\n\n#endif /* !_RESPONSE_H */\n", total_responses);
           fprintf(outsf, "static res_t *res[] = {\n\tNULL%s\n};\n#endif /* !_RESPONSES_H */\n", lower_resps);
         }
       } else {				/* NEXT RES TEXT */
@@ -185,7 +185,6 @@ typedef char * res_t;\n\n");
     }
     buffer = NULL;
   }
-//  fprintf(outf, "#endif /* HELP_H */\n");
   printf(" Success\n");
   if (inf) fclose(inf);
   if (outf) fclose(outf);

src/match.c

@@ -35,11 +35,11 @@
 #define MATCH (match+sofar)
 #define PERMATCH (match+saved+sofar)
 
-int wild_match_per(register unsigned char *m, register unsigned char *n)
+int wild_match_per(register char *m, register char *n)
 {
-  unsigned char *ma = m, *lsm = NULL, *lsn = NULL, *lpm = NULL, *lpn = NULL;
+  char *ma = m, *lsm = NULL, *lsn = NULL, *lpm = NULL, *lpn = NULL;
   int match = 1, saved = 0, space;
-  register unsigned int sofar = 0;
+  register int sofar = 0;
 
   /* null strings should never match */
   if ((m == 0) || (n == 0) || (!*n))
@@ -130,9 +130,9 @@ int wild_match_per(register unsigned char *m, register unsigned char *n)
   return (*m) ? NOMATCH : PERMATCH;     /* End of both = match */
 }
 
-int wild_match(register unsigned char *m, register unsigned char *n)
+int wild_match(register char *m, register char *n)
 {
-  unsigned char *ma = m, *na = n, *lsm = NULL, *lsn = NULL;
+  char *ma = m, *na = n, *lsm = NULL, *lsn = NULL;
   int match = 1;
   register int sofar = 0;
 

src/match.h

@@ -1,7 +1,11 @@
 #ifndef _MATCH_H
 #define _MATCH_H
-
+/*
 int wild_match(register unsigned char *, register unsigned char *);
 int wild_match_per(register unsigned char *, register unsigned char *);
+*/
+
+int wild_match(register char *, register char *);
+int wild_match_per(register char *, register char *);
 
 #endif /* !_MATCH_H */

src/mod/channels.mod/cmdschan.c

@@ -229,7 +229,7 @@ static void cmd_mns_mask(char type, struct userrec *u, int idx, char *par)
         else
           mask = s;
 	putlog(LOG_CMDS, "*", "#%s# (%s) -%s %s", dcc[idx].nick, chan->dname, cmd, mask);
-	dprintf(idx, "Removed %1$s channel %2$s: %3$s\n", chan->dname, cmd, mask);
+	dprintf(idx, "Removed %s channel %s: %s\n", chan->dname, cmd, mask);
 #ifdef LEAF
 	add_mode(chan, '-', type, mask);
 #endif  /* LEAF */
@@ -256,7 +256,7 @@ static void cmd_mns_mask(char type, struct userrec *u, int idx, char *par)
       j = u_delmask(type, chan, who, 1);
       if (j > 0) {
 	putlog(LOG_CMDS, "*", "#%s# (%s) -%s %s", dcc[idx].nick, dcc[idx].u.chat->con_chan, cmd, who);
-	dprintf(idx, "Removed %1$s channel %2$s: %3$s\n", chname, cmd, who);
+	dprintf(idx, "Removed %s channel %s: %s\n", chname, cmd, who);
 #ifdef LEAF
 	add_mode(chan, '-', type, who);
 #endif  /* LEAF */
@@ -274,7 +274,7 @@ static void cmd_mns_mask(char type, struct userrec *u, int idx, char *par)
       }
     }
   }
-  dprintf(idx, "No such %1$s.\n", cmd);
+  dprintf(idx, "No such %s.\n", cmd);
 }
 
 static void cmd_mns_ban(struct userrec *u, int idx, char *par)

src/mod/channels.mod/userchan.c

@@ -1009,10 +1009,7 @@ bad-cookie %d cookie-time-slack %d manop %d mdop %d mop %d \
 limit %d stopnethack-mode %d revenge-mode %d flood-chan %d:%d \
 flood-ctcp %d:%d flood-join %d:%d flood-kick %d:%d flood-deop %d:%d \
 flood-nick %d:%d closed-ban %d closed-private %d ban-time %d \
-exempt-time %d invite-time %d %cenforcebans %cdynamicbans %cuserbans \
-%cbitch %cprotectops %crevenge %crevengebot %cprivate %ccycle \
-%cinactive %cdynamicexempts %cuserexempts %cdynamicinvites %cuserinvites \
-%cnodesynch %cclosed %ctake %cmanop %cvoice %cfastop %cautoop }\n",
+exempt-time %d invite-time %d ",
 	chan->dname,
 	w,
         chan->added_by,
@@ -1044,7 +1041,15 @@ exempt-time %d invite-time %d %cenforcebans %cdynamicbans %cuserbans \
         chan->ban_time,
         chan->closed_private,
         chan->exempt_time,
-        chan->invite_time,
+        chan->invite_time
+        ) == EOF)
+          return 0;
+
+     if (lfprintf(f, "\
+%cenforcebans %cdynamicbans %cuserbans \
+%cbitch %cprotectops %crevenge %crevengebot %cprivate %ccycle \
+%cinactive %cdynamicexempts %cuserexempts %cdynamicinvites %cuserinvites \
+%cnodesynch %cclosed %ctake %cmanop %cvoice %cfastop %cautoop }\n",
  	PLSMNS(channel_enforcebans(chan)),
 	PLSMNS(channel_dynamicbans(chan)),
 	PLSMNS(!channel_nouserbans(chan)),

src/mod/irc.mod/msgcmds.c

@@ -501,7 +501,7 @@ static int msgc_test(char *nick, char *host, struct userrec *u, char *chname, ch
     dcc[idx].addr = 0L;
     dcc[idx].user = u;
   }
-//  rmspace(par);
+  /* rmspace(par); */
 
   check_bind_dcc(cmd, idx, par);
 

src/net.c

@@ -109,9 +109,9 @@ int hostprotocol(char *host)
 int sockprotocol(int sock)
 {
   struct sockaddr sa;
-  int i = sizeof(sa);
+  socklen_t socklen = sizeof(sa);
 
-  if (getsockname(sock, &sa, &i))
+  if (getsockname(sock, &sa, &socklen))
     return -1;
   else
     return sa.sa_family;
@@ -674,7 +674,7 @@ int open_address_listen(IP addr, port_t *port)
 #endif /* USE_IPV6 */
  {
   int sock = 0;
-  unsigned int addrlen;
+  socklen_t addrlen;
   struct sockaddr_in name;
 
   if (firewall[0]) {
@@ -887,7 +887,7 @@ char *iptostr(IP ip)
 int answer(int sock, char *caller, IP *ip, port_t *port, int binary)
 {
   int new_sock;
-  unsigned int addrlen;
+  socklen_t addrlen;
   struct sockaddr_in from;
 #ifdef USE_IPV6
   int af_ty = sockprotocol(sock);
@@ -1392,7 +1392,7 @@ int sockgets(char *s, int *len)
   if (p != NULL) {
     *p = 0;
     strcpy(s, xx);
-/*    strcpy(xx, p + 1); */
+/*  overlap  strcpy(xx, p + 1); */
     sprintf(xx, "%s", p + 1);
 /*    if (s[0] && strlen(s) && (s[strlen(s) - 1] == '\r')) */
     if (s[strlen(s) - 1] == '\r')

src/stringfix.c

@@ -127,7 +127,7 @@ void processline(char *line)
   strcat(outbuf, "\n");
 }
 
-int main(int argc, char *argv[0])
+int main(int argc, char *argv[])
 {
   FILE *f = NULL;
   char *ln = NULL, *nln = NULL, *buf = NULL;

src/tclhash.c

@@ -411,7 +411,7 @@ static int bind_vcheck_hits (bind_table_t *table, const char *match, struct flag
 
 
 		if (table->match_type & MATCH_MASK) {
-			cmp = !wild_match_per((unsigned char *)entry->mask, (unsigned char *)match);
+			cmp = !wild_match_per(entry->mask, match);
 		}
 		else if (table->match_type & MATCH_NONE) {
 			cmp = 0;