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

Fix "function returns an aggregate" to make GCC happy.

Browse Source 
Actually I don't think this was really wrong as this is an
enum, which is probably why clang does not complain...
but still... whatever....
This commit is contained in:
Bram Matthys
2023-05-26 14:39:01 +02:00
parent cf5808dc44
commit fa4b39d4aa
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/h.h
+1 -1
View File
@@ -1410,7 +1410,7 @@ extern void init_dynamic_set_block(DynamicSetBlock *s);
extern void free_dynamic_set_block(DynamicSetBlock *s);
extern int test_dynamic_set_block_item(ConfigFile *conf, const char *security_group, ConfigEntry *cep);
extern int config_set_dynamic_set_block_item(ConfigFile *conf, DynamicSetBlock *s, ConfigEntry *cep);
extern DynamicSetOption get_setting_for_user(Client *client, SetOption opt);
extern DynamicSetOption *get_setting_for_user(Client *client, SetOption opt);
extern long long get_setting_for_user_number(Client *client, SetOption opt);
extern const char *get_setting_for_user_string(Client *client, SetOption opt);
extern void dynamic_set_string(DynamicSetBlock *s, int settingname, const char *value);
src/conf.c
+7 -7
View File
@@ -11359,7 +11359,7 @@ int config_set_security_group(ConfigFile *conf, ConfigEntry *ce)
* @param opt The flood option we are interested in
* @returns The FloodSettings for this user, never returns NULL.
*/
DynamicSetOption get_setting_for_user(Client *client, SetOption opt)
DynamicSetOption *get_setting_for_user(Client *client, SetOption opt)
{
SecurityGroup *sg;
int in_known_users = 0;
@@ -11382,13 +11382,13 @@ DynamicSetOption get_setting_for_user(Client *client, SetOption opt)
if (in_known_users)
{
if (sg->settings.isset[opt])
return sg->settings.settings[opt];
return &sg->settings.settings[opt];
}
} else
if (user_allowed_by_security_group(client, sg) &&
sg->settings.isset[opt])
{
return sg->settings.settings[opt];
return &sg->settings.settings[opt];
}
}
@@ -11396,22 +11396,22 @@ DynamicSetOption get_setting_for_user(Client *client, SetOption opt)
* Use the caching info from above.
*/
if (!in_known_users && unknown_users_set.isset[opt])
return unknown_users_set.settings[opt];
return &unknown_users_set.settings[opt];
/* If we are still here, then fallback to the generic set:: setting */
return dynamic_set.settings[opt];
return &dynamic_set.settings[opt];
}
/** Get configuration that applies to the user - a number value */
long long get_setting_for_user_number(Client *client, SetOption opt)
{
return get_setting_for_user(client, opt).number;
return get_setting_for_user(client, opt)->number;
}
/** Get configuration that applies to the user - a string config value */
const char *get_setting_for_user_string(Client *client, SetOption opt)
{
return get_setting_for_user(client, opt).string;
return get_setting_for_user(client, opt)->string;
}
/*** END OF DYNAMIC SET CONFIG STUFF (that can be overridden by security group) ***/