svn: 2045

src/conf.c

@@ -131,7 +131,7 @@ spawnbots()
 int
 conf_killbot(const char *botnick, conf_bot *bot, int signal)
 {
-  int return = -1;
+  int ret = -1;
 
   if (bot) {
     if (bot->pid)
@@ -145,6 +145,7 @@ conf_killbot(const char *botnick, conf_bot *bot, int signal)
 
         if (botnick)
           break;
+      }
     }
   }
   return ret;
@@ -463,7 +464,7 @@ conf_delbot(char *botn)
   for (bot = conf.bots; bot && bot->nick; bot = bot->next) {
     if (!strcmp(bot->nick, botn)) {     /* found it! */
       bot->pid = checkpid(bot->nick, bot);
-      killbot(NULL, bot, SIGKILL);
+      conf_killbot(NULL, bot, SIGKILL);
       free_bot(bot);
       return 0;
     }
@@ -844,7 +845,7 @@ void kill_removed_bots(conf_bot *oldlist, conf_bot *newlist)
         }
       }
       if (!found) {
-        killbot(NULL, botold, SIGKILL);
+        conf_killbot(NULL, botold, SIGKILL);
         if ((u = get_user_by_handle(userlist, botold->nick))) {
           putlog(LOG_MISC, "*", "Removing '%s' as it has been removed from the binary config.", botold->nick);
           if (!conf.bot->hub)

src/mod/notes.mod/notes.h

@@ -14,8 +14,8 @@
 /* language #define's */
 
 
-#define NOTES_USAGE			MISC_USAGE
-#define NOTES_USERF_UNKNOWN		USERF_UNKNOWN
+#define NOTES_USAGE			"Usage"
+#define NOTES_USERF_UNKNOWN		"I don't know anyone by that name.\n"
 #define NOTES_FORWARD_TO		"  Forward notes to: %.70s\n"
 #define NOTES_SWITCHED_NOTES		"Switched %d note%s from %s to %s."
 #define NOTES_EXPIRED			"Expired %d note%s"