summaryrefslogtreecommitdiff
path: root/src/map/channel.c
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2016-02-16 18:07:52 +0100
committerHaru <haru@dotalux.com>2016-02-17 10:40:44 +0100
commit03a5c603be2cf6d5feea9012029f8899c624557a (patch)
tree80c98e0f160700d7441c2642cd7489f7b8645177 /src/map/channel.c
parent28588859a64fb03335ca5e4083fb6ad95d88db6e (diff)
downloadhercules-03a5c603be2cf6d5feea9012029f8899c624557a.tar.gz
hercules-03a5c603be2cf6d5feea9012029f8899c624557a.tar.bz2
hercules-03a5c603be2cf6d5feea9012029f8899c624557a.tar.xz
hercules-03a5c603be2cf6d5feea9012029f8899c624557a.zip
Removed unnecessary typedefs from libconfig
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'src/map/channel.c')
-rw-r--r--src/map/channel.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/map/channel.c b/src/map/channel.c
index c1b28fd84..45b59898c 100644
--- a/src/map/channel.c
+++ b/src/map/channel.c
@@ -589,8 +589,8 @@ void channel_quit_guild(struct map_session_data *sd)
void read_channels_config(void)
{
- config_t channels_conf;
- config_setting_t *chsys = NULL;
+ struct config_t channels_conf;
+ struct config_setting_t *chsys = NULL;
const char *config_filename = "conf/channels.conf"; // FIXME hardcoded name
if (!libconfig->load_file(&channels_conf, config_filename))
@@ -599,9 +599,9 @@ void read_channels_config(void)
chsys = libconfig->lookup(&channels_conf, "chsys");
if (chsys != NULL) {
- config_setting_t *settings = libconfig->setting_get_elem(chsys, 0);
- config_setting_t *channels;
- config_setting_t *colors;
+ struct config_setting_t *settings = libconfig->setting_get_elem(chsys, 0);
+ struct config_setting_t *channels;
+ struct config_setting_t *colors;
int i,k;
const char *local_name, *ally_name,
*local_color, *ally_color,
@@ -710,7 +710,7 @@ void read_channels_config(void)
CREATE(channel->config->colors, unsigned int, color_count);
CREATE(channel->config->colors_name, char *, color_count);
for(i = 0; i < color_count; i++) {
- config_setting_t *color = libconfig->setting_get_elem(colors, i);
+ struct config_setting_t *color = libconfig->setting_get_elem(colors, i);
CREATE(channel->config->colors_name[i], char, HCS_NAME_LENGTH);
@@ -771,7 +771,7 @@ void read_channels_config(void)
int channel_count = libconfig->setting_length(channels);
for(i = 0; i < channel_count; i++) {
- config_setting_t *chan = libconfig->setting_get_elem(channels, i);
+ struct config_setting_t *chan = libconfig->setting_get_elem(channels, i);
const char *name = config_setting_name(chan);
const char *color = libconfig->setting_get_string_elem(channels,i);