* Converted // comments to the proper /* */ for ANSI C.

svn: 667

src/botcmd.c

@@ -100,7 +100,7 @@ static void bot_chan2(int idx, char *msg)
   /* Strip annoying control chars */
   for (p = from; *p;) {
     if ((*p < 32) || (*p == 127))
-//      strcpy(p, p + 1);
+/*      strcpy(p, p + 1); */
       sprintf(p, "%s", p + 1);
     else
       p++;
@@ -248,7 +248,7 @@ static void bot_actchan(int idx, char *par)
   for (p = from; *p;) {
     if ((*p < 32) || (*p == 127))
       sprintf(p, "%s", p + 1);
-//      strcpy(p, p + 1);
+/*      strcpy(p, p + 1); */
     else
       p++;
   }
@@ -793,11 +793,13 @@ static void bot_unlinked(int idx, char *par)
     fake_alert(idx, "direction", bot);
   else if (i >= 0) {		/* Valid bot downstream of idx */
     if (par[0])
-//#ifdef HUB
+/* #ifdef HUB */
       chatout("*** (%s) %s\n", lastbot(bot), par);
-//#else
-//      chatout("*** %s unlinked from botnet.\n", par);
-//#endif
+/*
+#else
+      chatout("*** %s unlinked from botnet.\n", par);
+#endif 
+*/
     botnet_send_unlinked(idx, bot, par);
     unvia(idx, findbot(bot));
     rembot(bot);

src/chan.h

@@ -219,12 +219,12 @@ struct chanset_t {
 #define CHAN_SECRET         0x0200	   /* don't advertise channel on botnet  */
 #define CHAN_MANOP          0x0400         /* manual opping allowed? */
 #define CHAN_CYCLE          0x0800	   /* cycle the channel if possible      */
-//#define CHAN_    0x1000	   /* unused*/
+/*#define CHAN_    0x1000	   */
 #define CHAN_INACTIVE       0x2000	   /* no irc support for this channel
                                          - drummer                           */
-//#define CHAN_               0x4000	   /* unused */
+/* #define CHAN_               0x4000	   */
 #define CHAN_VOICE          0x8000	   /* a bot +y|y will voice *, except +q */
-//#define CHAN_           0x10000
+/* #define CHAN_           0x10000 */
 #define CHAN_REVENGEBOT     0x20000	   /* revenge on actions against the bot */
 #define CHAN_NODESYNCH      0x40000
 #define CHAN_FASTOP         0x80000        /* Bots will not use +o-b to op (no cookies) */ 
@@ -234,7 +234,7 @@ struct chanset_t {
 #define CHAN_PEND           0x2000000  /* just joined; waiting for end of
                                           WHO list                           */
 #define CHAN_FLAGGED        0x4000000  /* flagged during rehash for delete   */
-//#define CHAN_ 		    0x8000000  /* unused      */
+/* #define CHAN_ 		    0x8000000  */
 #define CHAN_ASKEDBANS      0x10000000
 #define CHAN_ASKEDMODES     0x20000000 /* find out key-info on IRCu          */
 #define CHAN_JUPED          0x40000000 /* Is channel juped                   */

src/cmds.c

@@ -3475,10 +3475,8 @@ void rcmd_cursrv(char * fbot, char * fhand, char * fidx) {
   }
   if (server_online)
     sprintf(tmp, "Currently: %-40s Lag: %d", cursrvname, server_lag);
-//    sprintf(tmp, STR("%-20s %d)"), cursrvname, server_lag);
   else
     sprintf(tmp, "Currently: none");
-//    sprintf(tmp, STR("%-20s"), "none");
   botnet_send_cmdreply(botnetnick, fbot, fhand, fidx, tmp);
 #endif /* LEAF */
 }

src/crypt.c

@@ -39,7 +39,7 @@ char *encrypt_binary(const char *keydata, unsigned char *data, int *datalen)
   } else {
     char key[CRYPT_KEYSIZE + 1];
     strncpyz(key, keydata, sizeof(key));
-//      strncpyz(&key[sizeof(key) - strlen(keydata)], keydata, sizeof(key));
+/*      strncpyz(&key[sizeof(key) - strlen(keydata)], keydata, sizeof(key)); */
     AES_set_encrypt_key(key, CRYPT_KEYBITS, &e_key);
 
     /* Now loop through the blocks and crypt them */
@@ -66,7 +66,7 @@ char *decrypt_binary(const char *keydata, unsigned char *data, int datalen)
     /* Init/fetch key */
     char key[CRYPT_KEYSIZE + 1];
     strncpyz(key, keydata, sizeof(key));
-//      strncpy(&key[sizeof(key) - strlen(keydata)], keydata, sizeof(key));
+/*      strncpy(&key[sizeof(key) - strlen(keydata)], keydata, sizeof(key)); */
     AES_set_decrypt_key(key, CRYPT_KEYBITS, &d_key);
 
     /* Now loop through the blocks and crypt them */

src/crypt.h

@@ -7,7 +7,6 @@
 #endif
 
 #ifdef HAVE_OPENSSL_SSL_H
-//#  include <openssl/ssl.h>
 #  include <openssl/crypto.h>
 #  include <openssl/aes.h>
 #  include <openssl/sha.h>

src/dcc.c

@@ -368,7 +368,7 @@ static void cont_link(int idx, char *buf, int ii)
         break;
       }
     }
-//.    ssl_link(dcc[idx].sock, CONNECT_SSL);
+/*.    ssl_link(dcc[idx].sock, CONNECT_SSL); */
     dcc[idx].type = &DCC_BOT_NEW;
     dcc[idx].u.bot->numver = 0;
     dprintf(idx, "%s\n", botnetnick);
@@ -497,12 +497,12 @@ static void dcc_bot(int idx, char *code, int i)
 
   strip_telnet(dcc[idx].sock, code, &i);
   if (debug_output) {
-//    if (code[0] != 'z' && code[1] != 'b' && code[2] != ' ') {
+/*    if (code[0] != 'z' && code[1] != 'b' && code[2] != ' ') { */
       if (code[0] == 's')
         putlog(LOG_BOTSHARE, "@", "{%s} %s", dcc[idx].nick, code + 2);
       else
         putlog(LOG_BOTNET, "@", "[%s] %s", dcc[idx].nick, code);
-//    }
+/*     } */
   }
   msg = strchr(code, ' ');
   if (msg) {
@@ -609,8 +609,8 @@ static void dcc_chat_secpass(int idx, char *buf, int atr)
   egg_snprintf(check, sizeof check, "+Auth %s", dcc[idx].hash);
   check[MD5_HASH_LENGTH + 6] = 0;
 
+  /* +secpass */
   if (!strcmp(check, buf)) {
-//+secpass
 #endif /* S_DCCAUTH */
       putlog(LOG_MISC, "*", DCC_LOGGEDIN, dcc[idx].nick,
 	     dcc[idx].host, dcc[idx].port);
@@ -1181,7 +1181,7 @@ static void dcc_telnet(int idx, char *buf, int i)
   sock = answer(dcc[idx].sock, s, &ip, &port, 0);
   while ((sock == -1) && (errno == EAGAIN))
     sock = answer(sock, s, &ip, &port, 0);
-//. ssl_link ACCEPT_SSL should go here!!!!
+/*. ssl_link ACCEPT_SSL should go here!!!! */
   if (sock < 0) {
     neterror(s);
     putlog(LOG_MISC, "*", DCC_FAILED, s);
@@ -1260,7 +1260,7 @@ static void dcc_telnet_hostresolved(int i)
     lostdcc(i);
     return;
   }
-//.  ssl_link(dcc[i].sock, ACCEPT_SSL);
+/* .  ssl_link(dcc[i].sock, ACCEPT_SSL); */
 
   changeover_dcc(i, &DCC_IDENTWAIT, 0);
   dcc[i].timeval = now;
@@ -1837,7 +1837,7 @@ static void dcc_telnet_got_ident(int i, char *host)
   /* This is so we dont tell someone doing a portscan anything
    * about ourselves. <cybah>
    */
-//n  ssl_link(dcc[i].sock, ACCEPT_SSL);
+/* n  ssl_link(dcc[i].sock, ACCEPT_SSL); */
 #ifdef HUB
   dprintf(i, "\n");
 #else /* !HUB */

src/dccutil.c

@@ -166,18 +166,18 @@ void dprintf (int idx, ...)
           sprintf(buf2, "%s%c%s", LIGHTGREY(idx), c, COLOR_END(idx));
         } else if (c == '@') {
           sprintf(buf2, "%s%c%s", BOLD(idx), c, BOLD_END(idx));
-//        } else if (c == ']' || c == '>' || c == ')' || c == '[' || c == '<' || c == '(') {
+/*        } else if (c == ']' || c == '>' || c == ')' || c == '[' || c == '<' || c == '(') { */
         } else if (c == '>' || c == ')' || c == '<' || c == '(') {
           sprintf(buf2, "%s%c%s", GREEN(idx), c, COLOR_END(idx));
         } else {
           sprintf(buf2, "%c", c);
         }
-//        sprintf(buf3, "%s%s", buf3 ? buf3 : "", buf2 ? buf2 : "");
+/*        sprintf(buf3, "%s%s", buf3 ? buf3 : "", buf2 ? buf2 : ""); */
         sprintf(buf3, "%s%s", (buf3 && buf3[0]) ? buf3 : "", (buf2 && buf2[0]) ? buf2 : "");
       }
       buf3[strlen(buf3)] = 0;
       strcpy(buf, buf3);
-//      strncpyz(buf, buf2, sizeof buf);
+/*      strncpyz(buf, buf2, sizeof buf); */
     }
     buf[sizeof(buf) - 1] = 0;
     len = strlen(buf);

src/flags.c

@@ -24,7 +24,7 @@ int sanity_check(int atr)
   if ((atr & USER_BOT) &&
       (atr & (USER_PARTY | USER_MASTER | USER_OWNER | USER_ADMIN | USER_HUBA | USER_CHUBA)))
     atr &= ~(USER_PARTY | USER_MASTER | USER_OWNER | USER_ADMIN | USER_HUBA | USER_CHUBA);
-// only bots should be there:
+/* only bots should be there: */
   if (!(atr & USER_BOT) &&
       (atr & (USER_DOLIMIT | USER_DOVOICE | USER_UPDATEHUB | USER_CHANHUB)))
     atr &= ~(USER_DOLIMIT | USER_DOVOICE | USER_UPDATEHUB | USER_CHANHUB);

src/log.h

@@ -21,7 +21,7 @@
 #define LOG_WARN     0x000800   /* u   warnings                 */
 #define LOG_WARNING  0x000800   /* u   warnings                 */
 
-//the rest of these can be used for new console modes....
+/* the rest of these can be used for new console modes.... */
 #define LOG_LEV4     0x001000   /* 4   user log level                   */
 #define LOG_LEV5     0x002000   /* 5   user log level                   */
 #define LOG_LEV6     0x004000   /* 6   user log level                   */

src/main.c

@@ -1003,7 +1003,7 @@ int main(int argc, char **argv)
     }
   }
 
-  // Ok if we are here, then the binary is accessable and in the correct directory, now lets do the local config...
+  /* Ok if we are here, then the binary is accessable and in the correct directory, now lets do the local config... */
 
 }
 #endif /* LEAF */
@@ -1039,7 +1039,7 @@ int main(int argc, char **argv)
   if (!fixmod(tempdir))
     werr(ERR_TMPMOD);
 
-  //The config dir is accessable with correct permissions, lets read/write/create config file now..
+  /* The config dir is accessable with correct permissions, lets read/write/create config file now.. */
   {		/* config shit */
     char cfile[DIRMAX] = "", templine[8192] = "";
 #ifdef LEAF
@@ -1097,7 +1097,7 @@ int main(int argc, char **argv)
             Tcl_Eval(interp, temps);
           }
         } else if (c[0] != '#') {  //now to parse nick/hosts
-          //we have the right uname/uid, safe to setup crontab now.
+          /* we have the right uname/uid, safe to setup crontab now. */
           i++;
           nick = newsplit(&temps);
           if (!nick || !nick[0])

src/misc.c

@@ -833,7 +833,7 @@ int updatebin(int idx, char *par, int autoi)
     return 1;
   }
 
-  //make a backup just in case.
+  /* make a backup just in case. */
 
   egg_snprintf(old, sizeof old, "%s.bin.old", tempdir);
   copyfile(binname, old);
@@ -864,7 +864,7 @@ int updatebin(int idx, char *par, int autoi)
   } 
 #endif /* LEAF */
 
-  //safe to run new binary..
+  /* safe to run new binary.. */
 #ifdef LEAF
   if (!autoi && !localhub) //dont delete pid for auto update!!!
 #endif /* LEAF */

src/mod/channels.mod/cmdschan.c

@@ -1532,8 +1532,8 @@ void show_int(int idx, char *work, int *cnt, char *desc, int state, char *yes, c
   }
   if (!work[0])
     sprintf(work, "  ");
+  /* need to make next line all one char, and then put it into %-30s */
   if (desc && desc[0]) {
-//need to make next line all one char, and then put it into %-30s
     char tmp2[50], tmp3[50];
     tmp2[0] = tmp3[0] = 0;
     strcat(tmp2, BOLD(idx));

src/mod/channels.mod/tclchan.c

@@ -131,7 +131,6 @@ static int tcl_channel_modify(Tcl_Interp * irp, struct chanset_t *chan,
         return TCL_ERROR;
       }
       strncpyz(chan->temp, item[i], sizeof(chan->temp));
-      //Entry just changed so update/recheck it's purpose?
       check_temp(chan);
  */
     } else if (!strcmp(item[i], "topic")) { //this is here for compatability

src/mod/channels.mod/userchan.c

@@ -1129,7 +1129,6 @@ static int write_bans(FILE *f, int idx)
       else
 	fr.chan = BOT_SHARE;
 
-      //if ((fr.chan & BOT_SHARE) || (fr.bot & BOT_GLOBAL)) {
 	if (lfprintf(f, "::%s bans\n", chan->dname) == EOF)
 	  return 0;
 	for (b = chan->bans; b; b = b->next) {
@@ -1146,7 +1145,6 @@ static int write_bans(FILE *f, int idx)
 	  }
 	  free(mask);
 	}
-      //}
     }
   return 1;
 }
@@ -1183,7 +1181,6 @@ static int write_exempts(FILE *f, int idx)
 	get_user_flagrec(dcc[idx].user,&fr,chan->dname);
       else
 	fr.chan = BOT_SHARE;
-//      if ((fr.chan & BOT_SHARE) || (fr.bot & BOT_GLOBAL)) {
 	if (lfprintf(f, "&&%s exempts\n", chan->dname) == EOF)
 	  return 0;
 	for (e = chan->exempts; e; e = e->next) {
@@ -1200,7 +1197,6 @@ static int write_exempts(FILE *f, int idx)
 	  }
 	  free(mask);
 	}
-      //}
     }
   return 1;
 }
@@ -1238,7 +1234,6 @@ static int write_invites(FILE *f, int idx)
 	get_user_flagrec(dcc[idx].user,&fr,chan->dname);
       else
 	fr.chan = BOT_SHARE;
-//      if ((fr.chan & BOT_SHARE) || (fr.bot & BOT_GLOBAL)) {
 	if (lfprintf(f, "$$%s invites\n", chan->dname) == EOF)
 	  return 0;
 	for (ir = chan->invites; ir; ir = ir->next) {
@@ -1255,7 +1250,6 @@ static int write_invites(FILE *f, int idx)
 	  }
 	  free(mask);
 	}
-      //}
     }
   return 1;
 }

src/mod/ctcp.mod/ctcp.c

@@ -21,7 +21,6 @@
 #include "src/modules.h"
 
 #ifdef LEAF
-//#include "server.mod/server.h"
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <sys/utsname.h>
@@ -507,7 +506,7 @@ static int ctcp_VERSION(char *nick, char *uhost, struct userrec *u, char *object
     }
   }
   dprintf(DP_HELP, STR("NOTICE %s :\001%s %s%s\001\n"), nick, keyword, ctcpversion, s);
-//if mirc send second reply here..
+/* if mirc send second reply here.. */
 
   return 1;
 }

src/mod/irc.mod/cmdsirc.c

@@ -469,7 +469,6 @@ static void cmd_op(struct userrec *u, int idx, char *par)
     return;
   }
 
-//  add_mode(chan, '+', 'o', nick);
   if (do_op(nick, chan, 1)) {
     dprintf(idx, "Gave op to %s on %s.\n", nick, chan->dname);
     stats_add(u, 0, 1);

src/mod/irc.mod/irc.c

@@ -106,18 +106,20 @@ static void detect_autokick(char *nick, char *uhost, struct chanset_t *chan, cha
       i++;
   }
 
-//  if ((chan->capslimit)) {
+/*  if ((chan->capslimit)) { */
     while (((msg) && *msg)) {
       if (egg_isupper(*msg))
         i++;
       msg++;
     }
 
-//  if (chan->capslimit && ((i / tot) >= chan->capslimit)) {
-//dprintf(DP_MODE, "PRIVMSG %s :flood stats for %s: %d/%d are CAP, percentage: %d\n", chan->name, nick, i, tot, (i/tot)*100);
-//  if ((((i / tot) * 100) >= 50)) {
-//dprintf(DP_HELP, "PRIVMSG %s :cap flood.\n", chan->dname);
-//  }
+/*
+  if (chan->capslimit && ((i / tot) >= chan->capslimit)) {
+dprintf(DP_MODE, "PRIVMSG %s :flood stats for %s: %d/%d are CAP, percentage: %d\n", chan->name, nick, i, tot, (i/tot)*100);
+  if ((((i / tot) * 100) >= 50)) {
+dprintf(DP_HELP, "PRIVMSG %s :cap flood.\n", chan->dname);
+  }
+*/
 
 }
 
@@ -135,7 +137,7 @@ void makeopline(struct chanset_t *chan, char *nick, char *buf)
   makeplaincookie(chan->dname, nck, plaincookie);
   strcpy(key, botname);
   strcat(key, SALT2);
-//  putlog(LOG_DEBUG, "*", "Encrypting opline for %s with cookie %s and key %s", nck, plaincookie, key);
+/*  putlog(LOG_DEBUG, "*", "Encrypting opline for %s with cookie %s and key %s", nck, plaincookie, key); */
   p = encrypt_string(key, plaincookie);
   strcpy(enccookie, p);
   free(p);
@@ -1230,7 +1232,7 @@ static void check_expired_chanstuff()
 	}
 	m = n;
       }
-     //autovoice of +v users if bot is +y
+      /* autovoice of +v users if bot is +y */
       if (!loading && channel_active(chan) && me_op(chan) && dovoice(chan)) {
         for (m = chan->channel.member; m && m->nick[0]; m = m->next) {
           sprintf(s, "%s!%s", m->nick, m->userhost);

src/mod/irc.mod/irc.h

@@ -80,7 +80,6 @@ void raise_limit(struct chanset_t *);
 #define me_voice ((int(*)(struct chanset_t *))irc_funcs[22])
 #define raise_limit ((void (*)(struct chanset_t *))irc_funcs[23])
 #define enforce_closed ((void (*)(struct chanset_t *))irc_funcs[24])
-//#define getchanmode ((char *(*)(struct chanset_t *))irc_funcs[23])
 
 #endif				/* MAKING_IRC */
 

src/mod/irc.mod/mode.c

@@ -809,7 +809,7 @@ static void got_op(struct chanset_t *chan, char *nick, char *from,
     if ( chk_deop(victim, chan) ||
         (!loading && userlist && channel_bitch(chan) && !chk_op(victim, chan)) ) {	/* chk_op covers +private */
       /* if (target_priority(chan, m, 1)) */
-//        dprintf(DP_MODE, "MODE %s -o %s\n", chan->dname, who);
+/*        dprintf(DP_MODE, "MODE %s -o %s\n", chan->dname, who); */
         add_mode(chan, '-', 'o', who);
 flush_mode(chan, QUICK);
     } else if (reversing) {
@@ -930,7 +930,7 @@ static void got_deop(struct chanset_t *chan, char *nick, char *from,
 	m2->flags &= ~(SENTKICK | SENTDEOP | SENTOP | SENTVOICE | SENTDEVOICE);
 
     chan->channel.do_opreq=1;
-//    request_op(chan);
+/*    request_op(chan); */
 /* need: op */
     if (!nick[0])
       putlog(LOG_MODES, chan->dname, "TS resync deopped me on %s :(",

src/mod/irc.mod/msgcmds.c

@@ -442,7 +442,7 @@ static int msgc_test(char *nick, char *host, struct userrec *u, char *par, char
   private(fr, chan, 1), private(fr, chan, 2), 
   chk_op(fr, chan), chk_voice(fr, chan), chk_deop(fr, chan), chk_devoice(fr, chan));
 
-//  dprintf(DP_HELP, "NOTICE %s :Works :)\n", nick);
+  dprintf(DP_HELP, "NOTICE %s :Works :)\n", nick);
   return 0;
 }
 */

src/mod/modvals.h

@@ -48,7 +48,7 @@
 #define HOOK_5SECONDLY           18
 #define HOOK_HALFHOURLY		 19
 #define REAL_HOOKS		 20
-//#define HOOK_CHANFILE            17
+/* #define HOOK_CHANFILE            17 */
 #define HOOK_SHAREOUT		105
 #define HOOK_SHAREIN		106
 #define HOOK_QSERV		108

src/mod/server.mod/servmsg.c

@@ -132,7 +132,6 @@ static int check_bind_msgc(char *cmd, char *nick, char *from, struct userrec *u,
  */
 static int check_bind_raw(char *from, char *code, char *msg)
 {
-//  return check_bind(BT_raw, code, NULL, from, code, msg);
   return check_bind(BT_raw, code, NULL, from, msg);
 }
 

src/mod/transfer.mod/transfer.c

@@ -704,15 +704,16 @@ static void eof_dcc_send(int idx)
             
       putlog(LOG_BOTS, "*", "Lost binary transfer from %s; aborting.", dcc[y].nick);
       unlink(dcc[idx].u.xfer->filename);
-/* Drop that bot */
-//      dprintf(y, "bye\n");
-//      egg_snprintf(s, sizeof s,"Disconnected %s (aborted binary transfer)", dcc[y].nick);
-//      botnet_send_unlinked(y, dcc[y].nick, s);
-//      chatout("*** %s\n", dcc[y].nick, s);
-//      if (y != idx) {
-//       killsock(dcc[y].sock);
-//       lostdcc(y);
-//      }
+/* Drop that bot 
+      dprintf(y, "bye\n");
+      egg_snprintf(s, sizeof s,"Disconnected %s (aborted binary transfer)", dcc[y].nick);
+      botnet_send_unlinked(y, dcc[y].nick, s);
+      chatout("*** %s\n", dcc[y].nick, s);
+      if (y != idx) {
+       killsock(dcc[y].sock);
+       lostdcc(y);
+      }
+*/
       killsock(dcc[idx].sock);
       lostdcc(idx);
     }
@@ -979,15 +980,17 @@ void eof_dcc_get(int idx)
 #ifdef HUB
     bupdating = 0;
 #endif
-//    dprintf(-dcc[y].sock, "bye\n");
-//    egg_snprintf(s, sizeof s, "Disconnected %s (aborted binary transfer)",
-//		 dcc[y].nick);
-//    botnet_send_unlinked(y, dcc[y].nick, s);
-//    chatout("*** %s\n", s);
-//    if (y != idx) {
-//     killsock(dcc[y].sock);
-//     lostdcc(y);
-//    }
+/*
+    dprintf(-dcc[y].sock, "bye\n");
+    egg_snprintf(s, sizeof s, "Disconnected %s (aborted binary transfer)",
+		 dcc[y].nick);
+    botnet_send_unlinked(y, dcc[y].nick, s);
+    chatout("*** %s\n", s);
+    if (y != idx) {
+     killsock(dcc[y].sock);
+     lostdcc(y);
+    }
+*/
     killsock(dcc[idx].sock);
     lostdcc(idx);
     return;

src/mod/update.mod/update.c

@@ -200,7 +200,7 @@ static void got_nu(char *botnick, char *code, char *par)
      set_user(&USERENTRY_BOTADDR, u1, bi);
 
    /* Change our uplink to them */
-//let cont_link restructure us..
+   /* let cont_link restructure us.. */
      putlog(LOG_MISC, "*", "Changed uplink to %s for update.", botnick);
      botunlink(-2, bot->bot, "Restructure for update.");
      usleep(1000 * 500);
@@ -237,7 +237,7 @@ static void updatein_mod(int idx, char *msg)
 
 void finish_update(int idx)
 {
-  //module_entry *me;
+  /* module_entry *me; */
   struct passwd *pw;
   uid_t id;
   char buf[1024];
@@ -296,7 +296,7 @@ void finish_update(int idx)
 
 static void start_sending_binary(int idx)
 {
-  //module_entry *me;
+  /* module_entry *me; */
 #ifdef HUB
   char update_file[1024];
   char buf2[1024], buf3[1024];
@@ -441,7 +441,7 @@ static void check_updates()
         }
       }
     }
-    //send out notice to update remote bots ...
+    /* send out notice to update remote bots ... */
     sprintf(buf, "nu? %lu", buildts);
     putallbots(buf);
   }

src/net.c

@@ -319,7 +319,7 @@ void cache_my_ip()
   } else {
     gethostname(s, 120);
     if (get_ip(hostname, &cached_myip4_so)) {
-//      error = 3;
+      /* error = 3; */
       cached_myip4_so.sin.sin_family = AF_INET;
       cached_myip4_so.sin.sin_addr.s_addr = INADDR_ANY;
     }
@@ -885,8 +885,8 @@ int ssl_link(register int sock, int state)
         } else if (state == ACCEPT_SSL) {
           err = SSL_accept(socklist[i].ssl);
         }
-//        if ((errs!=SSL_ERROR_WANT_READ)&&(errs!=SSL_ERROR_WANT_WRITE)&& (errs!=SSL_ERROR_WANT_X509_LOOKUP))
-//          break; /* anything not one of these is a sufficient condition to break out... */
+/*        if ((errs!=SSL_ERROR_WANT_READ)&&(errs!=SSL_ERROR_WANT_WRITE)&& (errs!=SSL_ERROR_WANT_X509_LOOKUP)) */
+/*          break;  anything not one of these is a sufficient condition to break out... */
       }
       alarm(0);
   }
@@ -1145,7 +1145,7 @@ static int sockread(char *s, int *len)
 	    *len = 0;
 #ifdef HAVE_SSL
 /*            debug0(STR("CALLING SSL_LINK() FROM SOCKREAD"));
-//            if (!ssl_link(socklist[i].sock))
+            if (!ssl_link(socklist[i].sock))
               debug0(STR("SSL_LINK FAILED"));
             debug0(STR("BACK FROM SSL_LINK()")); */
 #endif /* HAVE_SSL */
@@ -1459,7 +1459,7 @@ int sockgets(char *s, int *len)
   if (p != NULL) {
     *p = 0;
     strcpy(s, xx);
-//    strcpy(xx, p + 1);
+/*    strcpy(xx, p + 1); */
     sprintf(xx, "%s", p + 1);
     if (s[0] && strlen(s) && (s[strlen(s) - 1] == '\r'))
       s[strlen(s) - 1] = 0;
@@ -1580,14 +1580,16 @@ void tputs(register int z, char *s, unsigned int len)
         }
       } else
 #endif /* HAVE_SSL */
-//#ifdef HAVE_ZLIB_H
-//      if (socklist[i].gz) { 		/* gzipped links */
-//        FILE *fp;
-//        fp = gzdopen(z, "wb0");
-//        x = gzwrite(fp, s, len);
-//        
-//      } else
-//#endif /* HAVE_ZLIB_H */
+#ifdef HAVE_ZLIB_H
+/*
+      if (socklist[i].gz) { 		
+        FILE *fp;
+        fp = gzdopen(z, "wb0");
+        x = gzwrite(fp, s, len);
+        
+      } else
+*/
+#endif /* HAVE_ZLIB_H */
         x = write(z, s, len);
       if (x == -1)
 	x = 0;
@@ -1613,8 +1615,9 @@ void tputs(register int z, char *s, unsigned int len)
     inhere = 0;
   }
 
-//  if (socklist[i].encstatus > 0)
-//    free(s);
+/*  if (socklist[i].encstatus > 0)
+    free(s); 
+*/
 }
 
 static int findanyidx(register int z)

src/shell.c

@@ -113,8 +113,9 @@ void free_conf() {
 
 int readconf() 
 {
-//  conf.uid = READ;
-//  conf.uname = strdup(READ);
+/*  conf.uid = READ;
+  conf.uname = strdup(READ);
+*/
   return 0;
 }
 

src/userrec.c

@@ -78,7 +78,7 @@ char *fixfrom(char *s)
 				 * user@host here... */
   /* These are ludicrous. */
   if (strchr("~+-^=", *p) && (p[1] != '@')) /* added check for @ - drummer */
-//    strcpy(p, p + 1);
+/*    strcpy(p, p + 1); */
     sprintf(p, "%s", p + 1);
   /* Bug was: n!~@host -> n!@host  now: n!~@host */
   return buf;

src/users.c

@@ -837,7 +837,6 @@ int readuserfile(char *file, struct userrec **ret)
              newsplit(&options);
              options[strlen(options) - 1] = 0;
 /* Above is a hack to remove { } */
-//             putlog(LOG_MISC, "*", "TCL_CHANNEL_ADD: (%s) %s", chan, options);
              if ((func[37]) (0, chan, options) != TCL_OK) {	/* tcl_channel_add() */
                putlog(LOG_MISC, "*", "Tcl error in userfile on line %d", line);
                free(my_ptr);