* Fixed some various FIXMEs

svn: 818

autotools/includes/acinclude.m4

@@ -5,8 +5,6 @@ dnl
 
 dnl  EGG_CHECK_CC()
 dnl
-dnl  FIXME: make a better test
-dnl
 AC_DEFUN(EGG_CHECK_CC, [dnl
 if test "${cross_compiling-x}" = "x"
 then
@@ -212,9 +210,6 @@ fi
 
 dnl  EGG_CHECK_OS()
 dnl
-dnl  FIXME/NOTICE:
-dnl    This function is obsolete. Any NEW code/checks should be written
-dnl    as individual tests that will be checked on ALL operating systems.
 dnl
 AC_DEFUN(EGG_CHECK_OS, [dnl
 LINUX=no
@@ -278,8 +273,6 @@ case "$egg_cv_var_system_type" in
   OSF1)
     case "`echo $egg_cv_var_system_release | cut -d . -f 1`" in
       V*)
-        # FIXME: we should check this in a separate test
-        # Digital OSF uses an ancient version of gawk
         if test "$AWK" = "gawk"
         then
           AWK=awk
@@ -333,11 +326,6 @@ esac
 dnl  EGG_CHECK_LIBS()
 dnl
 AC_DEFUN(EGG_CHECK_LIBS, [dnl
-# FIXME: this needs to be fixed so that it works on IRIX
-if test "$IRIX" = "yes"
-then
-  AC_MSG_WARN(Skipping library tests because they CONFUSE Irix.)
-else
   AC_CHECK_LIB(socket, socket)
 #  AC_CHECK_LIB(nsl, connect)
   AC_CHECK_LIB(dns, gethostbyname)
@@ -358,7 +346,6 @@ else
 #        ac_cv_lib_pthread_pthread_mutex_init=yes
 #        ac_cv_lib_pthread=""],
 #        ac_cv_lib_pthread_pthread_mutex_init=no)])])])
-fi
 ])dnl
 
 dnl  EGG_CHECK_FUNC_VSPRINTF()

configure

@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 1.21 .
+# From configure.ac Revision: 1.22 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59.
 #
@@ -3771,8 +3771,6 @@ _ACEOF
   OSF1)
     case "`echo $egg_cv_var_system_release | cut -d . -f 1`" in
       V*)
-        # FIXME: we should check this in a separate test
-        # Digital OSF uses an ancient version of gawk
         if test "$AWK" = "gawk"
         then
           AWK=awk
@@ -4887,12 +4885,6 @@ fi
 rm -f confcache
 
 # Checks for system libraries
-# FIXME: this needs to be fixed so that it works on IRIX
-if test "$IRIX" = "yes"
-then
-  { echo "$as_me:$LINENO: WARNING: Skipping library tests because they CONFUSE Irix." >&5
-echo "$as_me: WARNING: Skipping library tests because they CONFUSE Irix." >&2;}
-else
 
 echo "$as_me:$LINENO: checking for socket in -lsocket" >&5
 echo $ECHO_N "checking for socket in -lsocket... $ECHO_C" >&6
@@ -5123,7 +5115,6 @@ fi
 #        ac_cv_lib_pthread_pthread_mutex_init=yes
 #        ac_cv_lib_pthread=""],
 #        ac_cv_lib_pthread_pthread_mutex_init=no)])])])
-fi
 
 
 # Checks for header files

src/mod/channels.mod/channels.c

@@ -321,7 +321,6 @@ void rebalance_roles()
 }
 #endif /* HUB */
 
-/* FIXME: needs more testing */
 static void channels_10secondly() {
   struct chanset_t *chan = NULL;
 

src/mod/channels.mod/tclchan.c

@@ -732,9 +732,7 @@ void clear_channel(struct chanset_t *chan, int reset)
 int channel_add(char *result, char *newname, char *options)
 {
   struct chanset_t *chan = NULL;
-  int items = 0;
-  int ret = OK;
-  int join = 0;
+  int items = 0, ret = OK, join = 0;
   char buf[3001] = "";
   const char **item = NULL;
 
@@ -749,7 +747,7 @@ int channel_add(char *result, char *newname, char *options)
       sprintf(result, "invalid channel name");
     return ERROR;
   }
-  simple_sprintf(buf, "chanmode %s ", glob_chanmode);
+  simple_sprintf(buf, "chanmode { %s } ", glob_chanmode);
   strcat(buf, glob_chanset);
   strcat(buf, options);
   buf[strlen(buf)] = 0;
@@ -764,9 +762,6 @@ int channel_add(char *result, char *newname, char *options)
   } else {
     chan = (struct chanset_t *) calloc(1, sizeof(struct chanset_t));
 
-    /* Hells bells, const set *every* variable to 0 when we have bzero? */
-/* not needed..    egg_bzero(chan, sizeof(struct chanset_t)); */
-
     /* These are defaults, bzero already set them 0, but we set them for future reference */
     chan->limit_prot = 0;
     chan->limit = 0;

src/users.c

@@ -809,10 +809,11 @@ int readuserfile(char *file, struct userrec **ret)
            newsplit(&options);
            newsplit(&options);
            chan = newsplit(&options);
-/* FIXME: THIS HACK FOR { } REMOVAL SHOULD JUST NOT WRITE THEM? */
+
+           /* hack to remove { } */
            newsplit(&options);
            options[strlen(options) - 1] = 0;
-/* Above is a hack to remove { } */
+
            if (channel_add(resultbuf, chan, options) != OK) {
              putlog(LOG_MISC, "*", "Channel parsing error in userfile on line %d", line);
              free(my_ptr);