diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/actions.c | 4 | ||||
| -rw-r--r-- | src/ircd.c | 222 | ||||
| -rw-r--r-- | src/memoserv.c | 1 | ||||
| -rw-r--r-- | src/messages.c | 2 | ||||
| -rw-r--r-- | src/misc.c | 18 | ||||
| -rw-r--r-- | src/send.c | 4 | ||||
| -rw-r--r-- | src/users.c | 6 |
7 files changed, 135 insertions, 122 deletions
diff --git a/src/actions.c b/src/actions.c index 972b343fc..0915d66e2 100644 --- a/src/actions.c +++ b/src/actions.c @@ -212,10 +212,10 @@ void common_unban(ChannelInfo * ci, char *nick) * @param arg the arguments for the user modes * @return void */ -void common_svsmode(User * u, char *modes, char *arg) +void common_svsmode(User * u, const char *modes, const char *arg) { int ac = 1; - char *av[2]; + const char *av[2]; av[0] = modes; if (arg) { diff --git a/src/ircd.c b/src/ircd.c index 1594c3170..6e267c872 100644 --- a/src/ircd.c +++ b/src/ircd.c @@ -126,7 +126,7 @@ int anope_set_mod_current_buffer(int ac, char **av) return 0; } -void anope_set_umode(User * user, int ac, char **av) +void anope_set_umode(User * user, int ac, const char **av) { ircdproto.ircd_set_umode(user, ac, av); } @@ -171,7 +171,7 @@ void anope_cmd_svskill(const char *source, const char *user, const char *fmt, .. ircdproto.ircd_cmd_svskill(source, user, buf); } -void anope_cmd_svsmode(User * u, int ac, char **av) +void anope_cmd_svsmode(User * u, int ac, const char **av) { ircdproto.ircd_cmd_svsmode(u, ac, av); } @@ -206,7 +206,7 @@ void anope_cmd_guest_nick(const char *nick, const char *user, const char *host, ircdproto.ircd_cmd_guest_nick(nick, user, host, real, modes); } -void anope_cmd_mode(const char *source, const char *dest, const const char *fmt, ...) +void anope_cmd_mode(const char *source, const char *dest, const char *fmt, ...) { va_list args; char buf[BUFSIZE]; @@ -444,17 +444,17 @@ void anope_cmd_317(const char *fmt, ...) ircdproto.ircd_cmd_317(buf); } -void anope_cmd_219(char *source, char *letter) +void anope_cmd_219(const char *source, const char *letter) { ircdproto.ircd_cmd_219(source, letter); } -void anope_cmd_401(char *source, char *who) +void anope_cmd_401(const char *source, const char *who) { ircdproto.ircd_cmd_401(source, who); } -void anope_cmd_318(char *source, char *who) +void anope_cmd_318(const char *source, const char *who) { ircdproto.ircd_cmd_318(source, who); } @@ -498,7 +498,7 @@ void anope_cmd_211(const char *fmt, ...) ircdproto.ircd_cmd_211(buf); } -void anope_cmd_global(char *source, const char *fmt, ...) +void anope_cmd_global(const char *source, const char *fmt, ...) { va_list args; char buf[BUFSIZE]; @@ -511,37 +511,37 @@ void anope_cmd_global(char *source, const char *fmt, ...) ircdproto.ircd_cmd_global(source, buf); } -void anope_cmd_global_legacy(char *source, char *fmt) +void anope_cmd_global_legacy(const char *source, const char *fmt) { ircdproto.ircd_cmd_global_legacy(source, fmt); } -void anope_cmd_sqline(char *mask, char *reason) +void anope_cmd_sqline(const char *mask, const char *reason) { ircdproto.ircd_cmd_sqline(mask, reason); } -void anope_cmd_squit(char *servname, char *message) +void anope_cmd_squit(const char *servname, const char *message) { ircdproto.ircd_cmd_squit(servname, message); } -void anope_cmd_svso(char *source, char *nick, char *flag) +void anope_cmd_svso(const char *source, const char *nick, const char *flag) { ircdproto.ircd_cmd_svso(source, nick, flag); } -void anope_cmd_chg_nick(char *oldnick, char *newnick) +void anope_cmd_chg_nick(const char *oldnick, const char *newnick) { ircdproto.ircd_cmd_chg_nick(oldnick, newnick); } -void anope_cmd_svsnick(char *source, char *guest, time_t when) +void anope_cmd_svsnick(const char *source, const char *guest, time_t when) { ircdproto.ircd_cmd_svsnick(source, guest, when); } -void anope_cmd_vhost_on(char *nick, char *vIdent, char *vhost) +void anope_cmd_vhost_on(const char *nick, const char *vIdent, const char *vhost) { ircdproto.ircd_cmd_vhost_on(nick, vIdent, vhost); } @@ -551,47 +551,47 @@ void anope_cmd_connect(int servernum) ircdproto.ircd_cmd_connect(servernum); } -void anope_cmd_svshold(char *nick) +void anope_cmd_svshold(const char *nick) { ircdproto.ircd_cmd_svshold(nick); } -void anope_cmd_release_svshold(char *nick) +void anope_cmd_release_svshold(const char *nick) { ircdproto.ircd_cmd_release_svshold(nick); } -void anope_cmd_unsgline(char *mask) +void anope_cmd_unsgline(const char *mask) { ircdproto.ircd_cmd_unsgline(mask); } -void anope_cmd_unszline(char *mask) +void anope_cmd_unszline(const char *mask) { ircdproto.ircd_cmd_unszline(mask); } -void anope_cmd_szline(char *mask, char *reason, char *whom) +void anope_cmd_szline(const char *mask, const char *reason, const char *whom) { ircdproto.ircd_cmd_szline(mask, reason, whom); } -void anope_cmd_sgline(char *mask, char *reason) +void anope_cmd_sgline(const char *mask, const char *reason) { ircdproto.ircd_cmd_sgline(mask, reason); } -void anope_cmd_unban(char *name, char *nick) +void anope_cmd_unban(const char *name, const char *nick) { ircdproto.ircd_cmd_unban(name, nick); } -void anope_cmd_svsmode_chan(char *name, char *mode, char *nick) +void anope_cmd_svsmode_chan(const char *name, const char *mode, const char *nick) { ircdproto.ircd_cmd_svsmode_chan(name, mode, nick); } -void anope_cmd_svid_umode(char *nick, time_t ts) +void anope_cmd_svid_umode(const char *nick, time_t ts) { ircdproto.ircd_cmd_svid_umode(nick, ts); } @@ -601,27 +601,27 @@ void anope_cmd_nc_change(User * u) ircdproto.ircd_cmd_nc_change(u); } -void anope_cmd_svid_umode2(User * u, char *ts) +void anope_cmd_svid_umode2(User * u, const char *ts) { ircdproto.ircd_cmd_svid_umode2(u, ts); } -void anope_cmd_svid_umode3(User * u, char *ts) +void anope_cmd_svid_umode3(User * u, const char *ts) { ircdproto.ircd_cmd_svid_umode3(u, ts); } -void anope_cmd_svsjoin(char *source, char *nick, char *chan, char *param) +void anope_cmd_svsjoin(const char *source, const char *nick, const char *chan, const char *param) { ircdproto.ircd_cmd_svsjoin(source, nick, chan, param); } -void anope_cmd_svspart(char *source, char *nick, char *chan) +void anope_cmd_svspart(const char *source, const char *nick, const char *chan) { ircdproto.ircd_cmd_svspart(source, nick, chan); } -void anope_cmd_swhois(char *source, char *who, char *mask) +void anope_cmd_swhois(const char *source, const char *who, const char *mask) { ircdproto.ircd_cmd_swhois(source, who, mask); } @@ -631,28 +631,28 @@ void anope_cmd_eob() ircdproto.ircd_cmd_eob(); } -int anope_flood_mode_check(char *value) +int anope_flood_mode_check(const char *value) { return ircdproto.ircd_flood_mode_check(value); } -void anope_cmd_jupe(char *jserver, char *who, char *reason) +void anope_cmd_jupe(const char *jserver, const char *who, const char *reason) { ircdproto.ircd_cmd_jupe(jserver, who, reason); } -int anope_valid_nick(char *nick) +int anope_valid_nick(const char *nick) { return ircdproto.ircd_valid_nick(nick); } -int anope_valid_chan(char *chan) +int anope_valid_chan(const char *chan) { return ircdproto.ircd_valid_chan(chan); } -void anope_cmd_ctcp(char *source, char *dest, const char *fmt, ...) +void anope_cmd_ctcp(const char *source, const char *dest, const char *fmt, ...) { va_list args; char buf[BUFSIZE]; @@ -676,19 +676,19 @@ void pmodule_set_mod_current_buffer(void (*func) (int ac, char **av)) ircdproto.ircd_set_mod_current_buffer = func; } -void pmodule_cmd_svsnoop(void (*func) (char *server, int set)) +void pmodule_cmd_svsnoop(void (*func) (const char *server, int set)) { ircdproto.ircd_cmd_svsnoop = func; } -void pmodule_cmd_remove_akill(void (*func) (char *user, char *host)) +void pmodule_cmd_remove_akill(void (*func) (const char *user, const char *host)) { ircdproto.ircd_cmd_remove_akill = func; } void pmodule_cmd_topic(void (*func) - (char *whosets, char *chan, char *whosetit, - char *topic, time_t when)) + (const char *whosets, const char *chan, const char *whosetit, + const char *topic, time_t when)) { ircdproto.ircd_cmd_topic = func; } @@ -699,254 +699,254 @@ void pmodule_cmd_vhost_off(void (*func) (User * u)) } void pmodule_cmd_akill(void (*func) - (char *user, char *host, char *who, time_t when, - time_t expires, char *reason)) + (const char *user, const char *host, const char *who, time_t when, + time_t expires, const char *reason)) { ircdproto.ircd_cmd_akill = func; } void -pmodule_cmd_svskill(void (*func) (char *source, char *user, char *buf)) +pmodule_cmd_svskill(void (*func) (const char *source, const char *user, const char *buf)) { ircdproto.ircd_cmd_svskill = func; } -void pmodule_cmd_svsmode(void (*func) (User * u, int ac, char **av)) +void pmodule_cmd_svsmode(void (*func) (User * u, int ac, const char **av)) { ircdproto.ircd_cmd_svsmode = func; } -void pmodule_cmd_372(void (*func) (char *source, char *msg)) +void pmodule_cmd_372(void (*func) (const char *source, const char *msg)) { ircdproto.ircd_cmd_372 = func; } -void pmodule_cmd_372_error(void (*func) (char *source)) +void pmodule_cmd_372_error(void (*func) (const char *source)) { ircdproto.ircd_cmd_372_error = func; } -void pmodule_cmd_375(void (*func) (char *source)) +void pmodule_cmd_375(void (*func) (const char *source)) { ircdproto.ircd_cmd_375 = func; } -void pmodule_cmd_376(void (*func) (char *source)) +void pmodule_cmd_376(void (*func) (const char *source)) { ircdproto.ircd_cmd_376 = func; } -void pmodule_cmd_nick(void (*func) (char *nick, char *name, char *modes)) +void pmodule_cmd_nick(void (*func) (const char *nick, const char *name, const char *modes)) { ircdproto.ircd_cmd_nick = func; } void pmodule_cmd_guest_nick(void (*func) - (char *nick, char *user, char *host, - char *real, char *modes)) + (const char *nick, const char *user, const char *host, + const char *real, const char *modes)) { ircdproto.ircd_cmd_guest_nick = func; } -void pmodule_cmd_mode(void (*func) (char *source, char *dest, char *buf)) +void pmodule_cmd_mode(void (*func) (const char *source, const char *dest, const char *buf)) { ircdproto.ircd_cmd_mode = func; } void pmodule_cmd_bot_nick(void (*func) - (char *nick, char *user, char *host, char *real, - char *modes)) + (const char *nick, const char *user, const char *host, const char *real, + const char *modes)) { ircdproto.ircd_cmd_bot_nick = func; } void pmodule_cmd_kick(void (*func) - (char *source, char *chan, char *user, char *buf)) + (const char *source, const char *chan, const char *user, const char *buf)) { ircdproto.ircd_cmd_kick = func; } void -pmodule_cmd_notice_ops(void (*func) (char *source, char *dest, char *buf)) +pmodule_cmd_notice_ops(void (*func) (const char *source, const char *dest, const char *buf)) { ircdproto.ircd_cmd_notice_ops = func; } -void pmodule_cmd_notice(void (*func) (char *source, char *dest, char *buf)) +void pmodule_cmd_notice(void (*func) (const char *source, const char *dest, const char *buf)) { ircdproto.ircd_cmd_notice = func; } void -pmodule_cmd_notice2(void (*func) (char *source, char *dest, char *msg)) +pmodule_cmd_notice2(void (*func) (const char *source, const char *dest, const char *msg)) { ircdproto.ircd_cmd_notice2 = func; } void -pmodule_cmd_privmsg(void (*func) (char *source, char *dest, char *buf)) +pmodule_cmd_privmsg(void (*func) (const char *source, const char *dest, const char *buf)) { ircdproto.ircd_cmd_privmsg = func; } void -pmodule_cmd_privmsg2(void (*func) (char *source, char *dest, char *msg)) +pmodule_cmd_privmsg2(void (*func) (const char *source, const char *dest, const char *msg)) { ircdproto.ircd_cmd_privmsg2 = func; } void -pmodule_cmd_serv_notice(void (*func) (char *source, char *dest, char *msg)) +pmodule_cmd_serv_notice(void (*func) (const char *source, const char *dest, const char *msg)) { ircdproto.ircd_cmd_serv_notice = func; } void pmodule_cmd_serv_privmsg(void (*func) - (char *source, char *dest, char *msg)) + (const char *source, const char *dest, const char *msg)) { ircdproto.ircd_cmd_serv_privmsg = func; } -void pmodule_cmd_bot_chan_mode(void (*func) (char *nick, char *chan)) +void pmodule_cmd_bot_chan_mode(void (*func) (const char *nick, const char *chan)) { ircdproto.ircd_cmd_bot_chan_mode = func; } -void pmodule_cmd_351(void (*func) (char *source)) +void pmodule_cmd_351(void (*func) (const char *source)) { ircdproto.ircd_cmd_351 = func; } -void pmodule_cmd_quit(void (*func) (char *source, char *buf)) +void pmodule_cmd_quit(void (*func) (const char *source, const char *buf)) { ircdproto.ircd_cmd_quit = func; } -void pmodule_cmd_pong(void (*func) (char *servname, char *who)) +void pmodule_cmd_pong(void (*func) (const char *servname, const char *who)) { ircdproto.ircd_cmd_pong = func; } void -pmodule_cmd_join(void (*func) (char *user, char *channel, time_t chantime)) +pmodule_cmd_join(void (*func) (const char *user, const char *channel, time_t chantime)) { ircdproto.ircd_cmd_join = func; } -void pmodule_cmd_unsqline(void (*func) (char *user)) +void pmodule_cmd_unsqline(void (*func) (const char *user)) { ircdproto.ircd_cmd_unsqline = func; } void -pmodule_cmd_invite(void (*func) (char *source, char *chan, char *nick)) +pmodule_cmd_invite(void (*func) (const char *source, const char *chan, const char *nick)) { ircdproto.ircd_cmd_invite = func; } -void pmodule_cmd_part(void (*func) (char *nick, char *chan, char *buf)) +void pmodule_cmd_part(void (*func) (const char *nick, const char *chan, const char *buf)) { ircdproto.ircd_cmd_part = func; } -void pmodule_cmd_391(void (*func) (char *source, char *timestr)) +void pmodule_cmd_391(void (*func) (const char *source, const char *timestr)) { ircdproto.ircd_cmd_391 = func; } -void pmodule_cmd_250(void (*func) (char *buf)) +void pmodule_cmd_250(void (*func) (const char *buf)) { ircdproto.ircd_cmd_250 = func; } -void pmodule_cmd_307(void (*func) (char *buf)) +void pmodule_cmd_307(void (*func) (const char *buf)) { ircdproto.ircd_cmd_307 = func; } -void pmodule_cmd_311(void (*func) (char *buf)) +void pmodule_cmd_311(void (*func) (const char *buf)) { ircdproto.ircd_cmd_311 = func; } -void pmodule_cmd_312(void (*func) (char *buf)) +void pmodule_cmd_312(void (*func) (const char *buf)) { ircdproto.ircd_cmd_312 = func; } -void pmodule_cmd_317(void (*func) (char *buf)) +void pmodule_cmd_317(void (*func) (const char *buf)) { ircdproto.ircd_cmd_317 = func; } -void pmodule_cmd_219(void (*func) (char *source, char *letter)) +void pmodule_cmd_219(void (*func) (const char *source, const char *letter)) { ircdproto.ircd_cmd_219 = func; } -void pmodule_cmd_401(void (*func) (char *source, char *who)) +void pmodule_cmd_401(void (*func) (const char *source, const char *who)) { ircdproto.ircd_cmd_401 = func; } -void pmodule_cmd_318(void (*func) (char *source, char *who)) +void pmodule_cmd_318(void (*func) (const char *source, const char *who)) { ircdproto.ircd_cmd_318 = func; } -void pmodule_cmd_242(void (*func) (char *buf)) +void pmodule_cmd_242(void (*func) (const char *buf)) { ircdproto.ircd_cmd_242 = func; } -void pmodule_cmd_243(void (*func) (char *buf)) +void pmodule_cmd_243(void (*func) (const char *buf)) { ircdproto.ircd_cmd_243 = func; } -void pmodule_cmd_211(void (*func) (char *buf)) +void pmodule_cmd_211(void (*func) (const char *buf)) { ircdproto.ircd_cmd_211 = func; } -void pmodule_cmd_global(void (*func) (char *source, char *buf)) +void pmodule_cmd_global(void (*func) (const char *source, const char *buf)) { ircdproto.ircd_cmd_global = func; } -void pmodule_cmd_global_legacy(void (*func) (char *source, char *fmt)) +void pmodule_cmd_global_legacy(void (*func) (const char *source, const char *fmt)) { ircdproto.ircd_cmd_global_legacy = func; } -void pmodule_cmd_sqline(void (*func) (char *mask, char *reason)) +void pmodule_cmd_sqline(void (*func) (const char *mask, const char *reason)) { ircdproto.ircd_cmd_sqline = func; } -void pmodule_cmd_squit(void (*func) (char *servname, char *message)) +void pmodule_cmd_squit(void (*func) (const char *servname, const char *message)) { ircdproto.ircd_cmd_squit = func; } -void pmodule_cmd_svso(void (*func) (char *source, char *nick, char *flag)) +void pmodule_cmd_svso(void (*func) (const char *source, const char *nick, const char *flag)) { ircdproto.ircd_cmd_svso = func; } -void pmodule_cmd_chg_nick(void (*func) (char *oldnick, char *newnick)) +void pmodule_cmd_chg_nick(void (*func) (const char *oldnick, const char *newnick)) { ircdproto.ircd_cmd_chg_nick = func; } void -pmodule_cmd_svsnick(void (*func) (char *source, char *guest, time_t when)) +pmodule_cmd_svsnick(void (*func) (const char *source, const char *guest, time_t when)) { ircdproto.ircd_cmd_svsnick = func; } void -pmodule_cmd_vhost_on(void (*func) (char *nick, char *vIdent, char *vhost)) +pmodule_cmd_vhost_on(void (*func) (const char *nick, const char *vIdent, const char *vhost)) { ircdproto.ircd_cmd_vhost_on = func; } @@ -956,49 +956,49 @@ void pmodule_cmd_connect(void (*func) (int servernum)) ircdproto.ircd_cmd_connect = func; } -void pmodule_cmd_svshold(void (*func) (char *nick)) +void pmodule_cmd_svshold(void (*func) (const char *nick)) { ircdproto.ircd_cmd_svshold = func; } -void pmodule_cmd_release_svshold(void (*func) (char *nick)) +void pmodule_cmd_release_svshold(void (*func) (const char *nick)) { ircdproto.ircd_cmd_release_svshold = func; } -void pmodule_cmd_unsgline(void (*func) (char *mask)) +void pmodule_cmd_unsgline(void (*func) (const char *mask)) { ircdproto.ircd_cmd_unsgline = func; } -void pmodule_cmd_unszline(void (*func) (char *mask)) +void pmodule_cmd_unszline(void (*func) (const char *mask)) { ircdproto.ircd_cmd_unszline = func; } void -pmodule_cmd_szline(void (*func) (char *mask, char *reason, char *whom)) +pmodule_cmd_szline(void (*func) (const char *mask, const char *reason, const char *whom)) { ircdproto.ircd_cmd_szline = func; } -void pmodule_cmd_sgline(void (*func) (char *mask, char *reason)) +void pmodule_cmd_sgline(void (*func) (const char *mask, const char *reason)) { ircdproto.ircd_cmd_sgline = func; } -void pmodule_cmd_unban(void (*func) (char *name, char *nick)) +void pmodule_cmd_unban(void (*func) (const char *name, const char *nick)) { ircdproto.ircd_cmd_unban = func; } void -pmodule_cmd_svsmode_chan(void (*func) (char *name, char *mode, char *nick)) +pmodule_cmd_svsmode_chan(void (*func) (const char *name, const char *mode, const char *nick)) { ircdproto.ircd_cmd_svsmode_chan = func; } -void pmodule_cmd_svid_umode(void (*func) (char *nick, time_t ts)) +void pmodule_cmd_svid_umode(void (*func) (const char *nick, time_t ts)) { ircdproto.ircd_cmd_svid_umode = func; } @@ -1008,35 +1008,35 @@ void pmodule_cmd_nc_change(void (*func) (User * u)) ircdproto.ircd_cmd_nc_change = func; } -void pmodule_cmd_svid_umode2(void (*func) (User * u, char *ts)) +void pmodule_cmd_svid_umode2(void (*func) (User * u, const char *ts)) { ircdproto.ircd_cmd_svid_umode2 = func; } -void pmodule_cmd_svid_umode3(void (*func) (User * u, char *ts)) +void pmodule_cmd_svid_umode3(void (*func) (User * u, const char *ts)) { ircdproto.ircd_cmd_svid_umode3 = func; } -void pmodule_cmd_ctcp(void (*func) (char *source, char *dest, char *buf)) +void pmodule_cmd_ctcp(void (*func) (const char *source, const char *dest, const char *buf)) { ircdproto.ircd_cmd_ctcp = func; } void pmodule_cmd_svsjoin(void (*func) - (char *source, char *nick, char *chan, - char *param)) + (const char *source, const char *nick, const char *chan, + const char *param)) { ircdproto.ircd_cmd_svsjoin = func; } void -pmodule_cmd_svspart(void (*func) (char *source, char *nick, char *chan)) +pmodule_cmd_svspart(void (*func) (const char *source, const char *nick, const char *chan)) { ircdproto.ircd_cmd_svspart = func; } -void pmodule_cmd_swhois(void (*func) (char *source, char *who, char *mask)) +void pmodule_cmd_swhois(void (*func) (const char *source, const char *who, const char *mask)) { ircdproto.ircd_cmd_swhois = func; } @@ -1047,27 +1047,27 @@ void pmodule_cmd_eob(void (*func) ()) } void -pmodule_cmd_jupe(void (*func) (char *jserver, char *who, char *reason)) +pmodule_cmd_jupe(void (*func) (const char *jserver, const char *who, const char *reason)) { ircdproto.ircd_cmd_jupe = func; } -void pmodule_set_umode(void (*func) (User * user, int ac, char **av)) +void pmodule_set_umode(void (*func) (User * user, int ac, const char **av)) { ircdproto.ircd_set_umode = func; } -void pmodule_valid_nick(int (*func) (char *nick)) +void pmodule_valid_nick(int (*func) (const char *nick)) { ircdproto.ircd_valid_nick = func; } -void pmodule_valid_chan(int (*func) (char *chan)) +void pmodule_valid_chan(int (*func) (const char *chan)) { ircdproto.ircd_valid_chan = func; } -void pmodule_flood_mode_check(int (*func) (char *value)) +void pmodule_flood_mode_check(int (*func) (const char *value)) { ircdproto.ircd_flood_mode_check = func; } @@ -1082,7 +1082,7 @@ void pmodule_ircd_cap(IRCDCAPAB * cap) ircdcap = cap; } -void pmodule_ircd_version(char *version) +void pmodule_ircd_version(const char *version) { version_protocol = sstrdup(version); } @@ -1100,12 +1100,12 @@ void pmodule_ircd_cumodes(CUMode modes[128]) } } -void pmodule_ircd_flood_mode_char_set(char *mode) +void pmodule_ircd_flood_mode_char_set(const char *mode) { flood_mode_char_set = sstrdup(mode); } -void pmodule_ircd_flood_mode_char_remove(char *mode) +void pmodule_ircd_flood_mode_char_remove(const char *mode) { flood_mode_char_remove = sstrdup(mode); } diff --git a/src/memoserv.c b/src/memoserv.c index d0c48a4e7..f23324149 100644 --- a/src/memoserv.c +++ b/src/memoserv.c @@ -18,7 +18,6 @@ /*************************************************************************/ /* *INDENT-OFF* */ -NickCore *nclists[1024]; E void moduleAddMemoServCmds(void); static void new_memo_mail(NickCore *nc, Memo *m); E void rsend_notify(User *u, Memo *m, const char *chan); diff --git a/src/messages.c b/src/messages.c index 627fdfe03..a92dde620 100644 --- a/src/messages.c +++ b/src/messages.c @@ -16,8 +16,6 @@ #include "messages.h" #include "language.h" -int servernum; - /*************************************************************************/ int m_nickcoll(char *user) diff --git a/src/misc.c b/src/misc.c index f63e30b65..24db06728 100644 --- a/src/misc.c +++ b/src/misc.c @@ -178,7 +178,23 @@ char *strnrepl(char *s, int32 size, const char *old, const char *newstr) * @param argv Array * @return string of the merged array */ -char *merge_args(int argc, char **argv) +const char *merge_args(int argc, const char **argv) +{ + int i; + static char s[4096]; + char *t; + + t = s; + for (i = 0; i < argc; i++) + t += snprintf(t, sizeof(s) - (t - s), "%s%s", *argv++, + (i < argc - 1) ? " " : ""); + return s; +} + +/* + * XXX: temporary "safe" version to avoid casting, it's still ugly. + */ +const char *merge_args(int argc, char **argv) { int i; static char s[4096]; diff --git a/src/send.c b/src/send.c index 8a827a1db..9190ee52c 100644 --- a/src/send.c +++ b/src/send.c @@ -218,7 +218,7 @@ void notice_lang(const char *source, User * dest, int message, ...) * @param ... any number of parameters * @return void */ -void notice_help(char *source, User * dest, int message, ...) +void notice_help(const char *source, User * dest, int message, ...) { va_list args; char buf[4096], buf2[4096], outbuf[BUFSIZE]; @@ -325,7 +325,7 @@ void privmsg(char *source, char *dest, const char *fmt, ...) * @param ... any number of parameters * @return void */ -void wallops(char *source, const char *fmt, ...) +void wallops(const char *source, const char *fmt, ...) { va_list args; char buf[BUFSIZE]; diff --git a/src/users.c b/src/users.c index cf794ceca..ca4bd02b4 100644 --- a/src/users.c +++ b/src/users.c @@ -785,7 +785,7 @@ User *do_nick(const char *source, char *nick, char *username, char *host, * av[1] = modes */ -void do_umode(const char *source, int ac, char **av) +void do_umode(const char *source, int ac, const char **av) { User *user; @@ -803,7 +803,7 @@ void do_umode(const char *source, int ac, char **av) * av[0] = modes */ -void do_umode2(const char *source, int ac, char **av) +void do_umode2(const char *source, int ac, const char **av) { User *user; @@ -858,7 +858,7 @@ void do_quit(const char *source, int ac, char **av) * av[1] = reason */ -void do_kill(char *nick, char *msg) +void do_kill(const char *nick, const char *msg) { User *user; NickAlias *na; |