MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-11-29 10:12:39 +01:00
Code Issues Releases Wiki Activity

ircd: Rename newconf name conflict.

Browse source
This commit is contained in:
Jason Volk 2016-08-26 01:52:41 -07:00
parent 9d87313756
commit 21cfd2eefd
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
ircd/newconf.cc
View file

@ -292,14 +292,14 @@ conf_set_modules_path(void *data)
mod_add_path((char *) data); mod_add_path((char *) data);
} }
struct mode_table struct mode_table_
{ {
const char *name; const char *name;
int mode; int mode;
}; };
/* *INDENT-OFF* */ /* *INDENT-OFF* */
static struct mode_table umode_table[] = { static struct mode_table_ umode_table[] = {
{"callerid", umode::CALLERID }, {"callerid", umode::CALLERID },
{"deaf", umode::DEAF }, {"deaf", umode::DEAF },
{"invisible", umode::INVISIBLE }, {"invisible", umode::INVISIBLE },
@ -312,13 +312,13 @@ static struct mode_table umode_table[] = {
{NULL, 0} {NULL, 0}
}; };
static struct mode_table oper_table[] = { static struct mode_table_ oper_table[] = {
{"encrypted", OPER_ENCRYPTED }, {"encrypted", OPER_ENCRYPTED },
{"need_ssl", OPER_NEEDSSL }, {"need_ssl", OPER_NEEDSSL },
{NULL, 0} {NULL, 0}
}; };
static struct mode_table auth_table[] = { static struct mode_table_ auth_table[] = {
{"encrypted", CONF_FLAGS_ENCRYPTED }, {"encrypted", CONF_FLAGS_ENCRYPTED },
{"spoof_notice", CONF_FLAGS_SPOOF_NOTICE }, {"spoof_notice", CONF_FLAGS_SPOOF_NOTICE },
{"exceed_limit", CONF_FLAGS_NOLIMIT }, {"exceed_limit", CONF_FLAGS_NOLIMIT },
@ -339,7 +339,7 @@ static struct mode_table auth_table[] = {
{NULL, 0} {NULL, 0}
}; };
static struct mode_table connect_table[] = { static struct mode_table_ connect_table[] = {
{ "autoconn", SERVER_AUTOCONN }, { "autoconn", SERVER_AUTOCONN },
{ "compressed", SERVER_COMPRESSED }, { "compressed", SERVER_COMPRESSED },
{ "encrypted", SERVER_ENCRYPTED }, { "encrypted", SERVER_ENCRYPTED },
@ -348,7 +348,7 @@ static struct mode_table connect_table[] = {
{ NULL, 0 }, { NULL, 0 },
}; };
static struct mode_table cluster_table[] = { static struct mode_table_ cluster_table[] = {
{ "kline", SHARED_PKLINE }, { "kline", SHARED_PKLINE },
{ "tkline", SHARED_TKLINE }, { "tkline", SHARED_TKLINE },
{ "unkline", SHARED_UNKLINE }, { "unkline", SHARED_UNKLINE },
@ -363,7 +363,7 @@ static struct mode_table cluster_table[] = {
{NULL, 0} {NULL, 0}
}; };
static struct mode_table shared_table[] = static struct mode_table_ shared_table[] =
{ {
{ "kline", SHARED_PKLINE|SHARED_TKLINE }, { "kline", SHARED_PKLINE|SHARED_TKLINE },
{ "xline", SHARED_PXLINE|SHARED_TXLINE }, { "xline", SHARED_PXLINE|SHARED_TXLINE },
@ -390,7 +390,7 @@ static struct mode_table shared_table[] =
/* *INDENT-ON* */ /* *INDENT-ON* */
static int static int
find_umode(struct mode_table *tab, const char *name) find_umode(struct mode_table_ *tab, const char *name)
{ {
int i; int i;
@ -404,7 +404,7 @@ find_umode(struct mode_table *tab, const char *name)
} }
static void static void
set_modes_from_table(int *modes, const char *whatis, struct mode_table *tab, conf_parm_t * args) set_modes_from_table(int *modes, const char *whatis, struct mode_table_ *tab, conf_parm_t * args)
{ {
for (; args; args = args->next) for (; args; args = args->next)
{ {

6
modules/m_privs.cc
View file

@ -52,14 +52,14 @@ mapi_clist_av1 privs_clist[] = {
* Sort of... it's int in newconf.c since oper confs don't need 64-bit wide flags. * Sort of... it's int in newconf.c since oper confs don't need 64-bit wide flags.
* --Elizafox * --Elizafox
*/ */
struct mode_table struct mode_table_
{ {
const char *name; const char *name;
uint64_t mode; uint64_t mode;
}; };
/* there is no such table like this anywhere else */ /* there is no such table like this anywhere else */
static struct mode_table auth_client_table[] = { static struct mode_table_ auth_client_table[] = {
{"resv_exempt", client::flags::EXEMPTRESV }, {"resv_exempt", client::flags::EXEMPTRESV },
{"kline_exempt", client::flags::EXEMPTKLINE }, {"kline_exempt", client::flags::EXEMPTKLINE },
{"flood_exempt", client::flags::EXEMPTFLOOD }, {"flood_exempt", client::flags::EXEMPTFLOOD },
@ -75,7 +75,7 @@ DECLARE_MODULE_AV2(privs, NULL, NULL, privs_clist, NULL, NULL, NULL, NULL, privs
static void show_privs(client::client &source, client::client *target_p) static void show_privs(client::client &source, client::client *target_p)
{ {
char buf[512]; char buf[512];
struct mode_table *p; struct mode_table_ *p;
buf[0] = '\0'; buf[0] = '\0';
if (target_p->localClient->privset) if (target_p->localClient->privset)