* Removed the code left over from 1.1.8

svn: 1176

src/botcmd.c

@@ -447,14 +447,6 @@ static void bot_shellinfo(int idx, char *par)
   set_user(&USERENTRY_NODENAME, dcc[idx].user, nodename);
 }
 
-
-/* FIXME: remove after 1.1.8 */
-static void bot_sysname(int idx, char *par)
-{
-  dcc[idx].u.bot->sysname[0] = 0;
-  strcpy(dcc[idx].u.bot->sysname, par);
-}
-
 /* who <from@bot> <tobot> <chan#>
  */
 static void bot_who(int idx, char *par)
@@ -1200,7 +1192,6 @@ botcmd_t C_bot[] =
   {"ul",		(Function) bot_unlink},
   {"un",		(Function) bot_unlinked},
   {"v",			(Function) bot_versions},
-  {"vs",		(Function) bot_sysname},
   {"w",			(Function) bot_who},
   {"z",			(Function) bot_zapf},
   {"zb",		(Function) bot_zapfbroad},

src/cmds.c

@@ -2511,11 +2511,6 @@ static void cmd_chattr(struct userrec *u, int idx, char *par)
     pls.match = user.match;
     break_down_flags(chg, &pls, &mns);
 
-/* FIXME: Remove after 1.1.8 */
-    pls.global &=~(USER_BOT);
-    mns.global &=~(USER_BOT);
-
-
     if ((pls.global & USER_UPDATEHUB) && (bot_hublevel(u2) == 999)) {
       dprintf(idx, "Only a hub can be set as the updatehub.\n");
       pls.global &= ~(USER_UPDATEHUB);

src/dcc.c

@@ -170,11 +170,7 @@ greet_new_bot(int idx)
   else
     sysname = un.sysname;
 
-  dprintf(idx, "v 1001500 %d Wraith %s <%s> %d %li %s\n", HANDLEN, egg_version, "-", localhub, buildts,
-          egg_version);
-/* FIXME: remove after 1.1.8 */
-  dprintf(idx, "vs %s\n", sysname);
-  dprintf(idx, "bts %lu\n", buildts);
+  dprintf(idx, "v 1001500 %d Wraith %s <%s> %d %li %s\n", HANDLEN, egg_version, "-", localhub, buildts, egg_version);
 
   dprintf(idx, "si %s %s %s", conf.username ? conf.username : "*", un.sysname ? un.sysname : "*",
           un.nodename ? un.nodename : "*");

src/flags.h

@@ -63,7 +63,7 @@ struct flag_record {
 #define CHAN_VALID (flag_t) 0xfffffffffffff
 
 #define USER_ADMIN	FLAG['a']
-/* FIXME; REMOVE AFTER 1.1.8 */
+/* FIXME; REMOVE AFTER 1.2 */
 #define USER_BOT	FLAG['b']
 #define USER_CHANHUB	FLAG['c']
 #define USER_DEOP	FLAG['d']

src/mod/share.mod/share.c

@@ -391,7 +391,7 @@ share_newuser(int idx, char *par)
 
       fr.match = FR_GLOBAL;
       build_flags(s, &fr, 0);
-/* FIXME: remove after 1.1.8 */
+/* FIXME: remove after 1.2 */
       if (fr.global & USER_BOT) {
         isbot++;
         fr.global &= ~USER_BOT;

src/mod/update.mod/update.c

@@ -297,9 +297,7 @@ static void start_sending_binary(int idx)
 
   putlog(LOG_BOTS, "*", "Sending binary send request to %s", dcc[idx].nick);
   sysname = get_user(&USERENTRY_OS, dcc[idx].user);
-/* FIXME: remove after 1.1.8 */
-  if (!sysname || !sysname[0] || !sysname[1] || !sysname[2] || !strcmp(sysname, ""))
-    sysname = dcc[idx].u.bot->sysname;
+
   if (!sysname || !sysname[0] || !strcmp("*", sysname)) {
     putlog(LOG_MISC, "*", "Cannot update \002%s\002 automatically, uname not returning os name.", dcc[idx].nick);
     return;

src/userrec.c

@@ -274,21 +274,11 @@ int write_user(struct userrec *u, FILE * f, int idx)
   struct chanset_t *cst = NULL;
   struct user_entry *ue = NULL;
   struct flag_record fr = {FR_GLOBAL, 0, 0, 0 };
-/* FIXME: REMOVE AFTER 1.1.8 */
-  int old = 0;
 
   fr.global = u->flags;
 
-/* FIXME: REMOVE AFTER 1.1.8 */
-/* dont save the +b if idx is -1, use -nick instead */
-  if ((idx >= 0) && (u->bot || u->flags & USER_BOT)) {
-    fr.global |= USER_BOT;
-    old++;
-  }
-  
-
   build_flags(s, &fr, NULL);
-  if (lfprintf(f, "%s%-10s - %-24s\n", (u->bot && !old) ? "-" : "", u->handle, s) == EOF)
+  if (lfprintf(f, "%s%-10s - %-24s\n", u->bot ? "-" : "", u->handle, s) == EOF)
     return 0;
   for (ch = u->chanrec; ch; ch = ch->next) {
     cst = findchan_by_dname(ch->channel);

src/users.c

@@ -950,7 +950,7 @@ int readuserfile(const char *file, struct userrec **ret)
 	      break_down_flags(attr, &fr, 0);
 	      strcpy(lasthand, code);
 	      cst = NULL;
-/* FIXME: remove after 1.1.8 */
+/* FIXME: remove after 1.2 */
               if (fr.global & USER_BOT) {	/* this should pick up the old +b flag for now */
                 isbot++;
                 fr.global &= ~USER_BOT;