summaryrefslogtreecommitdiff
path: root/3rdparty/libconfig/grammar.c
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-04-04 17:08:44 +0300
committerAndrei Karas <akaras@inbox.ru>2016-04-04 17:08:44 +0300
commit3732bd4a6b708651f6b4bcd32d6beb2b7f49c478 (patch)
tree83155915c35c72d018108231437248cc78d5060d /3rdparty/libconfig/grammar.c
parent0bd30a0fac1db1b478b3173a22a81bd5249113f8 (diff)
parent9147fe9473b26ee32aafed65fd02b03f11397629 (diff)
downloadhercules-3732bd4a6b708651f6b4bcd32d6beb2b7f49c478.tar.gz
hercules-3732bd4a6b708651f6b4bcd32d6beb2b7f49c478.tar.bz2
hercules-3732bd4a6b708651f6b4bcd32d6beb2b7f49c478.tar.xz
hercules-3732bd4a6b708651f6b4bcd32d6beb2b7f49c478.zip
Merge pull request #1210 from HerculesWS/wcast_qual
Added -Wcast-qual compiler flag
Diffstat (limited to '3rdparty/libconfig/grammar.c')
-rw-r--r--3rdparty/libconfig/grammar.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/3rdparty/libconfig/grammar.c b/3rdparty/libconfig/grammar.c
index 7d5757b2f..6cd6fb722 100644
--- a/3rdparty/libconfig/grammar.c
+++ b/3rdparty/libconfig/grammar.c
@@ -95,7 +95,7 @@ extern int libconfig_yyget_lineno();
static const char *err_array_elem_type = "mismatched element type in array";
static const char *err_duplicate_setting = "duplicate setting name";
-#define _delete(P) free((void *)(P))
+#define _delete(P) free(P)
#define IN_ARRAY() \
(ctx->parent && (ctx->parent->type == CONFIG_TYPE_ARRAY))
@@ -1751,7 +1751,7 @@ yyreduce:
{
if(IN_ARRAY() || IN_LIST())
{
- const char *s = parsectx_take_string(ctx);
+ char *s = parsectx_take_string(ctx);
struct config_setting_t *e = config_setting_set_string_elem(ctx->parent, -1, s);
_delete(s);
@@ -1767,7 +1767,7 @@ yyreduce:
}
else
{
- const char *s = parsectx_take_string(ctx);
+ char *s = parsectx_take_string(ctx);
config_setting_set_string(ctx->setting, s);
_delete(s);
}