pegasus/unrealircd
1
0
Fork 0
mirror of https://github.com/unrealircd/unrealircd.git synced 2026-07-05 07:13:14 +02:00
Code Activity

Massively rename Cmode.flag to Cmode.letter.

Browse Source 
(similar to 5a387f9c0b)
This commit is contained in:
Bram Matthys
2021-08-22 18:45:13 +02:00
parent 9838378550
commit 52b4a44e94
35 changed files with 100 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/modules.h
+2 -2
View File
@@ -211,7 +211,7 @@ struct Cmode {
Cmode *prev, *next;
/** mode character (like 'Z') */
char flag;
char letter;
/** unique flag (like 0x10) */
Cmode_t mode;
@@ -315,7 +315,7 @@ struct Cmode {
* For documentation, see Cmode struct.
*/
typedef struct {
char flag;
char letter;
int paracount;
int (*is_ok)(Client *,Channel *, char mode, char *para, int, int);
void * (*put_param)(void *, char *);
src/api-channelmode.c
+30 -30
View File
@@ -64,22 +64,22 @@ void make_extcmodestr()
/* type 2: 1 par to set/unset (has .unset_with_param) */
p = extchmstr[1];
for (cm=channelmodes; cm; cm = cm->next)
if (cm->paracount && cm->flag && cm->unset_with_param)
*p++ = cm->flag;
if (cm->paracount && cm->letter && cm->unset_with_param)
*p++ = cm->letter;
*p = '\0';
/* type 3: 1 param to set, 0 params to unset (does not have .unset_with_param) */
p = extchmstr[2];
for (cm=channelmodes; cm; cm = cm->next)
if (cm->paracount && cm->flag && !cm->unset_with_param)
*p++ = cm->flag;
if (cm->paracount && cm->letter && !cm->unset_with_param)
*p++ = cm->letter;
*p = '\0';
/* type 4: paramless modes */
p = extchmstr[3];
for (cm=channelmodes; cm; cm = cm->next)
if (!cm->paracount && cm->flag)
*p++ = cm->flag;
if (!cm->paracount && cm->letter)
*p++ = cm->letter;
*p = '\0';
}
@@ -97,8 +97,8 @@ static void make_cmodestr(void)
tab++;
}
for (cm=channelmodes; cm; cm = cm->next)
if (cm->flag)
*p++ = cm->flag;
if (cm->letter)
*p++ = cm->letter;
*p = '\0';
}
@@ -158,22 +158,22 @@ void extcmode_init(void)
}
/** Update letter->slot mapping and slot->handler mapping */
void extcmode_para_addslot(Cmode *c, int slot)
void extcmode_para_addslot(Cmode *cm, int slot)
{
if ((slot < 0) || (slot > MAXPARAMMODES))
abort();
c->param_slot = slot;
ParamTable[slot] = c;
param_to_slot_mapping[c->flag] = slot;
cm->param_slot = slot;
ParamTable[slot] = cm;
param_to_slot_mapping[cm->letter] = slot;
}
/** Update letter->slot mapping and slot->handler mapping */
void extcmode_para_delslot(Cmode *c, int slot)
void extcmode_para_delslot(Cmode *cm, int slot)
{
if ((slot < 0) || (slot > MAXPARAMMODES))
abort();
ParamTable[slot] = NULL;
param_to_slot_mapping[c->flag] = 0;
param_to_slot_mapping[cm->letter] = 0;
}
int channelmode_add_sorted_helper(char x, char y)
@@ -199,9 +199,9 @@ void channelmode_add_sorted(Cmode *n)
for (m = channelmodes; m; m = m->next)
{
if (m->flag == '\0')
if (m->letter == '\0')
abort();
if (channelmode_add_sorted_helper(n->flag, m->flag))
if (channelmode_add_sorted_helper(n->letter, m->letter))
{
/* Insert us before */
if (m->prev)
@@ -242,7 +242,7 @@ Cmode *CmodeAdd(Module *module, CmodeInfo req, Cmode_t *mode)
for (cm=channelmodes; cm; cm = cm->next)
{
if (cm->flag == req.flag)
if (cm->letter == req.letter)
{
if (cm->unloaded)
{
@@ -285,7 +285,7 @@ Cmode *CmodeAdd(Module *module, CmodeInfo req, Cmode_t *mode)
}
cm = safe_alloc(sizeof(Cmode));
cm->mode = l;
cm->flag = req.flag;
cm->letter = req.letter;
channelmode_add_sorted(cm);
}
@@ -315,7 +315,7 @@ Cmode *CmodeAdd(Module *module, CmodeInfo req, Cmode_t *mode)
*mode = cm->mode;
/* Update extended channel mode table highest */
cm->flag = req.flag;
cm->letter = req.letter;
cm->paracount = req.paracount;
cm->is_ok = req.is_ok;
cm->put_param = req.put_param;
@@ -394,10 +394,10 @@ static void unload_extcmode_commit(Cmode *cmode)
new_message(&me, NULL, &mtags);
sendto_channel(channel, &me, NULL, 0, 0, SEND_LOCAL, mtags,
":%s MODE %s -%c",
me.name, channel->name, cmode->flag);
me.name, channel->name, cmode->letter);
sendto_server(NULL, 0, 0, mtags,
":%s MODE %s -%c 0",
me.id, channel->name, cmode->flag);
me.id, channel->name, cmode->letter);
free_message_tags(mtags);
channel->mode.mode &= ~cmode->mode;
@@ -415,31 +415,31 @@ static void unload_extcmode_commit(Cmode *cmode)
new_message(&me, NULL, &mtags);
if (cmode->unset_with_param)
{
char *param = cmode->get_param(GETPARASTRUCT(channel, cmode->flag));
char *param = cmode->get_param(GETPARASTRUCT(channel, cmode->letter));
sendto_channel(channel, &me, NULL, 0, 0, SEND_LOCAL, mtags,
":%s MODE %s -%c %s",
me.name, channel->name, cmode->flag, param);
me.name, channel->name, cmode->letter, param);
sendto_server(NULL, 0, 0, mtags,
":%s MODE %s -%c %s 0",
me.id, channel->name, cmode->flag, param);
me.id, channel->name, cmode->letter, param);
} else {
sendto_channel(channel, &me, NULL, 0, 0, SEND_LOCAL, mtags,
":%s MODE %s -%c",
me.name, channel->name, cmode->flag);
me.name, channel->name, cmode->letter);
sendto_server(NULL, 0, 0, mtags,
":%s MODE %s -%c 0",
me.id, channel->name, cmode->flag);
me.id, channel->name, cmode->letter);
}
free_message_tags(mtags);
cmode->free_param(GETPARASTRUCT(channel, cmode->flag));
cmode->free_param(GETPARASTRUCT(channel, cmode->letter));
channel->mode.mode &= ~cmode->mode;
}
}
extcmode_para_delslot(cmode, cmode->param_slot);
}
cmode->flag = '\0';
cmode->letter = '\0';
}
/** Unload all unused channel modes after a REHASH */
@@ -450,7 +450,7 @@ void unload_all_unused_extcmodes(void)
for (cm=channelmodes; cm; cm = cm_next)
{
cm_next = cm->next;
if (cm->flag && cm->unloaded)
if (cm->letter && cm->unloaded)
{
unload_extcmode_commit(cm);
}
@@ -597,7 +597,7 @@ int module_has_extcmode_param_mode(Module *mod)
Cmode *cm;
for (cm=channelmodes; cm; cm = cm->next)
if ((cm->flag) && (cm->owner == mod) && (cm->paracount))
if ((cm->letter) && (cm->owner == mod) && (cm->paracount))
return 1;
return 0;
src/channel.c
+7 -7
View File
@@ -577,7 +577,7 @@ int has_channel_mode(Channel *channel, char mode)
Cmode *cm;
for (cm=channelmodes; cm; cm = cm->next)
if ((cm->flag == mode) && (channel->mode.mode & cm->mode))
if ((cm->letter == mode) && (channel->mode.mode & cm->mode))
return 1;
return 0; /* Not found */
@@ -589,7 +589,7 @@ Cmode_t get_extmode_bitbychar(char m)
Cmode *cm;
for (cm=channelmodes; cm; cm = cm->next)
if (cm->flag == m)
if (cm->letter == m)
return cm->mode;
return 0;
@@ -626,24 +626,24 @@ void channel_modes(Client *client, char *mbuf, char *pbuf, size_t mbuf_size, siz
{
if (!mbuf_size)
break;
if (cm->flag &&
if (cm->letter &&
!cm->paracount &&
!(hide_local_modes && cm->local) &&
(channel->mode.mode & cm->mode))
{
*mbuf++ = cm->flag;
*mbuf++ = cm->letter;
mbuf_size--;
}
}
for (cm=channelmodes; cm; cm = cm->next)
{
if (cm->flag &&
if (cm->letter &&
cm->paracount &&
!(hide_local_modes && cm->local) &&
(channel->mode.mode & cm->mode))
{
char flag = cm->flag;
char flag = cm->letter;
if (mbuf_size) {
*mbuf++ = flag;
mbuf_size--;
@@ -1130,7 +1130,7 @@ int parse_chanmode(ParseMode *pm, char *modebuf_in, char *parabuf_in)
int found = 0;
for (cm=channelmodes; cm; cm = cm->next)
{
if (cm->flag == *pm->modebuf)
if (cm->letter == *pm->modebuf)
{
found = 1;
break;
src/conf.c
+6 -6
View File
@@ -610,9 +610,9 @@ void conf_channelmodes(char *modes, struct ChMode *store)
found = 0;
for (cm=channelmodes; cm; cm = cm->next)
{
if (!(cm->flag))
if (!(cm->letter))
continue;
if (*m == cm->flag)
if (*m == cm->letter)
{
found = 1;
if (cm->paracount)
@@ -629,7 +629,7 @@ void conf_channelmodes(char *modes, struct ChMode *store)
config_warn("set::modes-on-join '%s'. Parameter for mode %c is invalid (%s).", modes, *m, param_in);
break; /* invalid parameter fmt, do not set mode. */
}
safe_strdup(store->extparams[cm->flag], param);
safe_strdup(store->extparams[cm->letter], param);
/* Get next parameter */
param = strtoken(&save, NULL, " ");
}
@@ -655,14 +655,14 @@ void chmode_str(struct ChMode *modes, char *mbuf, char *pbuf, size_t mbuf_size,
for (cm=channelmodes; cm; cm = cm->next)
{
if (!(cm->flag))
if (!(cm->letter))
continue;
if (modes->extmodes & cm->mode)
{
if (mbuf_size)
{
*mbuf++ = cm->flag;
*mbuf++ = cm->letter;
if (!--mbuf_size)
{
*--mbuf=0;
@@ -671,7 +671,7 @@ void chmode_str(struct ChMode *modes, char *mbuf, char *pbuf, size_t mbuf_size,
}
if (cm->paracount)
{
strlcat(pbuf, modes->extparams[cm->flag], pbuf_size);
strlcat(pbuf, modes->extparams[cm->letter], pbuf_size);
strlcat(pbuf, " ", pbuf_size);
}
}
src/modules/chanmodes/censor.c
+1 -1
View File
@@ -49,7 +49,7 @@ MOD_INIT()
memset(&req, 0, sizeof(req));
req.paracount = 0;
req.is_ok = extcmode_default_requirechop;
req.flag = 'G';
req.letter = 'G';
CmodeAdd(modinfo->handle, req, &EXTMODE_CENSOR);
HookAdd(modinfo->handle, HOOKTYPE_CAN_SEND_TO_CHANNEL, 0, censor_can_send_to_channel);
src/modules/chanmodes/delayjoin.c
+2 -2
View File
@@ -46,13 +46,13 @@ MOD_INIT()
memset(&req, 0, sizeof(req));
req.paracount = 0;
req.is_ok = extcmode_default_requirechop;
req.flag = 'D';
req.letter = 'D';
CmodeDelayed = CmodeAdd(modinfo->handle, req, &EXTMODE_DELAYED);
memset(&req, 0, sizeof(req));
req.paracount = 0;
req.is_ok = deny_all;
req.flag = 'd';
req.letter = 'd';
req.local = 1;
CmodePostDelayed = CmodeAdd(modinfo->handle, req, &EXTMODE_POST_DELAYED);
src/modules/chanmodes/floodprot.c
+1 -1
View File
@@ -165,7 +165,7 @@ MOD_INIT()
memset(&creq, 0, sizeof(creq));
creq.paracount = 1;
creq.is_ok = cmodef_is_ok;
creq.flag = 'f';
creq.letter = 'f';
creq.unset_with_param = 1; /* ah yeah, +f is special! */
creq.put_param = cmodef_put_param;
creq.get_param = cmodef_get_param;
src/modules/chanmodes/history.c
+1 -1
View File
@@ -77,7 +77,7 @@ MOD_INIT()
memset(&creq, 0, sizeof(creq));
creq.paracount = 1;
creq.is_ok = history_chanmode_is_ok;
creq.flag = 'H';
creq.letter = 'H';
creq.put_param = history_chanmode_put_param;
creq.get_param = history_chanmode_get_param;
creq.conv_param = history_chanmode_conv_param;
src/modules/chanmodes/inviteonly.c
+1 -1
View File
@@ -43,7 +43,7 @@ MOD_INIT()
memset(&req, 0, sizeof(req));
req.paracount = 0;
req.flag = 'i';
req.letter = 'i';
req.is_ok = extcmode_default_requirehalfop;
CmodeAdd(modinfo->handle, req, &EXTCMODE_INVITE_ONLY);
src/modules/chanmodes/isregistered.c
+1 -1
View File
@@ -43,7 +43,7 @@ MOD_INIT()
memset(&req, 0, sizeof(req));
req.paracount = 0;
req.flag = 'r';
req.letter = 'r';
req.is_ok = isregistered_chanmode_is_ok;
CmodeAdd(modinfo->handle, req, &EXTCMODE_REGISTERED);
src/modules/chanmodes/issecure.c
+1 -1
View File
@@ -64,7 +64,7 @@ CmodeInfo req;
memset(&req, 0, sizeof(req));
req.paracount = 0;
req.is_ok = modeZ_is_ok;
req.flag = 'Z';
req.letter = 'Z';
req.local = 1; /* local channel mode */
CmodeAdd(modinfo->handle, req, &EXTCMODE_ISSECURE);
src/modules/chanmodes/key.c
+1 -1
View File
@@ -61,7 +61,7 @@ MOD_INIT()
memset(&creq, 0, sizeof(creq));
creq.paracount = 1;
creq.is_ok = cmode_key_is_ok;
creq.flag = 'k';
creq.letter = 'k';
creq.unset_with_param = 1; /* yeah... +k is like this */
creq.put_param = cmode_key_put_param;
creq.get_param = cmode_key_get_param;
src/modules/chanmodes/limit.c
+1 -1
View File
@@ -63,7 +63,7 @@ MOD_INIT()
memset(&creq, 0, sizeof(creq));
creq.paracount = 1;
creq.is_ok = cmode_limit_is_ok;
creq.flag = 'l';
creq.letter = 'l';
creq.put_param = cmode_limit_put_param;
creq.get_param = cmode_limit_get_param;
creq.conv_param = cmode_limit_conv_param;
src/modules/chanmodes/link.c
+1 -1
View File
@@ -69,7 +69,7 @@ MOD_INIT()
memset(&req, 0, sizeof(req));
req.paracount = 1;
req.is_ok = cmodeL_is_ok;
req.flag = 'L';
req.letter = 'L';
req.unset_with_param = 1; /* Oh yeah, we are special! */
req.put_param = cmodeL_put_param;
req.get_param = cmodeL_get_param;
src/modules/chanmodes/moderated.c
+1 -1
View File
@@ -44,7 +44,7 @@ MOD_INIT()
memset(&req, 0, sizeof(req));
req.paracount = 0;
req.flag = 'm';
req.letter = 'm';
req.is_ok = extcmode_default_requirehalfop;
CmodeAdd(modinfo->handle, req, &EXTCMODE_MODERATED);
src/modules/chanmodes/nocolor.c
+1 -1
View File
@@ -50,7 +50,7 @@ CmodeInfo req;
/* Channel mode */
memset(&req, 0, sizeof(req));
req.paracount = 0;
req.flag = 'c';
req.letter = 'c';
req.is_ok = extcmode_default_requirechop;
CmodeAdd(modinfo->handle, req, &EXTCMODE_NOCOLOR);
src/modules/chanmodes/noctcp.c
+1 -1
View File
@@ -47,7 +47,7 @@ CmodeInfo req;
memset(&req, 0, sizeof(req));
req.paracount = 0;
req.flag = 'C';
req.letter = 'C';
req.is_ok = extcmode_default_requirehalfop;
CmodeAdd(modinfo->handle, req, &EXTCMODE_NOCTCP);
src/modules/chanmodes/noexternalmsgs.c
+1 -1
View File
@@ -43,7 +43,7 @@ MOD_INIT()
memset(&req, 0, sizeof(req));
req.paracount = 0;
req.flag = 'n';
req.letter = 'n';
req.is_ok = extcmode_default_requirehalfop;
CmodeAdd(modinfo->handle, req, &EXTCMODE_NO_EXTERNAL_MESSAGES);
src/modules/chanmodes/noinvite.c
+1 -1
View File
@@ -48,7 +48,7 @@ MOD_INIT()
memset(&req, 0, sizeof(req));
req.paracount = 0;
req.flag = 'V';
req.letter = 'V';
req.is_ok = extcmode_default_requirechop;
CmodeAdd(modinfo->handle, req, &EXTCMODE_NOINVITE);
src/modules/chanmodes/nokick.c
+1 -1
View File
@@ -46,7 +46,7 @@ MOD_INIT()
memset(&req, 0, sizeof(req));
req.paracount = 0;
req.flag = 'Q';
req.letter = 'Q';
req.is_ok = extcmode_default_requirechop;
CmodeAdd(modinfo->handle, req, &EXTCMODE_NOKICK);
src/modules/chanmodes/noknock.c
+1 -1
View File
@@ -47,7 +47,7 @@ CmodeInfo req;
memset(&req, 0, sizeof(req));
req.paracount = 0;
req.flag = 'K';
req.letter = 'K';
req.is_ok = noknock_mode_allow;
CmodeAdd(modinfo->handle, req, &EXTCMODE_NOKNOCK);
src/modules/chanmodes/nonickchange.c
+1 -1
View File
@@ -46,7 +46,7 @@ CmodeInfo req;
memset(&req, 0, sizeof(req));
req.paracount = 0;
req.flag = 'N';
req.letter = 'N';
req.is_ok = extcmode_default_requirehalfop;
CmodeAdd(modinfo->handle, req, &EXTCMODE_NONICKCHANGE);
src/modules/chanmodes/nonotice.c
+1 -1
View File
@@ -45,7 +45,7 @@ MOD_INIT()
memset(&req, 0, sizeof(req));
req.paracount = 0;
req.flag = 'T';
req.letter = 'T';
req.is_ok = extcmode_default_requirechop;
CmodeAdd(modinfo->handle, req, &EXTCMODE_NONOTICE);
src/modules/chanmodes/operonly.c
+1 -1
View File
@@ -48,7 +48,7 @@ CmodeInfo req;
memset(&req, 0, sizeof(req));
req.paracount = 0;
req.flag = 'O';
req.letter = 'O';
req.is_ok = operonly_require_oper;
CmodeAdd(modinfo->handle, req, &EXTCMODE_OPERONLY);
src/modules/chanmodes/permanent.c
+1 -1
View File
@@ -72,7 +72,7 @@ CmodeInfo req;
memset(&req, 0, sizeof(req));
req.paracount = 0;
req.flag = 'P';
req.letter = 'P';
req.is_ok = permanent_is_ok;
CmodeAdd(modinfo->handle, req, &EXTMODE_PERMANENT);
src/modules/chanmodes/private.c
+1 -1
View File
@@ -43,7 +43,7 @@ MOD_INIT()
memset(&req, 0, sizeof(req));
req.paracount = 0;
req.flag = 'p';
req.letter = 'p';
req.is_ok = extcmode_default_requirehalfop;
CmodeAdd(modinfo->handle, req, &EXTCMODE_PRIVATE);
src/modules/chanmodes/regonly.c
+1 -1
View File
@@ -47,7 +47,7 @@ CmodeInfo req;
memset(&req, 0, sizeof(req));
req.paracount = 0;
req.flag = 'R';
req.letter = 'R';
req.is_ok = extcmode_default_requirehalfop;
CmodeAdd(modinfo->handle, req, &EXTCMODE_REGONLY);
src/modules/chanmodes/regonlyspeak.c
+1 -1
View File
@@ -48,7 +48,7 @@ MOD_INIT()
memset(&req, 0, sizeof(req));
req.paracount = 0;
req.flag = 'M';
req.letter = 'M';
req.is_ok = extcmode_default_requirehalfop;
CmodeAdd(modinfo->handle, req, &EXTCMODE_REGONLYSPEAK);
src/modules/chanmodes/secret.c
+1 -1
View File
@@ -43,7 +43,7 @@ MOD_INIT()
memset(&req, 0, sizeof(req));
req.paracount = 0;
req.flag = 's';
req.letter = 's';
req.is_ok = extcmode_default_requirehalfop;
CmodeAdd(modinfo->handle, req, &EXTCMODE_SECRET);
src/modules/chanmodes/secureonly.c
+1 -1
View File
@@ -49,7 +49,7 @@ MOD_INIT()
memset(&req, 0, sizeof(req));
req.paracount = 0;
req.flag = 'z';
req.letter = 'z';
req.is_ok = extcmode_default_requirechop;
CmodeAdd(modinfo->handle, req, &EXTCMODE_SECUREONLY);
src/modules/chanmodes/stripcolor.c
+1 -1
View File
@@ -50,7 +50,7 @@ CmodeInfo req;
/* Channel mode */
memset(&req, 0, sizeof(req));
req.paracount = 0;
req.flag = 'S';
req.letter = 'S';
req.is_ok = extcmode_default_requirechop;
CmodeAdd(modinfo->handle, req, &EXTCMODE_STRIPCOLOR);
src/modules/chanmodes/topiclimit.c
+1 -1
View File
@@ -41,7 +41,7 @@ MOD_INIT()
memset(&req, 0, sizeof(req));
req.paracount = 0;
req.flag = 't';
req.letter = 't';
req.is_ok = extcmode_default_requirehalfop;
CmodeAdd(modinfo->handle, req, &EXTCMODE_TOPIC_LIMIT);
src/modules/join.c
+2 -2
View File
@@ -265,10 +265,10 @@ void _join_channel(Channel *channel, Client *client, MessageTag *recv_mtags, int
/* Param fun */
for (cm=channelmodes; cm; cm = cm->next)
{
if (!cm->flag || !cm->paracount)
if (!cm->letter || !cm->paracount)
continue;
if (channel->mode.mode & cm->mode)
cm_putparameter(channel, cm->flag, iConf.modes_on_join.extparams[cm->flag]);
cm_putparameter(channel, cm->letter, iConf.modes_on_join.extparams[cm->letter]);
}
*modebuf = *parabuf = 0;
src/modules/mode.c
+12 -12
View File
@@ -446,7 +446,7 @@ void make_mode_str(Channel *channel, Cmode_t oldem, int pcount,
/* + paramless extmodes... */
for (cm=channelmodes; cm; cm = cm->next)
{
if (!cm->flag || cm->paracount)
if (!cm->letter || cm->paracount)
continue;
/* have it now and didn't have it before? */
if ((channel->mode.mode & cm->mode) &&
@@ -457,7 +457,7 @@ void make_mode_str(Channel *channel, Cmode_t oldem, int pcount,
*x++ = '+';
what = MODE_ADD;
}
*x++ = cm->flag;
*x++ = cm->letter;
}
}
@@ -468,7 +468,7 @@ void make_mode_str(Channel *channel, Cmode_t oldem, int pcount,
*/
for (cm=channelmodes; cm; cm = cm->next)
{
if (!cm->flag || cm->unset_with_param)
if (!cm->letter || cm->unset_with_param)
continue;
/* don't have it now and did have it before */
if (!(channel->mode.mode & cm->mode) &&
@@ -479,7 +479,7 @@ void make_mode_str(Channel *channel, Cmode_t oldem, int pcount,
*x++ = '-';
what = MODE_DEL;
}
*x++ = cm->flag;
*x++ = cm->letter;
}
}
@@ -857,7 +857,7 @@ int do_extmode_char(Channel *channel, Cmode *handler, char *param, u_int what,
Client *client, u_int *pcount, char pvar[MAXMODEPARAMS][MODEBUFLEN + 3])
{
int paracnt = (what == MODE_ADD) ? handler->paracount : 0;
char mode = handler->flag;
char mode = handler->letter;
int x;
char *morphed;
@@ -895,7 +895,7 @@ int do_extmode_char(Channel *channel, Cmode *handler, char *param, u_int what,
/* Check for multiple changes in 1 command (like +y-y+y 1 2, or +yy 1 2). */
for (x = 0; x < *pcount; x++)
{
if (pvar[x][1] == handler->flag)
if (pvar[x][1] == handler->letter)
{
/* this is different than the old chanmode system, coz:
* "mode #chan +kkL #a #b #c" will get "+kL #a #b" which is wrong :p.
@@ -918,7 +918,7 @@ int do_extmode_char(Channel *channel, Cmode *handler, char *param, u_int what,
* Any provided parameter is ok, the current one (that is set) will be used.
*/
ircsnprintf(pvar[*pcount], MODEBUFLEN + 3, "-%c%s",
handler->flag, cm_getparameter(channel, handler->flag));
handler->letter, cm_getparameter(channel, handler->letter));
(*pcount)++;
} else {
/* Normal extended channel mode: deleting is just -X, no parameter.
@@ -938,14 +938,14 @@ int do_extmode_char(Channel *channel, Cmode *handler, char *param, u_int what,
if (channel->mode.mode & handler->mode)
{
char *now, *requested;
char flag = handler->flag;
char flag = handler->letter;
now = cm_getparameter(channel, flag);
requested = handler->conv_param(param, client, channel);
if (now && requested && !strcmp(now, requested))
return paracnt; /* ignore... */
}
ircsnprintf(pvar[*pcount], MODEBUFLEN + 3, "+%c%s",
handler->flag, handler->conv_param(param, client, channel));
handler->letter, handler->conv_param(param, client, channel));
(*pcount)++;
param = morphed; /* set param to converted parameter. */
}
@@ -955,14 +955,14 @@ int do_extmode_char(Channel *channel, Cmode *handler, char *param, u_int what,
{ /* + */
channel->mode.mode |= handler->mode;
if (handler->paracount)
cm_putparameter(channel, handler->flag, param);
cm_putparameter(channel, handler->letter, param);
RunHook2(HOOKTYPE_MODECHAR_ADD, channel, (int)mode);
} else
{ /* - */
channel->mode.mode &= ~(handler->mode);
RunHook2(HOOKTYPE_MODECHAR_DEL, channel, (int)mode);
if (handler->paracount)
cm_freeparameter(channel, handler->flag);
cm_freeparameter(channel, handler->letter);
}
return paracnt;
}
@@ -1114,7 +1114,7 @@ void _set_mode(Channel *channel, Client *client, int parc, char *parv[], u_int *
/* Maybe in extmodes */
for (cm=channelmodes; cm; cm = cm->next)
{
if (cm->flag == *curchr)
if (cm->letter == *curchr)
{
found = 2;
break;
src/modules/sjoin.c
+12 -12
View File
@@ -713,18 +713,18 @@ getnick:
*/
for (cm=channelmodes; cm; cm = cm->next)
{
if (cm->flag &&
if (cm->letter &&
!cm->local &&
(oldmode.mode & cm->mode) &&
!(channel->mode.mode & cm->mode))
{
if (cm->paracount)
{
char *parax = cm_getparameter_ex(oldmode.mode_params, cm->flag);
//char *parax = cm->get_param(extcmode_get_struct(oldmode.modeparam, cm->flag));
Addit(cm->flag, parax);
char *parax = cm_getparameter_ex(oldmode.mode_params, cm->letter);
//char *parax = cm->get_param(extcmode_get_struct(oldmode.modeparam, cm->letter));
Addit(cm->letter, parax);
} else {
Addsingle(cm->flag);
Addsingle(cm->letter);
}
}
}
@@ -760,19 +760,19 @@ getnick:
*/
for (cm=channelmodes; cm; cm = cm->next)
{
if ((cm->flag) &&
if ((cm->letter) &&
!(oldmode.mode & cm->mode) &&
(channel->mode.mode & cm->mode))
{
if (cm->paracount)
{
char *parax = cm_getparameter(channel, cm->flag);
char *parax = cm_getparameter(channel, cm->letter);
if (parax)
{
Addit(cm->flag, parax);
Addit(cm->letter, parax);
}
} else {
Addsingle(cm->flag);
Addsingle(cm->letter);
}
}
}
@@ -785,13 +785,13 @@ getnick:
*/
for (cm=channelmodes; cm; cm = cm->next)
{
if (cm->flag && cm->paracount &&
if (cm->letter && cm->paracount &&
(oldmode.mode & cm->mode) &&
(channel->mode.mode & cm->mode))
{
int r;
char *parax;
char flag = cm->flag;
char flag = cm->letter;
void *ourm = GETPARASTRUCTEX(oldmode.mode_params, flag);
void *theirm = GETPARASTRUCT(channel, flag);
@@ -805,7 +805,7 @@ getnick:
case EXSJ_THEYWON:
parax = cm_getparameter(channel, flag);
Addit(cm->flag, parax);
Addit(cm->letter, parax);
break;
case EXSJ_SAME: