* More type fixes

svn: 1315

src/mod/console.mod/console.c

@@ -112,7 +112,8 @@ console_set(struct userrec *u, struct user_entry *e, void *buf)
       free(ci->channel);
       free(ci);
     }
-    ci = e->u.extra = (struct console_info *) buf;
+    ci = (struct console_info *) buf;
+    e->u.extra = (struct console_info *) buf;
   }
 
   if (!noshare && !u->bot) {

src/mod/dns.mod/coredns.c

@@ -654,7 +654,7 @@ static void parserespacket(u_8bit_t *s, size_t l)
     u_8bit_t *c = NULL;
     long ttl;
     int r, usefulanswer;
-    u_16bit_t rr, datatype, class, qdatatype, qclass;
+    u_16bit_t rr, datatype, myclass, qdatatype, qclass;
     u_8bit_t rdatalength;
 
     if (l < sizeof(packetheader)) {
@@ -787,18 +787,18 @@ static void parserespacket(u_8bit_t *s, size_t l)
 		    return;
 		}
 		datatype = sucknetword(c);
-		class = sucknetword(c);
+		myclass = sucknetword(c);
 		ttl = sucknetlong(c);
 		rdatalength = sucknetword(c);
-		if (class != qclass) {
+		if (myclass != qclass) {
 		    ddebug2(RES_MSG "query class: %u (%s)",
 			    qclass,
 			    qclass < CLASSTYPES_COUNT ?
 				classtypes[qclass] :
 				classtypes[CLASSTYPES_COUNT]);
-		    ddebug2(RES_MSG "rr class: %u (%s)", class,
-			    class < CLASSTYPES_COUNT ?
-				classtypes[class] :
+		    ddebug2(RES_MSG "rr class: %u (%s)", myclass,
+			    myclass < CLASSTYPES_COUNT ?
+				classtypes[myclass] :
 				classtypes[CLASSTYPES_COUNT]);
 		    ddebug0(RES_ERR "Answered class does not match queried class.");
 		    return;

src/mod/irc.mod/chan.c

@@ -953,14 +953,14 @@ static void check_this_member(struct chanset_t *chan, char *nick, struct flag_re
     if (!chan_sentkick(m) && (chan_kick(*fr) || glob_kick(*fr)) && me_op(chan)) {
       check_exemptlist(chan, s);
       quickban(chan, m->userhost);
-      p = get_user(&USERENTRY_COMMENT, m->user);
+      p = (char *) get_user(&USERENTRY_COMMENT, m->user);
       dprintf(DP_SERVER, "KICK %s %s :%s%s\n", chan->name, m->nick, bankickprefix, p ? p : response(RES_KUSER));
       m->flags |= SENTKICK;
     }
   }
 }
 
-void check_this_user(char *hand, int delete, char *host)
+void check_this_user(char *hand, int del, char *host)
 {
   char s[UHOSTLEN] = "";
   memberlist *m = NULL;
@@ -972,9 +972,9 @@ void check_this_user(char *hand, int delete, char *host)
     for (m = chan->channel.member; m && m->nick[0]; m = m->next) {
       sprintf(s, "%s!%s", m->nick, m->userhost);
       u = m->user ? m->user : get_user_by_host(s);
-      if ((u && !egg_strcasecmp(u->handle, hand) && delete < 2) ||
-	  (!u && delete == 2 && wild_match(host, fixfrom(s)))) {
-	u = delete ? NULL : u;
+      if ((u && !egg_strcasecmp(u->handle, hand) && del < 2) ||
+	  (!u && del == 2 && wild_match(host, fixfrom(s)))) {
+	u = del ? NULL : u;
 	get_user_flagrec(u, &fr, chan->dname);
 	check_this_member(chan, m->nick, &fr);
       }
@@ -2243,7 +2243,7 @@ static int gotjoin(char *from, char *chname)
 		     me_op(chan)) {
 	    check_exemptlist(chan, from);
 	    quickban(chan, from);
-	    p = get_user(&USERENTRY_COMMENT, m->user);
+	    p = (char *) get_user(&USERENTRY_COMMENT, m->user);
             dprintf(DP_MODE, "KICK %s %s :%s%s\n", chname, nick, bankickprefix, response(RES_KUSER));
 	    m->flags |= SENTKICK;
 	  }

src/mod/irc.mod/irc.c

@@ -474,7 +474,7 @@ check_hostmask()
   } else
     sprintf(s, "*!%s", tmp);
 
-  for (q = get_user(&USERENTRY_HOSTS, conf.bot->u); q; q = q->next) {
+  for (q = (struct list_type *) get_user(&USERENTRY_HOSTS, conf.bot->u); q; q = q->next) {
     if (!egg_strcasecmp(q->extra, s))
       return;
   }

src/mod/irc.mod/msgcmds.c

@@ -9,7 +9,7 @@
 
 static int msg_pass(char *nick, char *host, struct userrec *u, char *par)
 {
-  char *old = NULL, *new = NULL;
+  char *old = NULL, *mynew = NULL;
 
   if (match_my_nick(nick))
     return BIND_RET_BREAK;
@@ -33,23 +33,23 @@ static int msg_pass(char *nick, char *host, struct userrec *u, char *par)
       dprintf(DP_HELP, "NOTICE %s :%s\n", nick, IRC_FAILPASS);
       return BIND_RET_BREAK;
     }
-    new = newsplit(&par);
+    mynew = newsplit(&par);
   } else {
-    new = old;
+    mynew = old;
   }
-  if (strlen(new) > MAXPASSLEN)
-    new[MAXPASSLEN] = 0;
+  if (strlen(mynew) > MAXPASSLEN)
+    mynew[MAXPASSLEN] = 0;
 
-  if (!goodpass(new, 0, nick)) {
+  if (!goodpass(mynew, 0, nick)) {
     putlog(LOG_CMDS, "*", "(%s!%s) !%s! \002!\002PASS...", nick, host, u->handle);
     return BIND_RET_BREAK;
   }
 
   putlog(LOG_CMDS, "*", "(%s!%s) !%s! PASS...", nick, host, u->handle);
 
-  set_user(&USERENTRY_PASS, u, new);
+  set_user(&USERENTRY_PASS, u, mynew);
   dprintf(DP_HELP, "NOTICE %s :%s '%s'.\n", nick,
-	  new == old ? IRC_SETPASS : IRC_CHANGEPASS, new);
+	  mynew == old ? IRC_SETPASS : IRC_CHANGEPASS, mynew);
   return BIND_RET_BREAK;
 }