* Removed some FIXME comments

svn: 1930

misc/grep

@@ -1,3 +1,3 @@
 #!/bin/sh
 grep=`which grep`
-grep "$@" | grep -v "^Binary" | grep -v "src/_" | grep -v "help\." | grep -v "CVS" | grep -v ".deps.*\.Po" | grep -v "\.c~:"
+grep "$@" | grep -v "^configure" | grep -v "^ChangeLog" | grep -v "^Binary" | grep -v "^src/_" | grep -v "^tmp/" | grep -v "^misc/help" | grep -v "CVS" | grep -v ".deps.*\.Po" | grep -v "\.c~:"

src/dcc.c

@@ -422,7 +422,6 @@ dcc_bot(int idx, char *code, int i)
 
     if (!y) {
       /* Found a match */
-	/* FIXME: replace with HUB/leaf after being removed */
       if (!C_bot[i].type || (C_bot[i].type == HUB && conf.bot->hub) || (C_bot[i].type == LEAF && !conf.bot->hub))
         (C_bot[i].func) (idx, msg);
       break;

src/mod/channels.mod/cmdschan.c

@@ -1241,7 +1241,7 @@ static void cmd_chaninfo(int idx, char *par)
     work[0] = 0;
 
 /* Chanflag template
- *          (chan->status & CHAN_TEMP) ? '+' : '-',
+ *  SHOW_FLAG("template", channel_template(chan));
  * also include %ctemp in dprintf.
  */
 

src/mod/irc.mod/irc.c

@@ -1015,9 +1015,8 @@ new_mask(masklist *m, char *s, char *who)
 
 /* Removes a nick from the channel member list (returns 1 if successful)
  */
-/* FIXME: This passing of FILE:LINE is unnecesary, an OLD bug may still exist from the malloc->my_calloc patch */
 static bool
-real_killmember(struct chanset_t *chan, char *nick, const char *file, int line)
+killmember(struct chanset_t *chan, char *nick)
 {
   memberlist *x = NULL, *old = NULL;
 
@@ -1026,7 +1025,7 @@ real_killmember(struct chanset_t *chan, char *nick, const char *file, int line)
       break;
   if (!x || !x->nick[0]) {
     if (!channel_pending(chan))
-      putlog(LOG_MISC, "*", "(!) killmember(%s, %s) -> nonexistent (%s: %d)", chan->dname, nick, file, line);
+      putlog(LOG_MISC, "*", "(!) killmember(%s, %s) -> nonexistent", chan->dname, nick);
     return 0;
   }
   if (old)

src/mod/irc.mod/irc.h

@@ -84,8 +84,7 @@ static bool detect_chan_flood(char *, char *, char *, struct chanset_t *, int,
 static void new_mask(masklist *, char *, char *);
 static void doban(struct chanset_t *, memberlist *);
 static char *quickban(struct chanset_t *, char *);
-static bool real_killmember(struct chanset_t *chan, char *nick, const char *file, int line);
-#define killmember(chan, nick)        real_killmember((chan), (nick), __FILE__,__LINE__)
+static bool killmember(struct chanset_t *chan, char *nick);
 static void check_lonely_channel(struct chanset_t *chan);
 static int gotmode(char *, char *);
 #define newban(chan, mask, who)         new_mask((chan)->channel.ban, mask, who)

src/mod/server.mod/servmsg.c

@@ -859,9 +859,6 @@ static int got451(char *from, char *msg)
  */
 static int goterror(char *from, char *msg)
 {
- /* FIXME: fixcolon doesn't do what we need here, this is a temp fix
-  * fixcolon(msg);
-  */
   if (msg[0] == ':')
     msg++;       
   putlog(LOG_SERV, "*", "-ERROR from server- %s", msg);

src/tclhash.c

@@ -450,7 +450,6 @@ void add_builtins(const char *table_name, cmd_t *cmds)
 	bind_table_t *table = bind_table_lookup_or_fake(table_name);
 
 	for (; cmds->name; cmds++) {
-		/* FIXME: replace 1/2 with HUB/LEAF after they are removed */
           if (!cmds->type || (cmds->type == HUB && conf.bot->hub) || (cmds->type == LEAF && !conf.bot->hub)) {
                 /* add BT_dcc cmds to cmdlist[] :: add to the help system.. */
                 if (!strcmp(table->name, "dcc") && (findhelp(cmds->name) != -1)) {