summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/channels.c2
-rw-r--r--src/modules.c2
-rw-r--r--src/modules/Makefile2
-rw-r--r--src/modules/Makefile.sub2
-rw-r--r--src/protocol/bahamut.c2
-rw-r--r--src/protocol/charybdis.c2
-rw-r--r--src/protocol/dreamforge.c2
-rw-r--r--src/protocol/hybrid.c2
-rw-r--r--src/protocol/inspircd.c2
-rw-r--r--src/protocol/plexus2.c2
-rw-r--r--src/protocol/plexus3.c2
-rw-r--r--src/protocol/ptlink.c2
-rw-r--r--src/protocol/rageircd.c2
-rw-r--r--src/protocol/ratbox.c2
-rw-r--r--src/protocol/shadowircd.c2
-rw-r--r--src/protocol/solidircd.c2
-rw-r--r--src/protocol/ultimate2.c2
-rw-r--r--src/protocol/ultimate3.c2
-rw-r--r--src/protocol/unreal31.c2
-rw-r--r--src/protocol/unreal32.c2
-rw-r--r--src/protocol/viagra.c2
21 files changed, 21 insertions, 21 deletions
diff --git a/src/channels.c b/src/channels.c
index 7242971e1..d734f35f1 100644
--- a/src/channels.c
+++ b/src/channels.c
@@ -1841,7 +1841,7 @@ void set_flood(Channel * chan, char *value)
/*************************************************************************/
-void set_key(Channel * chan, char *value)
+void chan_set_key(Channel * chan, char *value)
{
if (chan->key)
free(chan->key);
diff --git a/src/modules.c b/src/modules.c
index 70e87317b..d37454e67 100644
--- a/src/modules.c
+++ b/src/modules.c
@@ -592,7 +592,7 @@ int loadModule(Module * m, User * u)
} else {
ano_modclose(m->handle);
ano_modclearerr();
- alog("Module %s is compiled against an old version of anope (%d)",m->name,version());
+ alog("Module %s is compiled against an old version of anope",m->name);
return MOD_ERR_NOLOAD;
}
/* TODO */
diff --git a/src/modules/Makefile b/src/modules/Makefile
index 0e5a363f7..cc9a75727 100644
--- a/src/modules/Makefile
+++ b/src/modules/Makefile
@@ -24,7 +24,7 @@ distclean: spotless
$(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -c $<
.o.s:
- $(CC) ${SHARED} ../mod_version.o $< -o $*.so ${LDFLAGS} ${PROFILE}
+ $(CC) ${SHARED} ../mod_version.o $< -o $*.so ${PROFILE}
@$(TOUCH) $*.s
subs:
diff --git a/src/modules/Makefile.sub b/src/modules/Makefile.sub
index 3b5a000ab..4cea2fbb0 100644
--- a/src/modules/Makefile.sub
+++ b/src/modules/Makefile.sub
@@ -19,7 +19,7 @@ distclean: spotless
$(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../ -I../../${INCLUDEDIR} -c $<
so:
- $(CC) ${SHARED} ../../mod_version.o $(OBJECTS) -o ../$(TARGET).so ${LDFLAGS} ${PROFILE}
+ $(CC) ${SHARED} ../../mod_version.o $(OBJECTS) -o ../$(TARGET).so ${PROFILE}
clean:
rm -f *.o *.so *.c~ core
diff --git a/src/protocol/bahamut.c b/src/protocol/bahamut.c
index 62da0fbd6..1d6068e3f 100644
--- a/src/protocol/bahamut.c
+++ b/src/protocol/bahamut.c
@@ -385,7 +385,7 @@ CBMode myCbmodes[128] = {
{0}, /* h */
{CMODE_i, 0, NULL, NULL},
{CMODE_j, 0, set_flood, cs_set_flood}, /* j */
- {CMODE_k, 0, set_key, cs_set_key},
+ {CMODE_k, 0, chan_set_key, cs_set_key},
{CMODE_l, CBM_MINUS_NO_ARG, set_limit, cs_set_limit},
{CMODE_m, 0, NULL, NULL},
{CMODE_n, 0, NULL, NULL},
diff --git a/src/protocol/charybdis.c b/src/protocol/charybdis.c
index 75e292d09..4d879a3a0 100644
--- a/src/protocol/charybdis.c
+++ b/src/protocol/charybdis.c
@@ -359,7 +359,7 @@ CBMode myCbmodes[128] = {
{0}, /* h */
{CMODE_i, 0, NULL, NULL},
{CMODE_j, 0, set_flood, cs_set_flood}, /* j */
- {CMODE_k, 0, set_key, cs_set_key},
+ {CMODE_k, 0, chan_set_key, cs_set_key},
{CMODE_l, CBM_MINUS_NO_ARG, set_limit, cs_set_limit},
{CMODE_m, 0, NULL, NULL},
{CMODE_n, 0, NULL, NULL},
diff --git a/src/protocol/dreamforge.c b/src/protocol/dreamforge.c
index bb48eb34e..a993f9bff 100644
--- a/src/protocol/dreamforge.c
+++ b/src/protocol/dreamforge.c
@@ -352,7 +352,7 @@ CBMode myCbmodes[128] = {
{0}, /* h */
{CMODE_i, 0, NULL, NULL},
{0}, /* j */
- {CMODE_k, 0, set_key, cs_set_key},
+ {CMODE_k, 0, chan_set_key, cs_set_key},
{CMODE_l, CBM_MINUS_NO_ARG, set_limit, cs_set_limit},
{CMODE_m, 0, NULL, NULL},
{CMODE_n, 0, NULL, NULL},
diff --git a/src/protocol/hybrid.c b/src/protocol/hybrid.c
index f725de0c8..8b8a0dcc7 100644
--- a/src/protocol/hybrid.c
+++ b/src/protocol/hybrid.c
@@ -378,7 +378,7 @@ CBMode myCbmodes[128] = {
{0}, /* h */
{CMODE_i, 0, NULL, NULL},
{0}, /* j */
- {CMODE_k, 0, set_key, cs_set_key},
+ {CMODE_k, 0, chan_set_key, cs_set_key},
{CMODE_l, CBM_MINUS_NO_ARG, set_limit, cs_set_limit},
{CMODE_m, 0, NULL, NULL},
{CMODE_n, 0, NULL, NULL},
diff --git a/src/protocol/inspircd.c b/src/protocol/inspircd.c
index 8ee99f601..8500cdfb5 100644
--- a/src/protocol/inspircd.c
+++ b/src/protocol/inspircd.c
@@ -285,7 +285,7 @@ CBMode myCbmodes[128] = {
{0}, /* h */
{CMODE_i, 0, NULL, NULL},
{0}, /* j */
- {CMODE_k, 0, set_key, cs_set_key},
+ {CMODE_k, 0, chan_set_key, cs_set_key},
{CMODE_l, CBM_MINUS_NO_ARG, set_limit, cs_set_limit},
{CMODE_m, 0, NULL, NULL},
{CMODE_n, 0, NULL, NULL},
diff --git a/src/protocol/plexus2.c b/src/protocol/plexus2.c
index 0ce4bbda1..da6414144 100644
--- a/src/protocol/plexus2.c
+++ b/src/protocol/plexus2.c
@@ -444,7 +444,7 @@ CBMode myCbmodes[128] = {
{0}, /* h */
{CMODE_i, 0, NULL, NULL},
{0}, /* j */
- {CMODE_k, 0, set_key, cs_set_key},
+ {CMODE_k, 0, chan_set_key, cs_set_key},
{CMODE_l, CBM_MINUS_NO_ARG, set_limit, cs_set_limit},
{CMODE_m, 0, NULL, NULL},
{CMODE_n, 0, NULL, NULL},
diff --git a/src/protocol/plexus3.c b/src/protocol/plexus3.c
index 3bcc04b8c..2be257a7d 100644
--- a/src/protocol/plexus3.c
+++ b/src/protocol/plexus3.c
@@ -386,7 +386,7 @@ CBMode myCbmodes[128] = {
{0}, /* h */
{CMODE_i, 0, NULL, NULL},
{0}, /* j */
- {CMODE_k, 0, set_key, cs_set_key},
+ {CMODE_k, 0, chan_set_key, cs_set_key},
{CMODE_l, CBM_MINUS_NO_ARG, set_limit, cs_set_limit},
{CMODE_m, 0, NULL, NULL},
{CMODE_n, 0, NULL, NULL},
diff --git a/src/protocol/ptlink.c b/src/protocol/ptlink.c
index 75400144e..c0bb4c347 100644
--- a/src/protocol/ptlink.c
+++ b/src/protocol/ptlink.c
@@ -291,7 +291,7 @@ CBMode myCbmodes[128] = {
{0}, /* h */
{CMODE_i, 0, NULL, NULL},
{0}, /* j */
- {CMODE_k, 0, set_key, cs_set_key},
+ {CMODE_k, 0, chan_set_key, cs_set_key},
{CMODE_l, CBM_MINUS_NO_ARG, set_limit, cs_set_limit},
{CMODE_m, 0, NULL, NULL},
{CMODE_n, 0, NULL, NULL},
diff --git a/src/protocol/rageircd.c b/src/protocol/rageircd.c
index c09c8eb9a..038c450f4 100644
--- a/src/protocol/rageircd.c
+++ b/src/protocol/rageircd.c
@@ -314,7 +314,7 @@ CBMode myCbmodes[128] = {
{0}, /* h */
{CMODE_i, 0, NULL, NULL},
{0}, /* j */
- {CMODE_k, 0, set_key, cs_set_key},
+ {CMODE_k, 0, chan_set_key, cs_set_key},
{CMODE_l, CBM_MINUS_NO_ARG, set_limit, cs_set_limit},
{CMODE_m, 0, NULL, NULL},
{CMODE_n, 0, NULL, NULL},
diff --git a/src/protocol/ratbox.c b/src/protocol/ratbox.c
index e91627ce6..8d37c5d93 100644
--- a/src/protocol/ratbox.c
+++ b/src/protocol/ratbox.c
@@ -360,7 +360,7 @@ CBMode myCbmodes[128] = {
{0}, /* h */
{CMODE_i, 0, NULL, NULL},
{0}, /* j */
- {CMODE_k, 0, set_key, cs_set_key},
+ {CMODE_k, 0, chan_set_key, cs_set_key},
{CMODE_l, CBM_MINUS_NO_ARG, set_limit, cs_set_limit},
{CMODE_m, 0, NULL, NULL},
{CMODE_n, 0, NULL, NULL},
diff --git a/src/protocol/shadowircd.c b/src/protocol/shadowircd.c
index 125012b92..72b580bc1 100644
--- a/src/protocol/shadowircd.c
+++ b/src/protocol/shadowircd.c
@@ -363,7 +363,7 @@ CBMode myCbmodes[128] = {
{0}, /* h */
{CMODE_i, 0, NULL, NULL},
{0}, /* j */
- {CMODE_k, 0, set_key, cs_set_key},
+ {CMODE_k, 0, chan_set_key, cs_set_key},
{CMODE_l, CBM_MINUS_NO_ARG, set_limit, cs_set_limit},
{CMODE_m, 0, NULL, NULL},
{CMODE_n, 0, NULL, NULL},
diff --git a/src/protocol/solidircd.c b/src/protocol/solidircd.c
index 884674c3c..255f157f4 100644
--- a/src/protocol/solidircd.c
+++ b/src/protocol/solidircd.c
@@ -392,7 +392,7 @@ CBMode myCbmodes[128] = {
{0}, /* h */
{CMODE_i, 0, NULL, NULL},
{CMODE_j, 0, set_flood, cs_set_flood}, /* j */
- {CMODE_k, 0, set_key, cs_set_key},
+ {CMODE_k, 0, chan_set_key, cs_set_key},
{CMODE_l, CBM_MINUS_NO_ARG, set_limit, cs_set_limit},
{CMODE_m, 0, NULL, NULL},
{CMODE_n, 0, NULL, NULL},
diff --git a/src/protocol/ultimate2.c b/src/protocol/ultimate2.c
index df92ec58a..36e54c3af 100644
--- a/src/protocol/ultimate2.c
+++ b/src/protocol/ultimate2.c
@@ -355,7 +355,7 @@ CBMode myCbmodes[128] = {
{0}, /* h */
{CMODE_i, 0, NULL, NULL}, /* i */
{0}, /* j */
- {CMODE_k, 0, set_key, cs_set_key},
+ {CMODE_k, 0, chan_set_key, cs_set_key},
{CMODE_l, CBM_MINUS_NO_ARG, set_limit, cs_set_limit},
{CMODE_m, 0, NULL, NULL}, /* m */
{CMODE_n, 0, NULL, NULL}, /* n */
diff --git a/src/protocol/ultimate3.c b/src/protocol/ultimate3.c
index 09ed1f89d..76e080a8f 100644
--- a/src/protocol/ultimate3.c
+++ b/src/protocol/ultimate3.c
@@ -385,7 +385,7 @@ CBMode myCbmodes[128] = {
{0}, /* h */
{CMODE_i, 0, NULL, NULL}, /* i */
{0}, /* j */
- {CMODE_k, 0, set_key, cs_set_key},
+ {CMODE_k, 0, chan_set_key, cs_set_key},
{CMODE_l, CBM_MINUS_NO_ARG, set_limit, cs_set_limit},
{CMODE_m, 0, NULL, NULL}, /* m */
{CMODE_n, 0, NULL, NULL}, /* n */
diff --git a/src/protocol/unreal31.c b/src/protocol/unreal31.c
index 40275140d..fecfea056 100644
--- a/src/protocol/unreal31.c
+++ b/src/protocol/unreal31.c
@@ -268,7 +268,7 @@ CBMode myCbmodes[128] = {
{0}, /* h */
{CMODE_i, 0, NULL, NULL},
{0}, /* j */
- {CMODE_k, 0, set_key, cs_set_key},
+ {CMODE_k, 0, chan_set_key, cs_set_key},
{CMODE_l, CBM_MINUS_NO_ARG, set_limit, cs_set_limit},
{CMODE_m, 0, NULL, NULL},
{CMODE_n, 0, NULL, NULL},
diff --git a/src/protocol/unreal32.c b/src/protocol/unreal32.c
index bd3ae2322..4ad6aa274 100644
--- a/src/protocol/unreal32.c
+++ b/src/protocol/unreal32.c
@@ -316,7 +316,7 @@ CBMode myCbmodes[128] = {
{0}, /* h */
{CMODE_i, 0, NULL, NULL},
{0}, /* j */
- {CMODE_k, 0, set_key, cs_set_key},
+ {CMODE_k, 0, chan_set_key, cs_set_key},
{CMODE_l, CBM_MINUS_NO_ARG, set_limit, cs_set_limit},
{CMODE_m, 0, NULL, NULL},
{CMODE_n, 0, NULL, NULL},
diff --git a/src/protocol/viagra.c b/src/protocol/viagra.c
index fc206a2b6..e3ddcdee9 100644
--- a/src/protocol/viagra.c
+++ b/src/protocol/viagra.c
@@ -334,7 +334,7 @@ CBMode myCbmodes[128] = {
{0}, /* h */
{CMODE_i, 0, NULL, NULL},
{0}, /* j */
- {CMODE_k, 0, set_key, cs_set_key},
+ {CMODE_k, 0, chan_set_key, cs_set_key},
{CMODE_l, CBM_MINUS_NO_ARG, set_limit, cs_set_limit},
{CMODE_m, 0, NULL, NULL},
{CMODE_n, 0, NULL, NULL},