0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-06-18 09:58:22 +02:00

Regress brace init relaxation for clang.

This commit is contained in:
Jason Volk 2016-07-22 15:11:39 -07:00
parent 7ad2bf79bc
commit ac577c1322
8 changed files with 27 additions and 31 deletions

View file

@ -31,8 +31,8 @@ static void handle_stat(int parc, char *parv[]);
static void handle_options(int parc, char *parv[]);
rb_helper *authd_helper = NULL;
std::array<authd_cmd_handler, 256> authd_cmd_handlers
{[]{
std::array<authd_cmd_handler, 256> authd_cmd_handlers =
[]{
std::array<authd_cmd_handler, 256> ret;
ret['C'] = handle_new_connection;
ret['D'] = handle_resolve_dns;
@ -41,21 +41,21 @@ std::array<authd_cmd_handler, 256> authd_cmd_handlers
ret['R'] = handle_reload;
ret['S'] = handle_stat;
return ret;
}()};
}();
std::array<authd_stat_handler, 256> authd_stat_handlers
{[]{
std::array<authd_stat_handler, 256> authd_stat_handlers =
[]{
std::array<authd_stat_handler, 256> ret;
ret['D'] = enumerate_nameservers;
return ret;
}()};
}();
std::array<authd_reload_handler, 256> authd_reload_handlers
{[]{
std::array<authd_reload_handler, 256> authd_reload_handlers =
[]{
std::array<authd_reload_handler, 256> ret;
ret['D'] = reload_nameservers;
return ret;
}()};
}();
rb_dictionary *authd_option_handlers;

View file

@ -74,7 +74,7 @@ typedef void (*provider_complete_t)(struct auth_client *, uint32_t);
struct auth_stats_handler
{
const char letter;
char letter;
authd_stat_handler handler;
};

View file

@ -608,7 +608,7 @@ struct auth_opts_handler blacklist_options[] =
};
struct auth_provider blacklist_provider =
{[]{
[]{
auth_provider ret {0};
ret.name = "blacklist";
ret.letter = 'B';
@ -620,4 +620,4 @@ struct auth_provider blacklist_provider =
ret.opt_handlers = blacklist_options;
/* .stats_handler = { 'B', blacklist_stats }, */
return ret;
}()};
}();

View file

@ -377,8 +377,8 @@ struct auth_opts_handler ident_options[] =
};
struct auth_provider ident_provider
{[]{
struct auth_provider ident_provider =
[]{
auth_provider ap {0};
ap.name = "ident";
ap.letter = 'I';
@ -388,4 +388,4 @@ struct auth_provider ident_provider
ap.timeout = ident_cancel;
ap.opt_handlers = ident_options;
return ap;
}()};
}();

View file

@ -941,8 +941,8 @@ struct auth_opts_handler opm_options[] =
{ NULL, 0, NULL },
};
struct auth_provider opm_provider
{[]{
struct auth_provider opm_provider =
[]{
auth_provider ap {0};
ap.name = "opm";
ap.letter = 'O';
@ -953,4 +953,4 @@ struct auth_provider opm_provider
ap.completed = opm_initiate;
ap.opt_handlers = opm_options;
return ap;
}()};
}();

View file

@ -174,8 +174,8 @@ struct auth_opts_handler rdns_options[] =
{ NULL, 0, NULL },
};
struct auth_provider rdns_provider
{[]{
struct auth_provider rdns_provider =
[]{
auth_provider ap {0};
ap.name = "rdns";
ap.letter = 'R';
@ -185,4 +185,4 @@ struct auth_provider rdns_provider
ap.timeout = rdns_cancel;
ap.opt_handlers = rdns_options;
return ap;
}()};
}();

View file

@ -70,9 +70,8 @@ rb_dictionary *bl_stats;
rb_dlink_list opm_list;
struct OPMListener opm_listeners[LISTEN_LAST];
std::array<authd_cb, 256> authd_cmd_tab
{[]
{
std::array<authd_cb, 256> authd_cmd_tab =
[]{
std::array<authd_cb, 256> ret {0};
ret['A'] = { cmd_accept_client, 4 };
ret['E'] = { cmd_dns_result, 5 };
@ -83,8 +82,7 @@ std::array<authd_cb, 256> authd_cmd_tab
ret['Y'] = { cmd_stats_results, 3 };
ret['Z'] = { cmd_stats_results, 3 };
return ret;
}()
};
}();
static int
start_authd(void)

View file

@ -158,9 +158,8 @@ static void stats_capability(struct Client *);
* C initalisers so we don't have to iterate anymore
* --Elizafox
*/
std::array<stats_cmd, 256> stats_cmd_table
{[]
{
std::array<stats_cmd, 256> stats_cmd_table =
[]{
std::array<stats_cmd, 256> ret;
//letter handler oper admin
@ -214,8 +213,7 @@ std::array<stats_cmd, 256> stats_cmd_table
ret['?'] = stats_cmd { stats_servlinks, false, false };
return ret;
}()
};
}();
/*