diff options
| author | j-tkay <joseph.tk.ea@gmail.com> | 2013-06-28 20:11:19 +0800 |
|---|---|---|
| committer | j-tkay <joseph.tk.ea@gmail.com> | 2013-06-28 20:11:19 +0800 |
| commit | 8489dbf3b58d3bff70b27ea42884a14d5229430a (patch) | |
| tree | 89e0f9be6b3bc7c3ebc135fc311d9f6d6ebbfeec /3rdparty | |
| parent | de7919f0f59f47473e6de709b5d5287a4a55e18d (diff) | |
| parent | 2154c0fa9cee582a36f9a8d7923a646a6d47adf0 (diff) | |
| download | hercules-8489dbf3b58d3bff70b27ea42884a14d5229430a.tar.gz hercules-8489dbf3b58d3bff70b27ea42884a14d5229430a.tar.bz2 hercules-8489dbf3b58d3bff70b27ea42884a14d5229430a.tar.xz hercules-8489dbf3b58d3bff70b27ea42884a14d5229430a.zip | |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to '3rdparty')
| -rw-r--r-- | 3rdparty/libconfig/libconfig.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/3rdparty/libconfig/libconfig.c b/3rdparty/libconfig/libconfig.c index 2e90315c6..4cc272c9f 100644 --- a/3rdparty/libconfig/libconfig.c +++ b/3rdparty/libconfig/libconfig.c @@ -1531,15 +1531,11 @@ config_setting_t *config_setting_add(config_setting_t *parent, if((parent->type == CONFIG_TYPE_ARRAY) || (parent->type == CONFIG_TYPE_LIST)) name = NULL; - if(name) - { + if(name) { if(! __config_validate_name(name)) return(NULL); } - if(config_setting_get_member(parent, name) != NULL) - return(NULL); /* already exists */ - return(config_setting_create(parent, name, type)); } |