BUILD : 1.7.9 (776) BUGS : none NOTES : Prepended all debug messages for consistency.

git-svn-id: svn://svn.anope.org/anope/trunk@776 31f1291d-b8d6-0310-a050-a5561fc1590b


git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@536 5417fbe8-f217-4b02-8779-1006273d7864

25 files changed, 118 insertions, 115 deletions

diff --git a/src/channels.c b/src/channels.c
index f6e5daaff..f0a1596a2 100644
--- a/src/channels.c
+++ b/src/channels.c
@@ -240,7 +240,7 @@ void chan_set_modes(const char *source, Channel * chan, int ac, char **av,
 
             if (!(user = finduser(*av))) {
                 if (debug) {
-                    alog("channel: MODE %s %c%c for nonexistent user %s",
+                    alog("debug: MODE %s %c%c for nonexistent user %s",
                          chan->name, (add ? '+' : '-'), mode, *av);
                 }
                 continue;
@@ -357,7 +357,7 @@ Channel *findchan(const char *chan)
 
     if (!chan || !*chan) {
         if (debug) {
-            alog("Error: findchan() called with NULL values");
+            alog("debug: findchan() called with NULL values");
         }
         return NULL;
     }
@@ -532,7 +532,7 @@ void do_join(const char *source, int ac, char **av)
     }
     if (!user) {
         if (debug) {
-            alog("user: JOIN from nonexistent user %s: %s", source,
+            alog("debug: JOIN from nonexistent user %s: %s", source,
                  merge_args(ac, av));
         }
         return;
@@ -614,7 +614,7 @@ void do_kick(const char *source, int ac, char **av)
         }
         if (!user) {
             if (debug) {
-                alog("user: KICK for nonexistent user %s on %s: %s", s,
+                alog("debug: KICK for nonexistent user %s on %s: %s", s,
                      av[0], merge_args(ac - 2, av + 2));
             }
             continue;
@@ -657,7 +657,7 @@ void do_part(const char *source, int ac, char **av)
     user = finduser(source);
     if (!user) {
         if (debug) {
-            alog("user: PART from nonexistent user %s: %s", source,
+            alog("debug: PART from nonexistent user %s: %s", source,
                  merge_args(ac, av));
         }
         return;
@@ -812,7 +812,7 @@ void do_sjoin(const char *source, int ac, char **av)
             }
             if (!user) {
                 if (debug) {
-                    alog("user: SJOIN for nonexistent user %s on %s", s,
+                    alog("debug: SJOIN for nonexistent user %s on %s", s,
                          av[1]);
                 }
                 return;
@@ -894,7 +894,7 @@ void do_sjoin(const char *source, int ac, char **av)
 
             if (!user) {
                 if (debug) {
-                    alog("user: SJOIN for nonexistent user %s on %s", s,
+                    alog("debug: SJOIN for nonexistent user %s on %s", s,
                          av[1]);
                 }
                 return;
@@ -971,7 +971,7 @@ void do_sjoin(const char *source, int ac, char **av)
             }
             if (!user) {
                 if (debug) {
-                    alog("user: SJOIN for nonexistent user %s on %s", s,
+                    alog("debug: SJOIN for nonexistent user %s on %s", s,
                          av[1]);
                 }
                 return;
@@ -1026,7 +1026,7 @@ void do_sjoin(const char *source, int ac, char **av)
         }
         if (!user) {
             if (debug) {
-                alog("user: SJOIN for nonexistent user %s on %s", source,
+                alog("debug: SJOIN for nonexistent user %s on %s", source,
                      av[1]);
             }
             return;
@@ -1110,7 +1110,7 @@ void do_cmode(const char *source, int ac, char **av)
         ci = cs_findchan(av[0]);
         if (!(ci && (ci->flags & CI_VERBOTEN)))
             if (debug) {
-                alog("channel: MODE %s for nonexistent channel %s",
+                alog("debug: MODE %s for nonexistent channel %s",
                      merge_args(ac - 1, av + 1), av[0]);
             }
         return;
@@ -1154,7 +1154,7 @@ void do_topic(const char *source, int ac, char **av)
 
     if (!c) {
         if (debug) {
-            alog("channel: TOPIC %s for nonexistent channel %s",
+            alog("debug: TOPIC %s for nonexistent channel %s",
                  merge_args(ac - 1, av + 1), av[0]);
         }
         return;
diff --git a/src/chanserv.c b/src/chanserv.c
index 4d197770e..52b22f8fd 100644
--- a/src/chanserv.c
+++ b/src/chanserv.c
@@ -1819,7 +1819,7 @@ ChannelInfo *cs_findchan(const char *chan)
 
     if (!chan || !*chan) {
         if (debug) {
-            alog("Error: finduser() called with NULL values");
+            alog("debug: finduser() called with NULL values");
         }
         return NULL;
     }
diff --git a/src/datafiles.c b/src/datafiles.c
index d8dd30654..5ccbe95ee 100644
--- a/src/datafiles.c
+++ b/src/datafiles.c
@@ -133,7 +133,7 @@ static dbFILE *open_db_write(const char *service, const char *filename,
 
     /* Get the current working directory: */
     if (_getcwd(buffer, _MAX_PATH) == NULL) {
-        alog("debug: Unable to set Current working directory");
+        alog("Warning: Unable to set Current working directory");
     }
 #endif
 
@@ -192,16 +192,16 @@ static dbFILE *open_db_write(const char *service, const char *filename,
 #ifdef _WIN32
         if (debug) {
             if (errno == ENOENT) {
-                alog("Error %d (ENOENT) : the file or directory does not exist", errno, filename);
+                alog("debug: Error %d (ENOENT) : the file or directory does not exist", errno, filename);
             } else if (errno == EACCES) {
-                alog("Error %d (EACCES) : error while attempting to access file", errno);
+                alog("debug: Error %d (EACCES) : error while attempting to access file", errno);
             } else {
-                alog("Error %d", errno);
+                alog("debug: Error %d", errno);
             }
         }
 #else
         if (debug) {
-            alog("Error %d", errno);
+            alog("debug: Error %d", errno);
         }
 #endif
         errno = errno_save;
diff --git a/src/events.c b/src/events.c
index fc627f51a..8d675b976 100644
--- a/src/events.c
+++ b/src/events.c
@@ -224,7 +224,7 @@ int displayHookFromHash(char *name)
     int index = 0;
     index = CMD_HASH(name);
     if (debug > 1) {
-        alog("trying to display message %s", name);
+        alog("debug: trying to display message %s", name);
     }
     for (current = EVENTHOOKS[index]; current; current = current->next) {
         if (stricmp(name, current->name) == 0) {
@@ -232,7 +232,7 @@ int displayHookFromHash(char *name)
         }
     }
     if (debug > 1) {
-        alog("done displaying message %s", name);
+        alog("debug: done displaying message %s", name);
     }
     return 0;
 }
@@ -249,7 +249,7 @@ int displayEvtMessageFromHash(char *name)
     int index = 0;
     index = CMD_HASH(name);
     if (debug > 1) {
-        alog("trying to display message %s", name);
+        alog("debug: trying to display message %s", name);
     }
     for (current = EVENT[index]; current; current = current->next) {
         if (stricmp(name, current->name) == 0) {
@@ -257,7 +257,7 @@ int displayEvtMessageFromHash(char *name)
         }
     }
     if (debug > 1) {
-        alog("done displaying message %s", name);
+        alog("debug: done displaying message %s", name);
     }
     return 0;
 }
@@ -401,7 +401,7 @@ int addEventHandler(EvtMessageHash * msgEvtTable[], EvtMessage * evm)
             evm->next = current->evm;
             current->evm = evm;
             if (debug)
-                alog("existing msg: (0x%p), new msg (0x%p)",
+                alog("debug: existing msg: (0x%p), new msg (0x%p)",
                      (void *) evm->next, (void *) evm);
             return MOD_ERR_OK;
         }
@@ -447,7 +447,7 @@ int addEventHook(EvtHookHash * hookEvtTable[], EvtHook * evh)
             evh->next = current->evh;
             current->evh = evh;
             if (debug)
-                alog("existing msg: (0x%p), new msg (0x%p)",
+                alog("debug: existing msg: (0x%p), new msg (0x%p)",
                      (void *) evh->next, (void *) evh);
             return MOD_ERR_OK;
         }
diff --git a/src/misc.c b/src/misc.c
index 469e449f1..478fe98bb 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -1107,12 +1107,11 @@ char *host_resolve(char *host)
         ntoa(addr, ipbuf, sizeof(ipbuf));
         ipreturn = sstrdup(ipbuf);
         if (debug) {
-	  alog("Resolved %s to %s",host, ipbuf);
+	        alog("debug: resolved %s to %s",host, ipbuf);
         }
         return ipreturn;
-    }
-    else {
-	return ipreturn;
+    } else {
+	    return ipreturn;
     }
 }
 
diff --git a/src/modules.c b/src/modules.c
index 458459f31..60dffdb10 100644
--- a/src/modules.c
+++ b/src/modules.c
@@ -104,9 +104,9 @@ void modules_core_init(int number, char **list)
             mod_current_user = NULL;
             status = loadModule(mod_current_module, NULL);
             if (debug || status) {
-                alog("trying to load core module [%s]",
+                alog("debug: trying to load core module [%s]",
                      mod_current_module->name);
-                alog("status: [%d]", status);
+                alog("debug: status: [%d]", status);
             }
             mod_current_module = NULL;
             mod_current_user = NULL;
@@ -946,7 +946,7 @@ int displayCommandFromHash(CommandHash * cmdTable[], char *name)
     int index = 0;
     index = CMD_HASH(name);
     if (debug > 1) {
-        alog("trying to display command %s", name);
+        alog("debug: trying to display command %s", name);
     }
     for (current = cmdTable[index]; current; current = current->next) {
         if (stricmp(name, current->name) == 0) {
@@ -954,7 +954,7 @@ int displayCommandFromHash(CommandHash * cmdTable[], char *name)
         }
     }
     if (debug > 1) {
-        alog("done displaying command %s", name);
+        alog("debug: done displaying command %s", name);
     }
     return 0;
 }
@@ -990,7 +990,7 @@ int displayMessageFromHash(char *name)
     int index = 0;
     index = CMD_HASH(name);
     if (debug > 1) {
-        alog("trying to display message %s", name);
+        alog("debug: trying to display message %s", name);
     }
     for (current = IRCD[index]; current; current = current->next) {
         if (stricmp(name, current->name) == 0) {
@@ -998,7 +998,7 @@ int displayMessageFromHash(char *name)
         }
     }
     if (debug > 1) {
-        alog("done displaying message %s", name);
+        alog("debug: done displaying message %s", name);
     }
     return 0;
 }
@@ -1060,7 +1060,7 @@ int addCommand(CommandHash * cmdTable[], Command * c, int pos)
                 c->next = current->c;
                 current->c = c;
                 if (debug)
-                    alog("existing cmd: (0x%p), new cmd (0x%p)",
+                    alog("debug: existing cmd: (0x%p), new cmd (0x%p)",
                          (void *) c->next, (void *) c);
                 return MOD_ERR_OK;
             } else if (pos == 2) {
@@ -1069,7 +1069,7 @@ int addCommand(CommandHash * cmdTable[], Command * c, int pos)
                 while (tail->next)
                     tail = tail->next;
                 if (debug)
-                    alog("existing cmd: (0x%p), new cmd (0x%p)",
+                    alog("debug: existing cmd: (0x%p), new cmd (0x%p)",
                          (void *) tail, (void *) c);
                 tail->next = c;
                 c->next = NULL;
@@ -1288,7 +1288,7 @@ int addMessage(MessageHash * msgTable[], Message * m, int pos)
                 m->next = current->m;
                 current->m = m;
                 if (debug)
-                    alog("existing msg: (0x%p), new msg (0x%p)",
+                    alog("debug: existing msg: (0x%p), new msg (0x%p)",
                          (void *) m->next, (void *) m);
                 return MOD_ERR_OK;
             } else if (pos == 2) {
@@ -1296,7 +1296,7 @@ int addMessage(MessageHash * msgTable[], Message * m, int pos)
                 while (tail->next)
                     tail = tail->next;
                 if (debug)
-                    alog("existing msg: (0x%p), new msg (0x%p)",
+                    alog("debug: existing msg: (0x%p), new msg (0x%p)",
                          (void *) tail, (void *) m);
                 tail->next = m;
                 m->next = NULL;
@@ -1569,7 +1569,7 @@ int moduleAddCallback(char *name, time_t when,
         }
     }
     if (debug)
-        alog("Added module CallBack: [%s] due to execute at %ld",
+        alog("debug: added module CallBack: [%s] due to execute at %ld",
              new->name ? new->name : "?", (long int) new->when);
     return MOD_ERR_OK;
 }
@@ -1586,7 +1586,7 @@ void moduleCallBackRun(void)
     tmp = moduleCallBackHead;
     if (tmp->when <= time(NULL)) {
         if (debug)
-            alog("Executing callback: %s", tmp->name ? tmp->name : "?");
+            alog("debug: executing callback: %s", tmp->name ? tmp->name : "?");
         if (tmp->func) {
             mod_current_module_name = tmp->owner_name;
             tmp->func(tmp->argc, tmp->argv);
@@ -1674,7 +1674,7 @@ void moduleDelCallback(char *name)
             if ((strcmp(mod_current_module_name, current->owner_name) == 0)
                 && (strcmp(current->name, name) == 0)) {
                 if (debug) {
-                    alog("Removing CallBack %s for module %s", name,
+                    alog("debug: removing CallBack %s for module %s", name,
                          mod_current_module_name);
                 }
                 tmp = current->next;    /* get a pointer to the next record, as once we delete this record, we'll lose it :) */
@@ -1706,7 +1706,7 @@ void moduleCallBackPrepForUnload(char *mod_name)
     tmp = moduleCallBackFindEntry(mod_name, &found);
     while (found) {
         if (debug) {
-            alog("Removing CallBack for module %s", mod_name);
+            alog("debug: removing CallBack for module %s", mod_name);
         }
         moduleCallBackDeleteEntry(tmp);
         tmp = moduleCallBackFindEntry(mod_name, &found);
diff --git a/src/nickserv.c b/src/nickserv.c
index ac0cdd0ae..a68916c82 100644
--- a/src/nickserv.c
+++ b/src/nickserv.c
@@ -1183,7 +1183,7 @@ NickRequest *findrequestnick(const char *nick)
 
     if (!*nick || !nick) {
         if (debug) {
-            alog("Error: findrequestnick() called with NULL values");
+            alog("debug: findrequestnick() called with NULL values");
         }
         return NULL;
     }
@@ -1204,7 +1204,7 @@ NickAlias *findnick(const char *nick)
 
     if (!nick || !*nick) {
         if (debug) {
-            alog("Error: findnick() called with NULL values");
+            alog("debug: findnick() called with NULL values");
         }
         return NULL;
     }
@@ -1228,7 +1228,7 @@ NickCore *findcore(const char *nick)
 
     if (!nick || !*nick) {
         if (debug) {
-            alog("Error: findcore() called with NULL values");
+            alog("debug: findcore() called with NULL values");
         }
         return NULL;
     }
@@ -1797,8 +1797,8 @@ void clean_ns_timeouts(NickAlias * na)
         next = t->next;
         if (t->na == na) {
             if (debug)
-                alog("%s: deleting timeout type %d from %s", s_NickServ,
-                     t->type, t->na->nick);
+                alog("debug: %s deleting timeout type %d from %s",
+                     s_NickServ, t->type, t->na->nick);
             /* If the timeout has the TO_RELEASE type, we should release the user */
             if (t->type == TO_RELEASE)
                 release(na, 1);
diff --git a/src/process.c b/src/process.c
index f1e97fbed..95307c1ed 100644
--- a/src/process.c
+++ b/src/process.c
@@ -277,7 +277,7 @@ void process()
         }
     } else {
         if (debug)
-            alog("unknown message from server (%s)", inbuf);
+            alog("debug: unknown message from server (%s)", inbuf);
     }
     if (mod_current_op == 1) {
         alog("trying to load [%s]", mod_current_module->name);
diff --git a/src/protocol/bahamut.c b/src/protocol/bahamut.c
index 68a9272ed..942cd88a6 100644
--- a/src/protocol/bahamut.c
+++ b/src/protocol/bahamut.c
@@ -1393,7 +1393,7 @@ int anope_event_error(char *source, int ac, char **av)
 {
     if (ac >= 1) {
         if (debug) {
-            alog("ERROR: %s", av[0]);
+            alog("debug: %s", av[0]);
         }
     }
     return MOD_CONT;
diff --git a/src/protocol/hybrid.c b/src/protocol/hybrid.c
index 613013ec9..a63f00e26 100644
--- a/src/protocol/hybrid.c
+++ b/src/protocol/hybrid.c
@@ -545,7 +545,7 @@ int anope_event_topic(char *source, int ac, char **av)
 
         if (!c) {
             if (debug) {
-                alog("channel: TOPIC %s for nonexistent channel %s",
+                alog("debug: TOPIC %s for nonexistent channel %s",
                      merge_args(ac - 1, av + 1), av[0]);
             }
             return MOD_CONT;
@@ -1345,7 +1345,7 @@ int anope_event_error(char *source, int ac, char **av)
 {
     if (ac >= 1) {
         if (debug) {
-            alog("ERROR: %s", av[0]);
+            alog("debug: %s", av[0]);
         }
     }
     return MOD_CONT;
diff --git a/src/protocol/inspircd.c b/src/protocol/inspircd.c
index f5d28a140..7dbd61e0b 100644
--- a/src/protocol/inspircd.c
+++ b/src/protocol/inspircd.c
@@ -1095,7 +1095,7 @@ int anope_event_setname(char *source, int ac, char **av)
     u = finduser(av[0]);
     if (!u) {
         if (debug) {
-            alog("user: SETNAME for nonexistent user %s", source);
+            alog("debug: SETNAME for nonexistent user %s", source);
         }
         return MOD_CONT;
     }
@@ -1113,7 +1113,7 @@ int anope_event_chgname(char *source, int ac, char **av)
     u = finduser(av[0]);
     if (!u) {
         if (debug) {
-            alog("user: CHGNAME for nonexistent user %s", av[0]);
+            alog("debug: CHGNAME for nonexistent user %s", av[0]);
         }
         return MOD_CONT;
     }
@@ -1141,7 +1141,7 @@ int anope_event_sethost(char *source, int ac, char **av)
     u = finduser(av[0]);
     if (!u) {
         if (debug) {
-            alog("user: SETHOST for nonexistent user %s", source);
+            alog("debug: SETHOST for nonexistent user %s", source);
         }
         return MOD_CONT;
     }
@@ -1192,7 +1192,7 @@ int anope_event_chghost(char *source, int ac, char **av)
     u = finduser(av[0]);
     if (!u) {
         if (debug) {
-            alog("user: CHGHOST for nonexistent user %s", av[0]);
+            alog("debug: CHGHOST for nonexistent user %s", av[0]);
         }
         return MOD_CONT;
     }
diff --git a/src/protocol/plexus.c b/src/protocol/plexus.c
index a6fa39929..afaa7eaa6 100644
--- a/src/protocol/plexus.c
+++ b/src/protocol/plexus.c
@@ -606,7 +606,7 @@ int anope_event_topic(char *source, int ac, char **av)
 
         if (!c) {
             if (debug) {
-                alog("channel: TOPIC %s for nonexistent channel %s",
+                alog("debug: TOPIC %s for nonexistent channel %s",
                      merge_args(ac - 1, av + 1), av[0]);
             }
             return MOD_CONT;
@@ -911,7 +911,7 @@ int anope_event_sethost(char *source, int ac, char **av)
     u = finduser(source);
     if (!u) {
         if (debug) {
-            alog("user: SETHOST for nonexistent user %s", source);
+            alog("debug: SETHOST for nonexistent user %s", source);
         }
         return MOD_CONT;
     }
@@ -1443,7 +1443,7 @@ int anope_event_error(char *source, int ac, char **av)
 {
     if (ac >= 1) {
         if (debug) {
-            alog("ERROR: %s", av[0]);
+            alog("debug: %s", av[0]);
         }
     }
     return MOD_CONT;
diff --git a/src/protocol/ptlink.c b/src/protocol/ptlink.c
index d16d37ba9..e5cf97b7b 100644
--- a/src/protocol/ptlink.c
+++ b/src/protocol/ptlink.c
@@ -425,7 +425,7 @@ int anope_event_newmask(char *source, int ac, char **av)
 
     if (!u) {
         if (debug) {
-            alog("user: NEWMASK for nonexistent user %s", av[0]);
+            alog("debug: NEWMASK for nonexistent user %s", av[0]);
         }
         return MOD_CONT;
     }
@@ -729,7 +729,7 @@ int anope_event_error(char *source, int ac, char **av)
 {
     if (ac >= 1) {
         if (debug) {
-            alog("ERROR: %s", av[0]);
+            alog("debug: %s", av[0]);
         }
     }
     return MOD_CONT;
diff --git a/src/protocol/rageircd.c b/src/protocol/rageircd.c
index f7ae3c890..c06667ebe 100644
--- a/src/protocol/rageircd.c
+++ b/src/protocol/rageircd.c
@@ -443,7 +443,7 @@ int anope_event_vhost(char *source, int ac, char **av)
     u = finduser(av[0]);
     if (!u) {
         if (debug) {
-            alog("user: VHOST for nonexistent user %s", av[0]);
+            alog("debug: VHOST for nonexistent user %s", av[0]);
         }
         return MOD_CONT;
     }
@@ -566,7 +566,7 @@ int anope_event_error(char *source, int ac, char **av)
 {
     if (ac >= 1) {
         if (debug) {
-            alog("ERROR: %s", av[0]);
+            alog("debug: %s", av[0]);
         }
     }
     return MOD_CONT;
diff --git a/src/protocol/ratbox.c b/src/protocol/ratbox.c
index 585d2e014..386633fd0 100644
--- a/src/protocol/ratbox.c
+++ b/src/protocol/ratbox.c
@@ -614,7 +614,7 @@ int anope_event_topic(char *source, int ac, char **av)
 
         if (!c) {
             if (debug) {
-                alog("channel: TOPIC %s for nonexistent channel %s",
+                alog("debug: TOPIC %s for nonexistent channel %s",
                      merge_args(ac - 1, av + 1), av[0]);
             }
             return MOD_CONT;
@@ -664,7 +664,7 @@ int anope_event_tburst(char *source, int ac, char **av)
 
     if (!c) {
         if (debug) {
-            alog("channel: TOPIC %s for nonexistent channel %s",
+            alog("debug: TOPIC %s for nonexistent channel %s",
                  merge_args(ac - 1, av + 1), av[0]);
         }
         return MOD_CONT;
@@ -1650,7 +1650,7 @@ int anope_event_error(char *source, int ac, char **av)
 {
     if (ac >= 1) {
         if (debug) {
-            alog("ERROR: %s", av[0]);
+            alog("debug: %s", av[0]);
         }
     }
     return MOD_CONT;
diff --git a/src/protocol/shadowircd.c b/src/protocol/shadowircd.c
index e3cf55059..8fdab8db0 100644
--- a/src/protocol/shadowircd.c
+++ b/src/protocol/shadowircd.c
@@ -636,7 +636,7 @@ int anope_event_chghost(char *source, int ac, char **av)
     u = find_byuid(av[0]);
     if (!u) {
         if (debug) {
-            alog("user: CHGHOST for nonexistent user %s", av[0]);
+            alog("debug: CHGHOST for nonexistent user %s", av[0]);
         }
         return MOD_CONT;
     }
@@ -657,7 +657,7 @@ int anope_event_topic(char *source, int ac, char **av)
 
         if (!c) {
             if (debug) {
-                alog("channel: TOPIC %s for nonexistent channel %s",
+                alog("debug: TOPIC %s for nonexistent channel %s",
                      merge_args(ac - 1, av + 1), av[0]);
             }
             return MOD_CONT;
@@ -703,7 +703,7 @@ int anope_event_tburst(char *source, int ac, char **av)
 
     if (!c) {
         if (debug) {
-            alog("channel: TOPIC %s for nonexistent channel %s",
+            alog("debug: TOPIC %s for nonexistent channel %s",
                  merge_args(ac - 1, av + 1), av[0]);
         }
         return MOD_CONT;
@@ -1641,7 +1641,7 @@ int anope_event_error(char *source, int ac, char **av)
 {
     if (ac >= 1) {
         if (debug) {
-            alog("ERROR: %s", av[0]);
+            alog("debug: %s", av[0]);
         }
     }
     return MOD_CONT;
diff --git a/src/protocol/solidircd.c b/src/protocol/solidircd.c
index 4cd05427e..8455d1219 100644
--- a/src/protocol/solidircd.c
+++ b/src/protocol/solidircd.c
@@ -712,7 +712,7 @@ int anope_event_vs(char *source, int ac, char **av)
     u = finduser(av[0]);
     if (!u) {
         if (debug) {
-            alog("user: SVHOST for nonexistent user %s", av[0]);
+            alog("debug: SVHOST for nonexistent user %s", av[0]);
         }
         return MOD_CONT;
     }
@@ -1429,7 +1429,7 @@ int anope_event_error(char *source, int ac, char **av)
 {
     if (ac >= 1) {
         if (debug) {
-            alog("ERROR: %s", av[0]);
+            alog("debug: %s", av[0]);
         }
     }
     return MOD_CONT;
diff --git a/src/protocol/ultimate2.c b/src/protocol/ultimate2.c
index 70485ca18..3c3927deb 100644
--- a/src/protocol/ultimate2.c
+++ b/src/protocol/ultimate2.c
@@ -451,7 +451,7 @@ int anope_event_setname(char *source, int ac, char **av)
     u = finduser(source);
     if (!u) {
         if (debug) {
-            alog("user: SETNAME for nonexistent user %s", source);
+            alog("debug: SETNAME for nonexistent user %s", source);
         }
         return MOD_CONT;
     }
@@ -470,7 +470,7 @@ int anope_event_chgname(char *source, int ac, char **av)
     u = finduser(av[0]);
     if (!u) {
         if (debug) {
-            alog("user: CHGNAME for nonexistent user %s", av[0]);
+            alog("debug: CHGNAME for nonexistent user %s", av[0]);
         }
         return MOD_CONT;
     }
@@ -489,7 +489,7 @@ int anope_event_setident(char *source, int ac, char **av)
     u = finduser(source);
     if (!u) {
         if (debug) {
-            alog("user: SETIDENT for nonexistent user %s", source);
+            alog("debug: SETIDENT for nonexistent user %s", source);
         }
         return MOD_CONT;
     }
@@ -508,7 +508,7 @@ int anope_event_chgident(char *source, int ac, char **av)
     u = finduser(av[0]);
     if (!u) {
         if (debug) {
-            alog("user: CHGIDENT for nonexistent user %s", av[0]);
+            alog("debug: CHGIDENT for nonexistent user %s", av[0]);
         }
         return MOD_CONT;
     }
@@ -527,7 +527,7 @@ int anope_event_sethost(char *source, int ac, char **av)
     u = finduser(source);
     if (!u) {
         if (debug) {
-            alog("user: SETHOST for nonexistent user %s", source);
+            alog("debug: SETHOST for nonexistent user %s", source);
         }
         return MOD_CONT;
     }
@@ -564,7 +564,7 @@ int anope_event_chghost(char *source, int ac, char **av)
     u = finduser(av[0]);
     if (!u) {
         if (debug) {
-            alog("user: CHGHOST for nonexistent user %s", av[0]);
+            alog("debug: CHGHOST for nonexistent user %s", av[0]);
         }
         return MOD_CONT;
     }
@@ -1549,7 +1549,7 @@ int anope_event_error(char *source, int ac, char **av)
 {
     if (av[0]) {
         if (debug) {
-            alog("ERROR: %s", av[0]);
+            alog("debug: %s", av[0]);
         }
     }
     return MOD_CONT;
diff --git a/src/protocol/ultimate3.c b/src/protocol/ultimate3.c
index c64500381..7a23faac4 100644
--- a/src/protocol/ultimate3.c
+++ b/src/protocol/ultimate3.c
@@ -539,7 +539,7 @@ int anope_event_sethost(char *source, int ac, char **av)
     u = finduser(av[0]);
     if (!u) {
         if (debug) {
-            alog("user: SETHOST for nonexistent user %s", av[0]);
+            alog("debug: SETHOST for nonexistent user %s", av[0]);
         }
         return MOD_CONT;
     }
@@ -920,7 +920,7 @@ int anope_event_setname(char *source, int ac, char **av)
     u = finduser(source);
     if (!u) {
         if (debug) {
-            alog("user: SETNAME for nonexistent user %s", source);
+            alog("debug: SETNAME for nonexistent user %s", source);
         }
         return MOD_CONT;
     }
@@ -939,7 +939,7 @@ int anope_event_chgname(char *source, int ac, char **av)
     u = finduser(av[0]);
     if (!u) {
         if (debug) {
-            alog("user: CHGNAME for nonexistent user %s", av[0]);
+            alog("debug: CHGNAME for nonexistent user %s", av[0]);
         }
         return MOD_CONT;
     }
@@ -958,7 +958,7 @@ int anope_event_setident(char *source, int ac, char **av)
     u = finduser(source);
     if (!u) {
         if (debug) {
-            alog("user: SETIDENT for nonexistent user %s", source);
+            alog("debug: SETIDENT for nonexistent user %s", source);
         }
         return MOD_CONT;
     }
@@ -976,7 +976,7 @@ int anope_event_chgident(char *source, int ac, char **av)
     u = finduser(av[0]);
     if (!u) {
         if (debug) {
-            alog("user: CHGIDENT for nonexistent user %s", av[0]);
+            alog("debug: CHGIDENT for nonexistent user %s", av[0]);
         }
         return MOD_CONT;
     }
@@ -1564,7 +1564,7 @@ int anope_event_error(char *source, int ac, char **av)
 {
     if (ac >= 1) {
         if (debug) {
-            alog("ERROR: %s", av[0]);
+            alog("debug: %s", av[0]);
         }
     }
     return MOD_CONT;
diff --git a/src/protocol/unreal31.c b/src/protocol/unreal31.c
index a032e4b21..d9d7cf750 100644
--- a/src/protocol/unreal31.c
+++ b/src/protocol/unreal31.c
@@ -1096,7 +1096,7 @@ int anope_event_setname(char *source, int ac, char **av)
     u = finduser(source);
     if (!u) {
         if (debug) {
-            alog("user: SETNAME for nonexistent user %s", source);
+            alog("debug: SETNAME for nonexistent user %s", source);
         }
         return MOD_CONT;
     }
@@ -1115,7 +1115,7 @@ int anope_event_chgname(char *source, int ac, char **av)
     u = finduser(av[0]);
     if (!u) {
         if (debug) {
-            alog("user: CHGNAME for nonexistent user %s", av[0]);
+            alog("debug: CHGNAME for nonexistent user %s", av[0]);
         }
         return MOD_CONT;
     }
@@ -1134,7 +1134,7 @@ int anope_event_setident(char *source, int ac, char **av)
     u = finduser(source);
     if (!u) {
         if (debug) {
-            alog("user: SETIDENT for nonexistent user %s", source);
+            alog("debug: SETIDENT for nonexistent user %s", source);
         }
         return MOD_CONT;
     }
@@ -1152,7 +1152,7 @@ int anope_event_chgident(char *source, int ac, char **av)
     u = finduser(av[0]);
     if (!u) {
         if (debug) {
-            alog("user: CHGIDENT for nonexistent user %s", av[0]);
+            alog("debug: CHGIDENT for nonexistent user %s", av[0]);
         }
         return MOD_CONT;
     }
@@ -1171,7 +1171,7 @@ int anope_event_sethost(char *source, int ac, char **av)
     u = finduser(source);
     if (!u) {
         if (debug) {
-            alog("user: SETHOST for nonexistent user %s", source);
+            alog("debug: SETHOST for nonexistent user %s", source);
         }
         return MOD_CONT;
     }
@@ -1221,7 +1221,7 @@ int anope_event_chghost(char *source, int ac, char **av)
     u = finduser(av[0]);
     if (!u) {
         if (debug) {
-            alog("user: CHGHOST for nonexistent user %s", av[0]);
+            alog("debug: CHGHOST for nonexistent user %s", av[0]);
         }
         return MOD_CONT;
     }
diff --git a/src/protocol/unreal32.c b/src/protocol/unreal32.c
index 01781e415..cee9c8ed1 100644
--- a/src/protocol/unreal32.c
+++ b/src/protocol/unreal32.c
@@ -1300,7 +1300,7 @@ int anope_event_setname(char *source, int ac, char **av)
     u = finduser(source);
     if (!u) {
         if (debug) {
-            alog("user: SETNAME for nonexistent user %s", source);
+            alog("debug: SETNAME for nonexistent user %s", source);
         }
         return MOD_CONT;
     }
@@ -1319,7 +1319,7 @@ int anope_event_chgname(char *source, int ac, char **av)
     u = finduser(av[0]);
     if (!u) {
         if (debug) {
-            alog("user: CHGNAME for nonexistent user %s", av[0]);
+            alog("debug: CHGNAME for nonexistent user %s", av[0]);
         }
         return MOD_CONT;
     }
@@ -1338,7 +1338,7 @@ int anope_event_setident(char *source, int ac, char **av)
     u = finduser(source);
     if (!u) {
         if (debug) {
-            alog("user: SETIDENT for nonexistent user %s", source);
+            alog("debug: SETIDENT for nonexistent user %s", source);
         }
         return MOD_CONT;
     }
@@ -1356,7 +1356,7 @@ int anope_event_chgident(char *source, int ac, char **av)
     u = finduser(av[0]);
     if (!u) {
         if (debug) {
-            alog("user: CHGIDENT for nonexistent user %s", av[0]);
+            alog("debug: CHGIDENT for nonexistent user %s", av[0]);
         }
         return MOD_CONT;
     }
@@ -1375,7 +1375,7 @@ int anope_event_sethost(char *source, int ac, char **av)
     u = finduser(source);
     if (!u) {
         if (debug) {
-            alog("user: SETHOST for nonexistent user %s", source);
+            alog("debug: SETHOST for nonexistent user %s", source);
         }
         return MOD_CONT;
     }
@@ -1465,7 +1465,7 @@ int anope_event_chghost(char *source, int ac, char **av)
     u = finduser(av[0]);
     if (!u) {
         if (debug) {
-            alog("user: CHGHOST for nonexistent user %s", av[0]);
+            alog("debug: CHGHOST for nonexistent user %s", av[0]);
         }
         return MOD_CONT;
     }
@@ -1631,7 +1631,7 @@ int anope_event_error(char *source, int ac, char **av)
 {
     if (av[0]) {
         if (debug) {
-            alog("ERROR: %s", av[0]);
+            alog("debug: %s", av[0]);
         }
     }
     return MOD_CONT;
diff --git a/src/protocol/viagra.c b/src/protocol/viagra.c
index 2c1caa359..851c42268 100644
--- a/src/protocol/viagra.c
+++ b/src/protocol/viagra.c
@@ -435,7 +435,7 @@ int anope_event_setname(char *source, int ac, char **av)
     u = finduser(source);
     if (!u) {
         if (debug) {
-            alog("user: SETNAME for nonexistent user %s", source);
+            alog("debug: SETNAME for nonexistent user %s", source);
         }
         return MOD_CONT;
     }
@@ -460,7 +460,7 @@ int anope_event_chgname(char *source, int ac, char **av)
     u = finduser(av[0]);
     if (!u) {
         if (debug) {
-            alog("user: CHGNAME for nonexistent user %s", av[0]);
+            alog("debug: CHGNAME for nonexistent user %s", av[0]);
         }
         return MOD_CONT;
     }
@@ -479,7 +479,7 @@ int anope_event_setident(char *source, int ac, char **av)
     u = finduser(source);
     if (!u) {
         if (debug) {
-            alog("user: SETIDENT for nonexistent user %s", source);
+            alog("debug: SETIDENT for nonexistent user %s", source);
         }
         return MOD_CONT;
     }
@@ -498,7 +498,7 @@ int anope_event_chgident(char *source, int ac, char **av)
     u = finduser(av[0]);
     if (!u) {
         if (debug) {
-            alog("user: CHGIDENT for nonexistent user %s", av[0]);
+            alog("debug: CHGIDENT for nonexistent user %s", av[0]);
         }
         return MOD_CONT;
     }
@@ -522,7 +522,7 @@ int anope_event_sethost(char *source, int ac, char **av)
     u = finduser(source);
     if (!u) {
         if (debug) {
-            alog("user: SETHOST for nonexistent user %s", source);
+            alog("debug: SETHOST for nonexistent user %s", source);
         }
         return MOD_CONT;
     }
@@ -559,7 +559,7 @@ int anope_event_vs(char *source, int ac, char **av)
     u = finduser(av[0]);
     if (!u) {
         if (debug) {
-            alog("user: VS for nonexistent user %s", av[0]);
+            alog("debug: VS for nonexistent user %s", av[0]);
         }
         return MOD_CONT;
     }
@@ -579,7 +579,7 @@ int anope_event_chghost(char *source, int ac, char **av)
     u = finduser(av[0]);
     if (!u) {
         if (debug) {
-            alog("user: CHGHOST for nonexistent user %s", av[0]);
+            alog("debug: CHGHOST for nonexistent user %s", av[0]);
         }
         return MOD_CONT;
     }
@@ -659,7 +659,7 @@ int anope_event_error(char *source, int ac, char **av)
 {
     if (ac >= 1) {
         if (debug) {
-            alog("ERROR: %s", av[0]);
+            alog("debug: %s", av[0]);
         }
     }
     return MOD_CONT;
diff --git a/src/rdb.c b/src/rdb.c
index d921924e6..a6e17e9c1 100644
--- a/src/rdb.c
+++ b/src/rdb.c
@@ -419,44 +419,44 @@ void rdb_load_dbases(void)
         rdb_load_ns_dbase();
         anope_cmd_pong(ServerName, ServerName);
         if (debug)
-            alog("RDB: Loaded NickServ DataBase (1/8)");
+            alog("debug: RDB Loaded NickServ DataBase (1/8)");
         if (s_HostServ) {
             rdb_load_hs_dbase();
             anope_cmd_pong(ServerName, ServerName);
             if (debug)
-                alog("RDB: Loaded HostServ DataBase (2/8)");
+                alog("debug: RDB Loaded HostServ DataBase (2/8)");
         }
         if (s_BotServ) {
             rdb_load_bs_dbase();
             anope_cmd_pong(ServerName, ServerName);
             if (debug)
-                alog("RDB: Loaded BotServ DataBase (3/8)");
+                alog("debug: RDB Loaded BotServ DataBase (3/8)");
         }
         rdb_load_cs_dbase();
         anope_cmd_pong(ServerName, ServerName);
         if (debug)
-            alog("RDB: Loaded ChanServ DataBase (4/8)");
+            alog("debug: RDB Loaded ChanServ DataBase (4/8)");
     }
     rdb_load_os_dbase();
     anope_cmd_pong(ServerName, ServerName);
     if (debug)
-        alog("RDB: Loaded OperServ DataBase (5/8)");
+        alog("debug: RDB Loaded OperServ DataBase (5/8)");
     rdb_load_news();
     anope_cmd_pong(ServerName, ServerName);
     if (debug)
-        alog("RDB: Loaded News DataBase (6/8)");
+        alog("debug: RDB Loaded News DataBase (6/8)");
     rdb_load_exceptions();
     anope_cmd_pong(ServerName, ServerName);
     if (debug)
-        alog("RDB: Loaded Exception Database (7/8)");
+        alog("debug: RDB Loaded Exception Database (7/8)");
     if (PreNickDBName) {
         rdb_load_ns_req_dbase();
         anope_cmd_pong(ServerName, ServerName);
         if (debug)
-            alog("RDB: Loaded PreNick DataBase (8/8)");
+            alog("debug: RDB Loaded PreNick DataBase (8/8)");
     } else {
         if (debug)
-            alog("RDB: No need to load PreNickDB (8/8)");
+            alog("debug: RDB No need to load PreNickDB (8/8)");
     }
     alog("RDB: All DataBases loaded.");
 }
diff --git a/src/users.c b/src/users.c
index 3f9fb9235..b4f28fde8 100644
--- a/src/users.c
+++ b/src/users.c
@@ -324,7 +324,7 @@ User *finduser(const char *nick)
 
     if (!nick || !*nick) {
         if (debug) {
-            alog("Error: finduser() called with NULL values");
+            alog("debug: finduser() called with NULL values");
         }
         return NULL;
     }
diff --git a/version.log b/version.log
index eb17effb1..00843b2b2 100644
--- a/version.log
+++ b/version.log
@@ -8,10 +8,14 @@
 VERSION_MAJOR="1"
 VERSION_MINOR="7"
 VERSION_PATCH="9"
-VERSION_BUILD="775"
+VERSION_BUILD="776"
 
 # $Log$
 #
+# BUILD : 1.7.9 (776)
+# BUGS  : none
+# NOTES : Prepended all debug messages for consistency.
+#
 # BUILD : 1.7.9 (775)
 # BUGS  : 
 # NOTES : Fixed possible segfaults in ns_maxemail