projects
/
srvx.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Avoid adding expire_channels() to the timeq on !expire.
[srvx.git]
/
src
/
chanserv.c
diff --git
a/src/chanserv.c
b/src/chanserv.c
index 8bdad625b8f63bec3d3224049d6a7917ae0db7ad..2d3669684e9c5cb3196ab10dc0e3694a842fd450 100644
(file)
--- a/
src/chanserv.c
+++ b/
src/chanserv.c
@@
-1362,7
+1362,7
@@
unregister_channel(struct chanData *channel, const char *reason)
}
static void
}
static void
-expire_channels(
UNUSED_ARG(void *data)
)
+expire_channels(
void *data
)
{
struct chanData *channel, *next;
struct userData *user;
{
struct chanData *channel, *next;
struct userData *user;
@@
-1392,7
+1392,7
@@
expire_channels(UNUSED_ARG(void *data))
unregister_channel(channel, "registration expired.");
}
unregister_channel(channel, "registration expired.");
}
- if(chanserv_conf.channel_expire_frequency)
+ if(chanserv_conf.channel_expire_frequency
&& !data
)
timeq_add(now + chanserv_conf.channel_expire_frequency, expire_channels, NULL);
}
timeq_add(now + chanserv_conf.channel_expire_frequency, expire_channels, NULL);
}
@@
-4906,7
+4906,7
@@
chanserv_support_channels(void)
static CHANSERV_FUNC(cmd_expire)
{
int channel_count = registered_channels;
static CHANSERV_FUNC(cmd_expire)
{
int channel_count = registered_channels;
- expire_channels(
NULL
);
+ expire_channels(
chanserv
);
reply("CSMSG_CHANNELS_EXPIRED", channel_count - registered_channels);
return 1;
}
reply("CSMSG_CHANNELS_EXPIRED", channel_count - registered_channels);
return 1;
}