Index: Changes

===================================================================
RCS file: /home/cmunk/ircsystems/cvsroot/unreal/Changes,v
retrieving revision 1.1.1.1.2.1.2.1.2.2398
diff -u -r1.1.1.1.2.1.2.1.2.2398 Changes
--- Changes	14 May 2007 13:41:57 -0000	1.1.1.1.2.1.2.1.2.2398
+++ Changes	14 May 2007 14:13:50 -0000
@@ -1690,3 +1690,5 @@
   This change should not break extban modules, and should need some more extensive testing.
 - Removed some more confusion in source (module IRC commands vs IRC commands)
 - Changed IRCCommand::friend into IRCCommand::partner
+- Removed an odd declaration in common.h regarding find_user_link
+- Changed make_virthost prototype to not include a C++ keyword

diff --git a/Changes b/Changes
index c16b0901367530738f5ae4dd4fa4f7891fcf4031..fb534e8b1ab4bea662e88df8edeadfb55fdfe3e7 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1690,3 +1690,5 @@ MOTDs
   This change should not break extban modules, and should need some more extensive testing.
 - Removed some more confusion in source (module IRC commands vs IRC commands)
 - Changed IRCCommand::friend into IRCCommand::partner
+- Removed an odd declaration in common.h regarding find_user_link
+- Changed make_virthost prototype to not include a C++ keyword

diff --git a/include/common.h b/include/common.h
index 68b3daa397baf7b7f6db7b56060b1df12afb040f..6fd9cec85c3455d30e679bd5f3001c6d5d46451e 100644 (file)
--- a/include/common.h
+++ b/include/common.h
@@ -230,8 +230,6 @@ static char *StsMalloc(size_t size, char *file, long line)
 
 #endif
 
-extern struct SLink *find_user_link( /* struct SLink *, struct Client * */ );
-
 /*
  * Protocol support text.  DO NO CHANGE THIS unless you know what
  * you are doing.

diff --git a/include/h.h b/include/h.h
index 63f86a1e49b75fdf69a3aee67016ae7b435a1a2c..f6ca3547c14d5b6b8695eb06795cc3535e860353 100644 (file)
--- a/include/h.h
+++ b/include/h.h
@@ -543,7 +543,7 @@ extern aClient *find_server_b64_or_real(char *name);
 extern aClient *find_server_by_base64(char *b64);
 extern int is_chanownprotop(aClient *cptr, aChannel *chptr);
 extern int is_skochanop(aClient *cptr, aChannel *chptr);
-extern char *make_virthost(aClient *sptr, char *curr, char *new, int mode);
+extern char *make_virthost(aClient *sptr, char *curr, char *newhost, int mode);
 extern int  channel_canjoin(aClient *sptr, char *name);
 extern char *collapse(char *pattern);
 extern void dcc_sync(aClient *sptr);

diff --git a/src/cloak.c b/src/cloak.c
index bb4750cce5b2df25a5d239ecdf31c5465e52cf3a..76b0c93b66d5df2e0ffba63608668d97027a496f 100644 (file)
--- a/src/cloak.c
+++ b/src/cloak.c
@@ -34,7 +34,7 @@ static char sccxid[] = "@(#)cloak.c           9.00 7/12/99 UnrealIRCd";
 #include "h.h"
 
 /* mode = 0, just use strncpyzt, 1 = Realloc new and return new pointer */
-char *make_virthost(aClient *sptr, char *curr, char *new, int mode)
+char *make_virthost(aClient *sptr, char *curr, char *newhost, int mode)
 {
 char host[256], *mask, *x, *p, *q;
 
@@ -54,11 +54,11 @@ char host[256], *mask, *x, *p, *q;
 
        if (mode == 0)
        {
-               strlcpy(new, mask, HOSTLEN + 1);
+               strlcpy(newhost, mask, HOSTLEN + 1);
                return NULL;
        }
-       if (new)
-               MyFree(new);
+       if (newhost)
+               MyFree(newhost);
        x = strdup(mask);
        return x;
 }