summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--3rdparty/libconfig/AUTHORS1
-rw-r--r--3rdparty/libconfig/ChangeLog38
-rw-r--r--3rdparty/libconfig/README.md4
-rw-r--r--3rdparty/libconfig/extra/doc/libconfig.texi192
-rw-r--r--3rdparty/libconfig/extra/gen/clangwarnings.patch25
-rw-r--r--3rdparty/libconfig/extra/gen/grammar.y24
-rw-r--r--3rdparty/libconfig/extra/gen/scanner.l47
-rw-r--r--3rdparty/libconfig/grammar.c402
-rw-r--r--3rdparty/libconfig/grammar.h39
-rw-r--r--3rdparty/libconfig/libconfig-1.4.90
-rw-r--r--3rdparty/libconfig/libconfig-1.52
-rw-r--r--3rdparty/libconfig/libconfig.c419
-rw-r--r--3rdparty/libconfig/libconfig.h225
-rw-r--r--3rdparty/libconfig/parsectx.h10
-rw-r--r--3rdparty/libconfig/scanctx.c11
-rw-r--r--3rdparty/libconfig/scanctx.h6
-rw-r--r--3rdparty/libconfig/scanner.c280
-rw-r--r--3rdparty/libconfig/scanner.h37
-rw-r--r--3rdparty/libconfig/strbuf.c5
-rw-r--r--3rdparty/libconfig/strbuf.h4
-rw-r--r--3rdparty/libconfig/win32/stdint.h221
-rw-r--r--3rdparty/libconfig/wincompat.h15
-rw-r--r--src/char/pincode.c1
-rw-r--r--src/common/HPM.c8
-rw-r--r--src/common/conf.c288
-rw-r--r--src/common/conf.h154
-rw-r--r--src/common/showmsg.c7
-rw-r--r--src/common/showmsg.h7
-rw-r--r--src/common/socket.c7
-rw-r--r--src/common/socket.h5
-rw-r--r--src/common/sql.c1
-rw-r--r--src/login/login.c1
-rw-r--r--src/map/atcommand.c24
-rw-r--r--src/map/atcommand.h4
-rw-r--r--src/map/battleground.c14
-rw-r--r--src/map/channel.c16
-rw-r--r--src/map/clif.c24
-rw-r--r--src/map/itemdb.c51
-rw-r--r--src/map/itemdb.h8
-rw-r--r--src/map/map.c46
-rw-r--r--src/map/mob.c36
-rw-r--r--src/map/mob.h16
-rw-r--r--src/map/pc.c14
-rw-r--r--src/map/pc_groups.c26
-rw-r--r--src/map/pc_groups.h12
-rw-r--r--src/map/quest.c17
-rw-r--r--src/map/quest.h5
-rw-r--r--src/map/script.c22
-rw-r--r--src/map/status.c36
-rw-r--r--src/map/status.h6
-rw-r--r--src/plugins/HPMHooking/HPMHooking_char.HPMHooksCore.inc72
-rw-r--r--src/plugins/HPMHooking/HPMHooking_char.HookingPoints.inc18
-rw-r--r--src/plugins/HPMHooking/HPMHooking_char.Hooks.inc736
-rw-r--r--src/plugins/HPMHooking/HPMHooking_login.HPMHooksCore.inc72
-rw-r--r--src/plugins/HPMHooking/HPMHooking_login.HookingPoints.inc18
-rw-r--r--src/plugins/HPMHooking/HPMHooking_login.Hooks.inc736
-rw-r--r--src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc72
-rw-r--r--src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc18
-rw-r--r--src/plugins/HPMHooking/HPMHooking_map.Hooks.inc826
-rw-r--r--src/plugins/db2sql.c10
-rw-r--r--src/test/test_libconfig.c96
61 files changed, 3637 insertions, 1900 deletions
diff --git a/3rdparty/libconfig/AUTHORS b/3rdparty/libconfig/AUTHORS
index d3d5e104b..5eef0f0ff 100644
--- a/3rdparty/libconfig/AUTHORS
+++ b/3rdparty/libconfig/AUTHORS
@@ -4,3 +4,4 @@ Mark Lindner - Lead developer & maintainer.
Daniel Marjamäki - Enhancements & bugfixes.
Andrew Tytula - Windows port.
Glenn Herteg - Enhancements, bugfixes, documentation corrections.
+Matt Renaud - Enhancements & bugfixes.
diff --git a/3rdparty/libconfig/ChangeLog b/3rdparty/libconfig/ChangeLog
index 52125e9fb..c24151e09 100644
--- a/3rdparty/libconfig/ChangeLog
+++ b/3rdparty/libconfig/ChangeLog
@@ -1,3 +1,41 @@
+
+ ----- version 1.5 ------
+
+2015-05-16 Mark Lindner <markl@neuromancer>
+
+ * lib/libconfig.c - Don't fclose() a null pointer.
+
+2014-09-19 Mark Lindner <markl@neuromancer>
+
+ * lib/libconfig.c, lib/wincompat.h - check if file being opened is a
+ directory
+ * lib/libconfig.c, lib/libconfig.h, lib/libconfig.h++,
+ doc/libconfig.texi - added config_set_options(),
+ config_get_options(), setOptions(), getOptions().
+
+2014-05-25 Mark Lindner <markl@neuromancer>
+
+ * lib/libconfig.c++, lib/libconfig.h++ - added patches from Matt
+ Renaud (added iterators, removed throws() specifications); added
+ Setting.lookup(); code cleanup; added patch from Yuri Dyachenko
+ (made exception constructors public)
+ * lib/libconfig.c, lib/libconfig.h - renamed
+ config_setting_lookup_from() to config_setting_lookup() and
+ documented it; patch from Alexander Klauer (floating point precision
+ loss)
+ * doc/libconfig.texi - documented new APIs, bumped version
+ * lib/scanner.c, lib/scanner.h, lib/scanner.l, libconfig.c -
+ scanner code cleanup; and regenerated with flex 2.5.39
+ * lib/grammar.c, lib/grammar.h, lib/grammar.y - parser code cleanup;
+ and regenerated with bison 3.0.2
+ * README, ChangeLog - version updates
+
+2014-01-21 Mark Lindner <markl@neuromancer>
+
+ * lib/libconfig.c - bugfix; capture root filename
+ * tests/Makefile.am - fix for out-of-source builds
+ * ac_config.h.in, aclocal.m4 - updated to newer autotools
+
----- version 1.4.9 ------
2012-09-28 Mark Lindner <markl@neuromancer>
diff --git a/3rdparty/libconfig/README.md b/3rdparty/libconfig/README.md
new file mode 100644
index 000000000..43bd17e41
--- /dev/null
+++ b/3rdparty/libconfig/README.md
@@ -0,0 +1,4 @@
+libconfig
+=========
+
+C/C++ library for processing configuration files
diff --git a/3rdparty/libconfig/extra/doc/libconfig.texi b/3rdparty/libconfig/extra/doc/libconfig.texi
index 52dca20fc..9441dc2ac 100644
--- a/3rdparty/libconfig/extra/doc/libconfig.texi
+++ b/3rdparty/libconfig/extra/doc/libconfig.texi
@@ -6,8 +6,8 @@
@setfilename libconfig.info
@settitle libconfig
-@set edition 1.4.9
-@set update-date 28 September 2012
+@set edition 1.5
+@set update-date 16 May 2015
@set subtitle-text A Library For Processing Structured Configuration Files
@set author-text Mark A.@: Lindner
@@ -36,7 +36,7 @@
@page
@vskip 0pt plus 1filll
-Copyright @copyright{} 2005-2012 Mark A Lindner
+Copyright @copyright{} 2005-2014 Mark A Lindner
Permission is granted to make and distribute verbatim copies of
this manual provided the copyright notice and this permission notice
@@ -512,8 +512,11 @@ more hexadecimal digits (@samp{0} - @samp{9}, @samp{A} - @samp{F},
@section 64-bit Integer Values
Long long (64-bit) integers are represented identically to integers,
-except that an 'L' character is appended to indicate a 64-bit
-value. For example, @samp{0L} indicates a 64-bit integer value 0.
+except that an `L' character is appended to indicate a 64-bit
+value. For example, @samp{0L} indicates a 64-bit integer value 0. As
+of version 1.5 of the library, the trailing `L' is optional; if the
+integer value exceeds the range of a 32-bit integer, it will
+automatically be interpreted as a 64-bit integer.
@node Floating Point Values, Boolean Values, 64-bit Integer Values, Configuration Files
@comment node-name, next, previous, up
@@ -766,21 +769,60 @@ configuration @var{config}, or @code{NULL} if none is set.
@end deftypefun
-@deftypefun void config_set_auto_convert (@w{config_t *@var{config}}, @w{int @var{flag}})
-@deftypefunx int config_get_auto_convert (@w{const config_t *@var{config}})
+@deftypefun void config_set_options (@w{config_t *@var{config}}, @w{int @var{options}})
+@deftypefunx int config_get_options (@w{config_t *@var{config}})
+
+These functions set and get the options for the configuration
+@var{config}. The options affect how configurations are read and
+written. The following options are defined:
+
+@table @code
-@code{config_set_auto_convert()} enables number auto-conversion for
-the configuration @var{config} if @var{flag} is non-zero, and disables
-it otherwise. When this feature is enabled, an attempt to retrieve a
+@item CONFIG_OPTION_AUTOCONVERT
+Turning this option on enables number auto-conversion for
+the configuration. When this feature is enabled, an attempt to retrieve a
floating point setting's value into an integer (or vice versa), or
store an integer to a floating point setting's value (or vice versa)
will cause the library to silently perform the necessary conversion
(possibly leading to loss of data), rather than reporting failure. By
-default this feature is disabled.
+default this option is turned off.
+
+@item CONFIG_OPTION_SEMICOLON_SEPARATORS
+This option controls whether a semicolon (`;') is output after each setting
+when the configuration is written to a file or stream. (The semicolon
+separators are optional in the configuration syntax.) By default this
+option is turned on.
+
+@item CONFIG_OPTION_COLON_ASSIGNMENT_FOR_GROUPS
+This option controls whether a colon (`:') is output between each
+group setting's name and its value when the configuration is written to
+a file or stream. If the option is turned off, an equals sign (`=') is
+output instead. (These tokens are interchangeable in the configuration
+syntax.) By default this option is turned on.
+
+@item CONFIG_OPTION_COLON_ASSIGNMENT_FOR_NON_GROUPS
+This option controls whether a colon (`:') is output between each
+non-group setting's name and its value when the configuration is written
+to a file or stream. If the option is turned off, an equals sign (`=')
+is output instead. (These tokens are interchangeable in the configuration
+syntax.) By default this option is turned off.
+
+@item CONFIG_OPTION_OPEN_BRACE_ON_SEPARATE_LINE
+This option controls whether an open brace (`@{') will be written on its own
+line when the configuration is written to a file or stream. If the option is
+turned off, the brace will be written at the end of the previous line.
+By default this option is turned on.
+
+@end table
+
+@end deftypefun
+
+@deftypefun void config_set_auto_convert (@w{config_t *@var{config}}, @w{int @var{flag}})
+@deftypefunx int config_get_auto_convert (@w{const config_t *@var{config}})
-@code{config_get_auto_convert()} returns @code{CONFIG_TRUE} if number
-auto-conversion is currently enabled for @var{config}; otherwise it
-returns @code{CONFIG_FALSE}.
+These functions get and set the @code{CONFIG_OPTION_AUTO_CONVERT}
+option. They are obsoleted by the @code{config_set_options()} and
+@code{config_get_options()} functions described above.
@end deftypefun
@@ -839,6 +881,15 @@ setting was not found.
@end deftypefun
+@deftypefun {config_setting_t *} config_setting_lookup (@w{const config_setting_t * @var{setting}}, @w{const char * @var{path}})
+
+This function locates a setting by a path @var{path} relative to
+the setting @var{setting}. It returns a pointer to the
+@code{config_setting_t} structure on success, or @code{NULL} if the
+setting was not found.
+
+@end deftypefun
+
@deftypefun int config_setting_get_int (@w{const config_setting_t * @var{setting}})
@deftypefunx {long long} config_setting_get_int64 (@w{const config_setting_t * @var{setting}})
@deftypefunx double config_setting_get_float (@w{const config_setting_t * @var{setting}})
@@ -1146,17 +1197,45 @@ common base exception @code{ConfigException}.
A @code{SettingTypeException} is thrown when the type of a setting's
value does not match the type requested.
+@deftypemethod SettingTypeException {} SettingTypeException (@w{const Setting &@var{setting}})
+@deftypemethodx SettingTypeException {} SettingTypeException (@w{const Setting &@var{setting}}, @w{int @var{index}})
+@deftypemethodx SettingTypeException {} SettingTypeException (@w{const Setting &@var{setting}}, @w{const char *@var{name}})
+
+These methods construct @code{SettingTypeException} objects for the given @var{setting} and/or member @var{index} or @var{name}.
+
+@end deftypemethod
+
@tindex SettingNotFoundException
A @code{SettingNotFoundException} is thrown when a setting is not found.
+@deftypemethod SettingNotFoundException {} SettingNotFoundException (@w{const Setting &@var{setting}}, @w{int @var{index}})
+@deftypemethodx SettingNotFoundException {} SettingNotFoundException (@w{const Setting &@var{setting}}, @w{const char *@var{name}})
+@deftypemethodx SettingNotFoundException {} SettingNotFoundException (@w{const char *@var{path}})
+
+These methods construct @code{SettingTypeException} objects for the given @var{setting} and member @var{index} or @var{name}, or path @var{path}.
+
+@end deftypemethod
+
@tindex SettingNameException
A @code{SettingNameException} is thrown when an attempt is made to add
a new setting with a non-unique or invalid name.
+@deftypemethod SettingNameException {} SettingNameException (@w{const Setting &@var{setting}}, @w{const char *@var{name}})
+
+This method constructs a @code{SettingNameExcpetion} object for the given @var{setting} and member name @var{name}.
+
+@end deftypemethod
+
@tindex ParseException
A @code{ParseException} is thrown when a parse error occurs while
reading a configuration from a stream.
+@deftypemethod ParseException {} ParseException (@w{const char *@var{file}}, @w{int @var{line}}, @w{const char *@var{error}})
+
+This method constructs a @code{ParseException} object with the given filename @var{file}, line number @var{line}, and error message @var{error}.
+
+@end deftypemethod
+
@tindex FileIOException
A @code{FileIOException} is thrown when an I/O error occurs while
reading/writing a configuration from/to a file.
@@ -1247,21 +1326,60 @@ configuration, or @code{NULL} if none is set.
@end deftypemethod
+@deftypemethod Config void setOptions (int @var{options})
+@deftypemethodx Config int getOptions ()
+
+These methods set and get the options for the configuration. The
+options affect how configurations are read and written. The following
+options are defined:
+
+@table @code
+
+@item OptionAutoConvert
+Turning this option on enables number auto-conversion for
+the configuration. When this feature is enabled, an attempt to retrieve a
+floating point setting's value into an integer (or vice versa), or
+store an integer to a floating point setting's value (or vice versa)
+will cause the library to silently perform the necessary conversion
+(possibly leading to loss of data), rather than reporting failure. By
+default this option is turned off.
+
+@item OptionSemicolonSeparators
+This option controls whether a semicolon (`;') is output after each setting
+when the configuration is written to a file or stream. (The semicolon
+separators are optional in the configuration syntax.) By default this
+option is turned on.
+
+@item OptionColonAssignmentForGroups
+This option controls whether a colon (`:') is output between each
+group setting's name and its value when the configuration is written to
+a file or stream. If the option is turned off, an equals sign (`=') is
+output instead. (These tokens are interchangeable in the configuration
+syntax.) By default this option is turned on.
+
+@item OptionColonAssignmentForNonGroups
+This option controls whether a colon (`:') is output between each
+non-group setting's name and its value when the configuration is written
+to a file or stream. If the option is turned off, an equals sign (`=')
+is output instead. (These tokens are interchangeable in the configuration
+syntax.) By default this option is turned off.
+
+@item OptionOpenBraceOnSeparateLine
+This option controls whether an open brace (`@{') will be written on its own
+line when the configuration is written to a file or stream. If the option is
+turned off, the brace will be written at the end of the previous line.
+By default this option is turned on.
+
+@end table
+
+@end deftypemethod
+
@deftypemethod Config void setAutoConvert (bool @var{flag})
@deftypemethodx Config bool getAutoConvert ()
-@code{setAutoConvert()} enables number auto-conversion for the
-configuration if @var{flag} is @code{true}, and disables it
-otherwise. When this feature is enabled, an attempt to assign a
-floating point setting to an integer (or vice versa), or
-assign an integer to a floating point setting (or vice versa) will
-cause the library to silently perform the necessary conversion
-(possibly leading to loss of data), rather than throwing a
-@code{SettingTypeException}. By default this feature is disabled.
-
-@code{getAutoConvert()} returns @code{true} if number auto-conversion
-is currently enabled for the configuration; otherwise it returns
-@code{false}.
+These methods get and set the @code{OptionAutoConvert} option. They
+are obsoleted by the @code{setOptions()} and @code{getOptions()}
+methods described above.
@end deftypemethod
@@ -1542,6 +1660,15 @@ configuration.
@end deftypemethod
+@deftypemethod Setting {Setting &} lookup (@w{const char * @var{path}})
+@deftypemethodx Setting {Setting &} lookup (@w{const std::string &@var{path}})
+
+This function locates a setting by a path @var{path} relative to
+this setting. If requested setting is not found, a
+@code{SettingNotFoundException} is thrown.
+
+@end deftypemethod
+
@deftypemethod Setting bool lookupValue (@w{const char *@var{name}}, @w{bool &@var{value}})
@deftypemethodx Setting bool lookupValue (@w{const std::string &@var{name}}, @w{bool &@var{value}})
@@ -1744,6 +1871,17 @@ These methods test if the setting has a child setting with the given
@code{false} otherwise. These methods do not throw exceptions.
@end deftypemethod
+@page
+@deftypemethod Setting iterator begin ()
+@deftypemethodx Setting iterator end ()
+@deftypemethodx Setting const_iterator begin ()
+@deftypemethodx Setting const_iterator end ()
+
+These methods return STL-style iterators that can be used to enumerate
+the child settings of a given setting. If the setting is not an array, list,
+or group, they throw a @code{SettingTypeException}.
+
+@end deftypemethod
@deftypemethod Setting int getLength ()
@@ -1878,7 +2016,7 @@ Terminals are defined below as regular expressions:
@item @code{hex} @tab
@code{0[Xx][0-9A-Fa-f]+}
@item @code{hex64} @tab
-@code{0[Xx][0-9A-Fa-f]+L(L)?}
+@code{0[Xx][0-9A-Fa-f]+(L(L)?)?}
@item @code{float} @tab
@code{([-+]?([0-9]*)?\.[0-9]*([eE][-+]?[0-9]+)?)|([-+]([0-9]+)(\.[0-9]*)?[eE][-+]?[0-9]+)}
@end multitable
diff --git a/3rdparty/libconfig/extra/gen/clangwarnings.patch b/3rdparty/libconfig/extra/gen/clangwarnings.patch
index 4240f84d2..c3b45ef33 100644
--- a/3rdparty/libconfig/extra/gen/clangwarnings.patch
+++ b/3rdparty/libconfig/extra/gen/clangwarnings.patch
@@ -11,26 +11,5 @@ index 3595578..26444f8 100644
- YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
+ YY_SYMBOL_PRINT (yymsg ? yymsg : "Deleting", yytype, yyvaluep, yylocationp);
- switch (yytype)
- {
-diff --git a/scanner.c b/scanner.c
-index aebd34c..c3a717f 100644
---- a/scanner.c
-+++ b/scanner.c
-@@ -1500,6 +1500,8 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
- else
- ret_val = EOB_ACT_CONTINUE_SCAN;
-
-+#ifndef __clang_analyzer__
-+ // FIXME: Clang's static analyzer complains about leaking the result of libconfig_yyrealloc
- if ((yy_size_t) (yyg->yy_n_chars + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
- /* Extend the array by 50%, plus the number we really need. */
- yy_size_t new_size = yyg->yy_n_chars + number_to_move + (yyg->yy_n_chars >> 1);
-@@ -1507,6 +1509,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
- if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
- YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
- }
-+#endif // __clang_analyzer__
-
- yyg->yy_n_chars += number_to_move;
- YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars] = YY_END_OF_BUFFER_CHAR;
+ YYUSE (yytype);
+ }
diff --git a/3rdparty/libconfig/extra/gen/grammar.y b/3rdparty/libconfig/extra/gen/grammar.y
index 7eab74780..ef8ed4f18 100644
--- a/3rdparty/libconfig/extra/gen/grammar.y
+++ b/3rdparty/libconfig/extra/gen/grammar.y
@@ -1,8 +1,8 @@
/* -*- mode: C -*- */
/* ----------------------------------------------------------------------------
libconfig - A library for processing structured configuration files
- Copyright (C) 2013-2015 Hercules Dev Team
- Copyright (C) 2005-2010 Mark A Lindner
+ Copyright (C) 2013-2016 Hercules Dev Team
+ Copyright (C) 2005-2014 Mark A Lindner
This file is part of libconfig.
@@ -23,7 +23,7 @@
*/
%defines
-%output="y.tab.c"
+%output "y.tab.c"
%pure-parser
%lex-param{void *scanner}
%parse-param{void *scanner}
@@ -63,7 +63,7 @@ static const char *err_duplicate_setting = "duplicate setting name";
(ctx->parent && (ctx->parent->type == CONFIG_TYPE_LIST))
static void capture_parse_pos(void *scanner, struct scan_context *scan_ctx,
- config_setting_t *setting)
+ struct config_setting_t *setting)
{
setting->line = (unsigned int)libconfig_yyget_lineno(scanner);
setting->file = scanctx_current_filename(scan_ctx);
@@ -206,8 +206,8 @@ simple_value:
{
if(IN_ARRAY() || IN_LIST())
{
- config_setting_t *e = config_setting_set_bool_elem(ctx->parent, -1,
- (int)$1);
+ struct config_setting_t *e = config_setting_set_bool_elem(ctx->parent, -1,
+ (int)$1);
if(! e)
{
@@ -226,7 +226,7 @@ simple_value:
{
if(IN_ARRAY() || IN_LIST())
{
- config_setting_t *e = config_setting_set_int_elem(ctx->parent, -1, $1);
+ struct config_setting_t *e = config_setting_set_int_elem(ctx->parent, -1, $1);
if(! e)
{
libconfig_yyerror(scanner, ctx, scan_ctx, err_array_elem_type);
@@ -248,7 +248,7 @@ simple_value:
{
if(IN_ARRAY() || IN_LIST())
{
- config_setting_t *e = config_setting_set_int64_elem(ctx->parent, -1, $1);
+ struct config_setting_t *e = config_setting_set_int64_elem(ctx->parent, -1, $1);
if(! e)
{
libconfig_yyerror(scanner, ctx, scan_ctx, err_array_elem_type);
@@ -270,7 +270,7 @@ simple_value:
{
if(IN_ARRAY() || IN_LIST())
{
- config_setting_t *e = config_setting_set_int_elem(ctx->parent, -1, $1);
+ struct config_setting_t *e = config_setting_set_int_elem(ctx->parent, -1, $1);
if(! e)
{
libconfig_yyerror(scanner, ctx, scan_ctx, err_array_elem_type);
@@ -292,7 +292,7 @@ simple_value:
{
if(IN_ARRAY() || IN_LIST())
{
- config_setting_t *e = config_setting_set_int64_elem(ctx->parent, -1, $1);
+ struct config_setting_t *e = config_setting_set_int64_elem(ctx->parent, -1, $1);
if(! e)
{
libconfig_yyerror(scanner, ctx, scan_ctx, err_array_elem_type);
@@ -314,7 +314,7 @@ simple_value:
{
if(IN_ARRAY() || IN_LIST())
{
- config_setting_t *e = config_setting_set_float_elem(ctx->parent, -1, $1);
+ struct config_setting_t *e = config_setting_set_float_elem(ctx->parent, -1, $1);
if(! e)
{
libconfig_yyerror(scanner, ctx, scan_ctx, err_array_elem_type);
@@ -333,7 +333,7 @@ simple_value:
if(IN_ARRAY() || IN_LIST())
{
const char *s = parsectx_take_string(ctx);
- config_setting_t *e = config_setting_set_string_elem(ctx->parent, -1, s);
+ struct config_setting_t *e = config_setting_set_string_elem(ctx->parent, -1, s);
_delete(s);
if(! e)
diff --git a/3rdparty/libconfig/extra/gen/scanner.l b/3rdparty/libconfig/extra/gen/scanner.l
index 6bcce8116..f717ac273 100644
--- a/3rdparty/libconfig/extra/gen/scanner.l
+++ b/3rdparty/libconfig/extra/gen/scanner.l
@@ -1,8 +1,8 @@
/* -*- mode: C -*- */
/* --------------------------------------------------------------------------
libconfig - A library for processing structured configuration files
- Copyright (C) 2013-2015 Hercules Dev Team
- Copyright (C) 2005-2010 Mark A Lindner
+ Copyright (C) 2013-2016 Hercules Dev Team
+ Copyright (C) 2005-2014 Mark A Lindner
This file is part of libconfig.
@@ -23,33 +23,30 @@
*/
%option nounistd
+%option never-interactive
%option reentrant
%option noyywrap
%option yylineno
%option nounput
%option bison-bridge
-%option never-interactive
%option header-file="scanner.h"
%option outfile="lex.yy.c"
%option extra-type="struct scan_context *"
-%top{
-#include "scanctx.h"
-}
-
%{
+
#ifdef _MSC_VER
#pragma warning (disable: 4996)
-/* disable MSVC warning "signed/unsigned mismatch" associated with code generated by flex versions such as 2.5.35. */
-#pragma warning (disable:4018)
#endif
#include <stdlib.h>
#include <ctype.h>
#include <string.h>
+#include <limits.h>
+#include "parsectx.h"
+#include "scanctx.h"
#include "grammar.h"
#include "wincompat.h"
-#include "parsectx.h"
#define YY_NO_INPUT // Suppress generation of useless input() function
@@ -87,13 +84,6 @@ static unsigned long long fromhex(const char *s)
#endif /* __MINGW32__ */
}
-static int fromihex(const char *s) {
- unsigned long l = strtoul(s, NULL, 16);
- if (l > INT32_MAX)
- l &= INT32_MAX;
- return (int)l;
-}
-
%}
true [Tt][Rr][Uu][Ee]
@@ -183,9 +173,28 @@ include_open ^[ \t]*@include[ \t]+\"
{true} { yylval->ival = 1; return(TOK_BOOLEAN); }
{false} { yylval->ival = 0; return(TOK_BOOLEAN); }
{float} { yylval->fval = atof(yytext); return(TOK_FLOAT); }
-{integer} { yylval->ival = atoi(yytext); return(TOK_INTEGER); }
+{integer} {
+ long long llval;
+ llval = atoll(yytext);
+ if((llval < INT_MIN) || (llval > INT_MAX))
+ {
+ yylval->llval = llval;
+ return(TOK_INTEGER64);
+ }
+ else
+ {
+ yylval->ival = (int)llval;
+ return(TOK_INTEGER);
+ }
+ }
{integer64} { yylval->llval = atoll(yytext); return(TOK_INTEGER64); }
-{hex} { yylval->ival = fromihex(yytext); return(TOK_HEX); }
+{hex} {
+ unsigned long ulval = strtoul(yytext, NULL, 16);
+ if (ulval > INT32_MAX)
+ ulval &= INT32_MAX;
+ yylval->ival = (int)ulval;
+ return(TOK_HEX);
+ }
{hex64} { yylval->llval = fromhex(yytext); return(TOK_HEX64); }
{name} { yylval->sval = yytext; return(TOK_NAME); }
\[ { return(TOK_ARRAY_START); }
diff --git a/3rdparty/libconfig/grammar.c b/3rdparty/libconfig/grammar.c
index eb00552e2..7d5757b2f 100644
--- a/3rdparty/libconfig/grammar.c
+++ b/3rdparty/libconfig/grammar.c
@@ -1,8 +1,8 @@
-/* A Bison parser, made by GNU Bison 2.5. */
+/* A Bison parser, made by GNU Bison 2.7.12-4996. */
/* Bison implementation for Yacc-like parsers in C
- Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc.
+ Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -44,7 +44,7 @@
#define YYBISON 1
/* Bison version. */
-#define YYBISON_VERSION "2.5"
+#define YYBISON_VERSION "2.7.12-4996"
/* Skeleton name. */
#define YYSKELETON_NAME "yacc.c"
@@ -58,8 +58,6 @@
/* Pull parsers. */
#define YYPULL 1
-/* Using locations. */
-#define YYLSP_NEEDED 0
/* Substitute the variable and function names. */
#define yyparse libconfig_yyparse
@@ -70,11 +68,9 @@
#define yydebug libconfig_yydebug
#define yynerrs libconfig_yynerrs
-
/* Copy the first part of user declarations. */
-
-/* Line 268 of yacc.c */
-#line 32 "grammar.y"
+/* Line 371 of yacc.c */
+#line 33 "grammar.y"
#include <string.h>
#include <stdlib.h>
@@ -108,7 +104,7 @@ static const char *err_duplicate_setting = "duplicate setting name";
(ctx->parent && (ctx->parent->type == CONFIG_TYPE_LIST))
static void capture_parse_pos(void *scanner, struct scan_context *scan_ctx,
- config_setting_t *setting)
+ struct config_setting_t *setting)
{
setting->line = (unsigned int)libconfig_yyget_lineno(scanner);
setting->file = scanctx_current_filename(scan_ctx);
@@ -126,14 +122,16 @@ void libconfig_yyerror(void *scanner, struct parse_context *ctx,
}
+/* Line 371 of yacc.c */
+#line 127 "grammar.c"
-/* Line 268 of yacc.c */
-#line 132 "grammar.c"
-
-/* Enabling traces. */
-#ifndef YYDEBUG
-# define YYDEBUG 0
-#endif
+# ifndef YY_NULL
+# if defined __cplusplus && 201103L <= __cplusplus
+# define YY_NULL nullptr
+# else
+# define YY_NULL 0
+# endif
+# endif
/* Enabling verbose error messages. */
#ifdef YYERROR_VERBOSE
@@ -143,11 +141,17 @@ void libconfig_yyerror(void *scanner, struct parse_context *ctx,
# define YYERROR_VERBOSE 0
#endif
-/* Enabling the token table. */
-#ifndef YYTOKEN_TABLE
-# define YYTOKEN_TABLE 0
+/* In a future release of Bison, this section will be replaced
+ by #include "y.tab.h". */
+#ifndef YY_LIBCONFIG_YY_GRAMMAR_H_INCLUDED
+# define YY_LIBCONFIG_YY_GRAMMAR_H_INCLUDED
+/* Enabling traces. */
+#ifndef YYDEBUG
+# define YYDEBUG 0
+#endif
+#if YYDEBUG
+extern int libconfig_yydebug;
#endif
-
/* Tokens. */
#ifndef YYTOKENTYPE
@@ -201,13 +205,11 @@ void libconfig_yyerror(void *scanner, struct parse_context *ctx,
-
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
typedef union YYSTYPE
{
-
-/* Line 293 of yacc.c */
-#line 85 "grammar.y"
+/* Line 387 of yacc.c */
+#line 86 "grammar.y"
int ival;
long long llval;
@@ -215,9 +217,8 @@ typedef union YYSTYPE
char *sval;
-
-/* Line 293 of yacc.c */
-#line 221 "grammar.c"
+/* Line 387 of yacc.c */
+#line 222 "grammar.c"
} YYSTYPE;
# define YYSTYPE_IS_TRIVIAL 1
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
@@ -225,11 +226,26 @@ typedef union YYSTYPE
#endif
-/* Copy the second part of user declarations. */
+#ifdef YYPARSE_PARAM
+#if defined __STDC__ || defined __cplusplus
+int libconfig_yyparse (void *YYPARSE_PARAM);
+#else
+int libconfig_yyparse ();
+#endif
+#else /* ! YYPARSE_PARAM */
+#if defined __STDC__ || defined __cplusplus
+int libconfig_yyparse (void *scanner, struct parse_context *ctx, struct scan_context *scan_ctx);
+#else
+int libconfig_yyparse ();
+#endif
+#endif /* ! YYPARSE_PARAM */
+#endif /* !YY_LIBCONFIG_YY_GRAMMAR_H_INCLUDED */
-/* Line 343 of yacc.c */
-#line 233 "grammar.c"
+/* Copy the second part of user declarations. */
+
+/* Line 390 of yacc.c */
+#line 249 "grammar.c"
#ifdef short
# undef short
@@ -282,24 +298,33 @@ typedef short int yytype_int16;
# if defined YYENABLE_NLS && YYENABLE_NLS
# if ENABLE_NLS
# include <libintl.h> /* INFRINGES ON USER NAME SPACE */
-# define YY_(msgid) dgettext ("bison-runtime", msgid)
+# define YY_(Msgid) dgettext ("bison-runtime", Msgid)
# endif
# endif
# ifndef YY_
-# define YY_(msgid) msgid
+# define YY_(Msgid) Msgid
+# endif
+#endif
+
+#ifndef __attribute__
+/* This feature is available in gcc versions 2.5 and later. */
+# if (! defined __GNUC__ || __GNUC__ < 2 \
+ || (__GNUC__ == 2 && __GNUC_MINOR__ < 5))
+# define __attribute__(Spec) /* empty */
# endif
#endif
/* Suppress unused-variable warnings by "using" E. */
#if ! defined lint || defined __GNUC__
-# define YYUSE(e) ((void) (e))
+# define YYUSE(E) ((void) (E))
#else
-# define YYUSE(e) /* empty */
+# define YYUSE(E) /* empty */
#endif
+
/* Identity function, used to suppress warnings about constant conditions. */
#ifndef lint
-# define YYID(n) (n)
+# define YYID(N) (N)
#else
#if (defined __STDC__ || defined __C99__FUNC__ \
|| defined __cplusplus || defined _MSC_VER)
@@ -335,6 +360,7 @@ YYID (yyi)
# if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
|| defined __cplusplus || defined _MSC_VER)
# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+ /* Use EXIT_SUCCESS as a witness for stdlib.h. */
# ifndef EXIT_SUCCESS
# define EXIT_SUCCESS 0
# endif
@@ -426,20 +452,20 @@ union yyalloc
#endif
#if defined YYCOPY_NEEDED && YYCOPY_NEEDED
-/* Copy COUNT objects from FROM to TO. The source and destination do
+/* Copy COUNT objects from SRC to DST. The source and destination do
not overlap. */
# ifndef YYCOPY
# if defined __GNUC__ && 1 < __GNUC__
-# define YYCOPY(To, From, Count) \
- __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
+# define YYCOPY(Dst, Src, Count) \
+ __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src)))
# else
-# define YYCOPY(To, From, Count) \
- do \
- { \
- YYSIZE_T yyi; \
- for (yyi = 0; yyi < (Count); yyi++) \
- (To)[yyi] = (From)[yyi]; \
- } \
+# define YYCOPY(Dst, Src, Count) \
+ do \
+ { \
+ YYSIZE_T yyi; \
+ for (yyi = 0; yyi < (Count); yyi++) \
+ (Dst)[yyi] = (Src)[yyi]; \
+ } \
while (YYID (0))
# endif
# endif
@@ -529,15 +555,15 @@ static const yytype_int8 yyrhs[] =
/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
static const yytype_uint16 yyrline[] =
{
- 0, 100, 100, 102, 106, 107, 110, 112, 115, 117,
- 118, 121, 123, 128, 127, 147, 146, 170, 169, 192,
- 193, 194, 195, 199, 200, 204, 224, 246, 268, 290,
- 312, 330, 358, 359, 363, 366, 368, 372, 373, 377,
- 380, 382, 387, 386
+ 0, 101, 101, 103, 107, 108, 111, 113, 116, 118,
+ 119, 122, 124, 129, 128, 148, 147, 171, 170, 193,
+ 194, 195, 196, 200, 201, 205, 225, 247, 269, 291,
+ 313, 331, 359, 360, 364, 367, 369, 373, 374, 378,
+ 381, 383, 388, 387
};
#endif
-#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
+#if YYDEBUG || YYERROR_VERBOSE || 0
/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
First, the terminals, then, starting at YYNTOKENS, nonterminals. */
static const char *const yytname[] =
@@ -551,7 +577,7 @@ static const char *const yytname[] =
"setting_terminator", "comma_optional", "setting", "$@1", "array", "$@2",
"list", "$@3", "value", "string", "simple_value", "value_list_sub",
"value_list", "value_list_optional", "simple_value_list_sub",
- "simple_value_list", "simple_value_list_optional", "group", "$@4", 0
+ "simple_value_list", "simple_value_list_optional", "group", "$@4", YY_NULL
};
#endif
@@ -640,10 +666,10 @@ static const yytype_uint8 yytable[] =
45, 48, 47, 40, 0, 46, 0, 7
};
-#define yypact_value_is_default(yystate) \
- ((yystate) == (-26))
+#define yypact_value_is_default(Yystate) \
+ (!!((Yystate) == (-26)))
-#define yytable_value_is_error(yytable_value) \
+#define yytable_value_is_error(Yytable_value) \
YYID (0)
static const yytype_int8 yycheck[] =
@@ -693,62 +719,35 @@ static const yytype_uint8 yystos[] =
#define YYRECOVERING() (!!yyerrstatus)
-#define YYBACKUP(Token, Value) \
-do \
- if (yychar == YYEMPTY && yylen == 1) \
- { \
- yychar = (Token); \
- yylval = (Value); \
- YYPOPSTACK (1); \
- goto yybackup; \
- } \
- else \
- { \
+#define YYBACKUP(Token, Value) \
+do \
+ if (yychar == YYEMPTY) \
+ { \
+ yychar = (Token); \
+ yylval = (Value); \
+ YYPOPSTACK (yylen); \
+ yystate = *yyssp; \
+ goto yybackup; \
+ } \
+ else \
+ { \
yyerror (scanner, ctx, scan_ctx, YY_("syntax error: cannot back up")); \
YYERROR; \
} \
while (YYID (0))
-
+/* Error token number */
#define YYTERROR 1
#define YYERRCODE 256
-/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
- If N is 0, then set CURRENT to the empty location which ends
- the previous symbol: RHS[0] (always defined). */
-
-#define YYRHSLOC(Rhs, K) ((Rhs)[K])
-#ifndef YYLLOC_DEFAULT
-# define YYLLOC_DEFAULT(Current, Rhs, N) \
- do \
- if (YYID (N)) \
- { \
- (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \
- (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \
- (Current).last_line = YYRHSLOC (Rhs, N).last_line; \
- (Current).last_column = YYRHSLOC (Rhs, N).last_column; \
- } \
- else \
- { \
- (Current).first_line = (Current).last_line = \
- YYRHSLOC (Rhs, 0).last_line; \
- (Current).first_column = (Current).last_column = \
- YYRHSLOC (Rhs, 0).last_column; \
- } \
- while (YYID (0))
-#endif
-
-
/* This macro is provided for backward compatibility. */
-
#ifndef YY_LOCATION_PRINT
# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
#endif
/* YYLEX -- calling `yylex' with the right arguments. */
-
#ifdef YYLEX_PARAM
# define YYLEX yylex (&yylval, YYLEX_PARAM)
#else
@@ -801,6 +800,8 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, scanner, ctx, scan_ctx)
struct scan_context *scan_ctx;
#endif
{
+ FILE *yyo = yyoutput;
+ YYUSE (yyo);
if (!yyvaluep)
return;
YYUSE (scanner);
@@ -812,11 +813,7 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, scanner, ctx, scan_ctx)
# else
YYUSE (yyoutput);
# endif
- switch (yytype)
- {
- default:
- break;
- }
+ YYUSE (yytype);
}
@@ -1061,12 +1058,11 @@ static int
yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
yytype_int16 *yyssp, int yytoken)
{
- YYSIZE_T yysize0 = yytnamerr (0, yytname[yytoken]);
+ YYSIZE_T yysize0 = yytnamerr (YY_NULL, yytname[yytoken]);
YYSIZE_T yysize = yysize0;
- YYSIZE_T yysize1;
enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
/* Internationalized format string. */
- const char *yyformat = 0;
+ const char *yyformat = YY_NULL;
/* Arguments of yyformat. */
char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
/* Number of reported tokens (one for the "unexpected", one per
@@ -1126,11 +1122,13 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
break;
}
yyarg[yycount++] = yytname[yyx];
- yysize1 = yysize + yytnamerr (0, yytname[yyx]);
- if (! (yysize <= yysize1
- && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
- return 2;
- yysize = yysize1;
+ {
+ YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULL, yytname[yyx]);
+ if (! (yysize <= yysize1
+ && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+ return 2;
+ yysize = yysize1;
+ }
}
}
}
@@ -1150,10 +1148,12 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
# undef YYCASE_
}
- yysize1 = yysize + yystrlen (yyformat);
- if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
- return 2;
- yysize = yysize1;
+ {
+ YYSIZE_T yysize1 = yysize + yystrlen (yyformat);
+ if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+ return 2;
+ yysize = yysize1;
+ }
if (*yymsg_alloc < yysize)
{
@@ -1213,29 +1213,10 @@ yydestruct (yymsg, yytype, yyvaluep, scanner, ctx, scan_ctx)
YY_SYMBOL_PRINT (yymsg ? yymsg : "Deleting", yytype, yyvaluep, yylocationp);
- switch (yytype)
- {
-
- default:
- break;
- }
+ YYUSE (yytype);
}
-/* Prevent warnings from -Wmissing-prototypes. */
-#ifdef YYPARSE_PARAM
-#if defined __STDC__ || defined __cplusplus
-int yyparse (void *YYPARSE_PARAM);
-#else
-int yyparse ();
-#endif
-#else /* ! YYPARSE_PARAM */
-#if defined __STDC__ || defined __cplusplus
-int yyparse (void *scanner, struct parse_context *ctx, struct scan_context *scan_ctx);
-#else
-int yyparse ();
-#endif
-#endif /* ! YYPARSE_PARAM */
/*----------.
@@ -1269,8 +1250,31 @@ yyparse (scanner, ctx, scan_ctx)
/* The lookahead symbol. */
int yychar;
+
+#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
+/* Suppress an incorrect diagnostic about yylval being uninitialized. */
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \
+ _Pragma ("GCC diagnostic push") \
+ _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\
+ _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")
+# define YY_IGNORE_MAYBE_UNINITIALIZED_END \
+ _Pragma ("GCC diagnostic pop")
+#else
+/* Default value used for initialization, for pacifying older GCCs
+ or non-GCC compilers. */
+static YYSTYPE yyval_default;
+# define YY_INITIAL_VALUE(Value) = Value
+#endif
+#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+# define YY_IGNORE_MAYBE_UNINITIALIZED_END
+#endif
+#ifndef YY_INITIAL_VALUE
+# define YY_INITIAL_VALUE(Value) /* Nothing. */
+#endif
+
/* The semantic value of the lookahead symbol. */
-YYSTYPE yylval;
+YYSTYPE yylval YY_INITIAL_VALUE(yyval_default);
/* Number of syntax errors so far. */
int yynerrs;
@@ -1283,7 +1287,7 @@ YYSTYPE yylval;
`yyss': related to states.
`yyvs': related to semantic values.
- Refer to the stacks thru separate pointers, to allow yyoverflow
+ Refer to the stacks through separate pointers, to allow yyoverflow
to reallocate them elsewhere. */
/* The state stack. */
@@ -1301,7 +1305,7 @@ YYSTYPE yylval;
int yyn;
int yyresult;
/* Lookahead token as an internal (translated) token number. */
- int yytoken;
+ int yytoken = 0;
/* The variables used to return semantic value and location from the
action routines. */
YYSTYPE yyval;
@@ -1319,9 +1323,8 @@ YYSTYPE yylval;
Keep to zero when no symbol should be popped. */
int yylen = 0;
- yytoken = 0;
- yyss = yyssa;
- yyvs = yyvsa;
+ yyssp = yyss = yyssa;
+ yyvsp = yyvs = yyvsa;
yystacksize = YYINITDEPTH;
YYDPRINTF ((stderr, "Starting parse\n"));
@@ -1330,14 +1333,6 @@ YYSTYPE yylval;
yyerrstatus = 0;
yynerrs = 0;
yychar = YYEMPTY; /* Cause a token to be read. */
-
- /* Initialize stack pointers.
- Waste one element of value and location stack
- so that they stay on the same level as the state stack.
- The wasted elements are never initialized. */
- yyssp = yyss;
- yyvsp = yyvs;
-
goto yysetstate;
/*------------------------------------------------------------.
@@ -1478,7 +1473,9 @@ yybackup:
yychar = YYEMPTY;
yystate = yyn;
+ YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
*++yyvsp = yylval;
+ YY_IGNORE_MAYBE_UNINITIALIZED_END
goto yynewstate;
@@ -1515,9 +1512,8 @@ yyreduce:
switch (yyn)
{
case 13:
-
-/* Line 1806 of yacc.c */
-#line 128 "grammar.y"
+/* Line 1802 of yacc.c */
+#line 129 "grammar.y"
{
ctx->setting = config_setting_add(ctx->parent, (yyvsp[(1) - (1)].sval), CONFIG_TYPE_NONE);
@@ -1534,9 +1530,8 @@ yyreduce:
break;
case 15:
-
-/* Line 1806 of yacc.c */
-#line 147 "grammar.y"
+/* Line 1802 of yacc.c */
+#line 148 "grammar.y"
{
if(IN_LIST())
{
@@ -1553,9 +1548,8 @@ yyreduce:
break;
case 16:
-
-/* Line 1806 of yacc.c */
-#line 162 "grammar.y"
+/* Line 1802 of yacc.c */
+#line 163 "grammar.y"
{
if(ctx->parent)
ctx->parent = ctx->parent->parent;
@@ -1563,9 +1557,8 @@ yyreduce:
break;
case 17:
-
-/* Line 1806 of yacc.c */
-#line 170 "grammar.y"
+/* Line 1802 of yacc.c */
+#line 171 "grammar.y"
{
if(IN_LIST())
{
@@ -1582,9 +1575,8 @@ yyreduce:
break;
case 18:
-
-/* Line 1806 of yacc.c */
-#line 185 "grammar.y"
+/* Line 1802 of yacc.c */
+#line 186 "grammar.y"
{
if(ctx->parent)
ctx->parent = ctx->parent->parent;
@@ -1592,28 +1584,25 @@ yyreduce:
break;
case 23:
-
-/* Line 1806 of yacc.c */
-#line 199 "grammar.y"
+/* Line 1802 of yacc.c */
+#line 200 "grammar.y"
{ parsectx_append_string(ctx, (yyvsp[(1) - (1)].sval)); free((yyvsp[(1) - (1)].sval)); }
break;
case 24:
-
-/* Line 1806 of yacc.c */
-#line 200 "grammar.y"
+/* Line 1802 of yacc.c */
+#line 201 "grammar.y"
{ parsectx_append_string(ctx, (yyvsp[(2) - (2)].sval)); free((yyvsp[(2) - (2)].sval)); }
break;
case 25:
-
-/* Line 1806 of yacc.c */
-#line 205 "grammar.y"
+/* Line 1802 of yacc.c */
+#line 206 "grammar.y"
{
if(IN_ARRAY() || IN_LIST())
{
- config_setting_t *e = config_setting_set_bool_elem(ctx->parent, -1,
- (int)(yyvsp[(1) - (1)].ival));
+ struct config_setting_t *e = config_setting_set_bool_elem(ctx->parent, -1,
+ (int)(yyvsp[(1) - (1)].ival));
if(! e)
{
@@ -1631,13 +1620,12 @@ yyreduce:
break;
case 26:
-
-/* Line 1806 of yacc.c */
-#line 225 "grammar.y"
+/* Line 1802 of yacc.c */
+#line 226 "grammar.y"
{
if(IN_ARRAY() || IN_LIST())
{
- config_setting_t *e = config_setting_set_int_elem(ctx->parent, -1, (yyvsp[(1) - (1)].ival));
+ struct config_setting_t *e = config_setting_set_int_elem(ctx->parent, -1, (yyvsp[(1) - (1)].ival));
if(! e)
{
libconfig_yyerror(scanner, ctx, scan_ctx, err_array_elem_type);
@@ -1658,13 +1646,12 @@ yyreduce:
break;
case 27:
-
-/* Line 1806 of yacc.c */
-#line 247 "grammar.y"
+/* Line 1802 of yacc.c */
+#line 248 "grammar.y"
{
if(IN_ARRAY() || IN_LIST())
{
- config_setting_t *e = config_setting_set_int64_elem(ctx->parent, -1, (yyvsp[(1) - (1)].llval));
+ struct config_setting_t *e = config_setting_set_int64_elem(ctx->parent, -1, (yyvsp[(1) - (1)].llval));
if(! e)
{
libconfig_yyerror(scanner, ctx, scan_ctx, err_array_elem_type);
@@ -1685,13 +1672,12 @@ yyreduce:
break;
case 28:
-
-/* Line 1806 of yacc.c */
-#line 269 "grammar.y"
+/* Line 1802 of yacc.c */
+#line 270 "grammar.y"
{
if(IN_ARRAY() || IN_LIST())
{
- config_setting_t *e = config_setting_set_int_elem(ctx->parent, -1, (yyvsp[(1) - (1)].ival));
+ struct config_setting_t *e = config_setting_set_int_elem(ctx->parent, -1, (yyvsp[(1) - (1)].ival));
if(! e)
{
libconfig_yyerror(scanner, ctx, scan_ctx, err_array_elem_type);
@@ -1712,13 +1698,12 @@ yyreduce:
break;
case 29:
-
-/* Line 1806 of yacc.c */
-#line 291 "grammar.y"
+/* Line 1802 of yacc.c */
+#line 292 "grammar.y"
{
if(IN_ARRAY() || IN_LIST())
{
- config_setting_t *e = config_setting_set_int64_elem(ctx->parent, -1, (yyvsp[(1) - (1)].llval));
+ struct config_setting_t *e = config_setting_set_int64_elem(ctx->parent, -1, (yyvsp[(1) - (1)].llval));
if(! e)
{
libconfig_yyerror(scanner, ctx, scan_ctx, err_array_elem_type);
@@ -1739,13 +1724,12 @@ yyreduce:
break;
case 30:
-
-/* Line 1806 of yacc.c */
-#line 313 "grammar.y"
+/* Line 1802 of yacc.c */
+#line 314 "grammar.y"
{
if(IN_ARRAY() || IN_LIST())
{
- config_setting_t *e = config_setting_set_float_elem(ctx->parent, -1, (yyvsp[(1) - (1)].fval));
+ struct config_setting_t *e = config_setting_set_float_elem(ctx->parent, -1, (yyvsp[(1) - (1)].fval));
if(! e)
{
libconfig_yyerror(scanner, ctx, scan_ctx, err_array_elem_type);
@@ -1762,14 +1746,13 @@ yyreduce:
break;
case 31:
-
-/* Line 1806 of yacc.c */
-#line 331 "grammar.y"
+/* Line 1802 of yacc.c */
+#line 332 "grammar.y"
{
if(IN_ARRAY() || IN_LIST())
{
const char *s = parsectx_take_string(ctx);
- config_setting_t *e = config_setting_set_string_elem(ctx->parent, -1, s);
+ struct config_setting_t *e = config_setting_set_string_elem(ctx->parent, -1, s);
_delete(s);
if(! e)
@@ -1792,9 +1775,8 @@ yyreduce:
break;
case 42:
-
-/* Line 1806 of yacc.c */
-#line 387 "grammar.y"
+/* Line 1802 of yacc.c */
+#line 388 "grammar.y"
{
if(IN_LIST())
{
@@ -1811,9 +1793,8 @@ yyreduce:
break;
case 43:
-
-/* Line 1806 of yacc.c */
-#line 402 "grammar.y"
+/* Line 1802 of yacc.c */
+#line 403 "grammar.y"
{
if(ctx->parent)
ctx->parent = ctx->parent->parent;
@@ -1821,9 +1802,8 @@ yyreduce:
break;
-
-/* Line 1806 of yacc.c */
-#line 1829 "grammar.c"
+/* Line 1802 of yacc.c */
+#line 1809 "grammar.c"
default: break;
}
/* User semantic actions sometimes alter yychar, and that requires
@@ -1986,7 +1966,9 @@ yyerrlab1:
YY_STACK_PRINT (yyss, yyssp);
}
+ YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
*++yyvsp = yylval;
+ YY_IGNORE_MAYBE_UNINITIALIZED_END
/* Shift the error token. */
@@ -2010,7 +1992,7 @@ yyabortlab:
yyresult = 1;
goto yyreturn;
-#if !defined(yyoverflow) || YYERROR_VERBOSE
+#if !defined yyoverflow || YYERROR_VERBOSE
/*-------------------------------------------------.
| yyexhaustedlab -- memory exhaustion comes here. |
`-------------------------------------------------*/
@@ -2052,8 +2034,6 @@ yyreturn:
}
-
-/* Line 2067 of yacc.c */
-#line 408 "grammar.y"
-
+/* Line 2050 of yacc.c */
+#line 409 "grammar.y"
diff --git a/3rdparty/libconfig/grammar.h b/3rdparty/libconfig/grammar.h
index d7fd02cc8..86b7b65cd 100644
--- a/3rdparty/libconfig/grammar.h
+++ b/3rdparty/libconfig/grammar.h
@@ -1,8 +1,8 @@
-/* A Bison parser, made by GNU Bison 2.5. */
+/* A Bison parser, made by GNU Bison 2.7.12-4996. */
/* Bison interface for Yacc-like parsers in C
- Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc.
+ Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -30,6 +30,15 @@
This special exception was added by the Free Software Foundation in
version 2.2 of Bison. */
+#ifndef YY_LIBCONFIG_YY_GRAMMAR_H_INCLUDED
+# define YY_LIBCONFIG_YY_GRAMMAR_H_INCLUDED
+/* Enabling traces. */
+#ifndef YYDEBUG
+# define YYDEBUG 0
+#endif
+#if YYDEBUG
+extern int libconfig_yydebug;
+#endif
/* Tokens. */
#ifndef YYTOKENTYPE
@@ -83,13 +92,11 @@
-
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
typedef union YYSTYPE
{
-
-/* Line 2068 of yacc.c */
-#line 85 "grammar.y"
+/* Line 2060 of yacc.c */
+#line 86 "grammar.y"
int ival;
long long llval;
@@ -97,9 +104,8 @@ typedef union YYSTYPE
char *sval;
-
-/* Line 2068 of yacc.c */
-#line 103 "grammar.h"
+/* Line 2060 of yacc.c */
+#line 109 "grammar.h"
} YYSTYPE;
# define YYSTYPE_IS_TRIVIAL 1
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
@@ -107,5 +113,18 @@ typedef union YYSTYPE
#endif
+#ifdef YYPARSE_PARAM
+#if defined __STDC__ || defined __cplusplus
+int libconfig_yyparse (void *YYPARSE_PARAM);
+#else
+int libconfig_yyparse ();
+#endif
+#else /* ! YYPARSE_PARAM */
+#if defined __STDC__ || defined __cplusplus
+int libconfig_yyparse (void *scanner, struct parse_context *ctx, struct scan_context *scan_ctx);
+#else
+int libconfig_yyparse ();
+#endif
+#endif /* ! YYPARSE_PARAM */
-
+#endif /* !YY_LIBCONFIG_YY_GRAMMAR_H_INCLUDED */
diff --git a/3rdparty/libconfig/libconfig-1.4.9 b/3rdparty/libconfig/libconfig-1.4.9
deleted file mode 100644
index e69de29bb..000000000
--- a/3rdparty/libconfig/libconfig-1.4.9
+++ /dev/null
diff --git a/3rdparty/libconfig/libconfig-1.5 b/3rdparty/libconfig/libconfig-1.5
new file mode 100644
index 000000000..bf5328dcd
--- /dev/null
+++ b/3rdparty/libconfig/libconfig-1.5
@@ -0,0 +1,2 @@
+Based on https://github.com/hyperrealm/libconfig/releases/tag/v1.5
+f9f23d7a95608936ea7d839731dbd56f1667b7ed
diff --git a/3rdparty/libconfig/libconfig.c b/3rdparty/libconfig/libconfig.c
index 3d03ede9a..0942241c2 100644
--- a/3rdparty/libconfig/libconfig.c
+++ b/3rdparty/libconfig/libconfig.c
@@ -1,7 +1,7 @@
/* ----------------------------------------------------------------------------
libconfig - A library for processing structured configuration files
- Copyright (C) 2013-2015 Hercules Dev Team
- Copyright (C) 2005-2010 Mark A Lindner
+ Copyright (C) 2013-2016 Hercules Dev Team
+ Copyright (C) 2005-2014 Mark A Lindner
This file is part of libconfig.
@@ -24,56 +24,56 @@
#include "ac_config.h"
#endif
-#include "libconfig.h"
-#include "grammar.h"
-#include "scanner.h"
-#include "scanctx.h"
-#include "parsectx.h"
-#include "wincompat.h"
-
#include <locale.h>
#ifdef HAVE_XLOCALE_H
#include <xlocale.h>
#endif
+#include <ctype.h>
+#include <float.h>
+#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <ctype.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+
+#include "libconfig.h"
+#include "parsectx.h"
+#include "scanctx.h"
+#include "wincompat.h"
+#include "grammar.h"
+#include "scanner.h"
#define PATH_TOKENS ":/"
#define CHUNK_SIZE 16
-#define FLOAT_PRECISION 10
+#define FLOAT_PRECISION DBL_DIG
-#define _new(T) (T *)calloc(sizeof(T), 1) /* zeroed */
+#define _new(T) (T *)calloc(1, sizeof(T)) /* zeroed */
#define _delete(P) free((void *)(P))
/* ------------------------------------------------------------------------- */
#ifndef LIBCONFIG_STATIC
-#if (defined(WIN32) || defined(_WIN32) || defined(__WIN32__))
+#if (defined(WIN32) || defined(_WIN32) || defined(__WIN32__) \
+ || defined(WIN64) || defined(_WIN64))
BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
{
return(TRUE);
}
-#endif /* WIN32 */
+#endif /* WIN32 || WIN64 */
#endif /* LIBCONFIG_STATIC */
/* ------------------------------------------------------------------------- */
static const char *__io_error = "file I/O error";
-static void __config_list_destroy(config_list_t *list);
-static void __config_write_setting(const config_setting_t *setting,
- FILE *stream, int depth,
- unsigned short tab_width);
-
-extern int libconfig_yyparse(void *scanner, struct parse_context *ctx,
- struct scan_context *scan_ctx);
-extern int libconfig_yylex_init_extra(struct scan_context *scan_ctx,
- yyscan_t *scanner);
+static void __config_list_destroy(struct config_list_t *list);
+static void __config_write_setting(const struct config_t *config,
+ const struct config_setting_t *setting,
+ FILE *stream, int depth);
/* ------------------------------------------------------------------------- */
@@ -106,6 +106,11 @@ static void __config_locale_override(void)
/* ------------------------------------------------------------------------- */
+#define __config_has_option(C, O) \
+ (((C)->options & (O)) != 0)
+
+/* ------------------------------------------------------------------------- */
+
static void __config_locale_restore(void)
{
#if (defined(WIN32) || defined(_WIN32) || defined(__WIN32__)) \
@@ -169,9 +174,9 @@ static void __config_indent(FILE *stream, int depth, unsigned short w)
/* ------------------------------------------------------------------------- */
-static void __config_write_value(const config_value_t *value, int type,
- int format, int depth,
- unsigned short tab_width, FILE *stream)
+static void __config_write_value(const struct config_t *config,
+ const union config_value_t *value, int type,
+ int format, int depth, FILE *stream)
{
char fbuf[64];
@@ -297,20 +302,20 @@ static void __config_write_value(const config_value_t *value, int type,
/* list */
case CONFIG_TYPE_LIST:
{
- config_list_t *list = value->list;
+ struct config_list_t *list = value->list;
fprintf(stream, "( ");
if(list)
{
int len = list->length;
- config_setting_t **s;
+ struct config_setting_t **s;
for(s = list->elements; len--; s++)
{
- __config_write_value(&((*s)->value), (*s)->type,
- config_setting_get_format(*s),
- depth + 1, tab_width, stream);
+ __config_write_value(config, &((*s)->value), (*s)->type,
+ config_setting_get_format(*s), depth + 1,
+ stream);
if(len)
fputc(',', stream);
@@ -326,20 +331,20 @@ static void __config_write_value(const config_value_t *value, int type,
/* array */
case CONFIG_TYPE_ARRAY:
{
- config_list_t *list = value->list;
+ struct config_list_t *list = value->list;
fprintf(stream, "[ ");
if(list)
{
int len = list->length;
- config_setting_t **s;
+ struct config_setting_t **s;
for(s = list->elements; len--; s++)
{
- __config_write_value(&((*s)->value), (*s)->type,
- config_setting_get_format(*s),
- depth + 1, tab_width, stream);
+ __config_write_value(config, &((*s)->value), (*s)->type,
+ config_setting_get_format(*s), depth + 1,
+ stream);
if(len)
fputc(',', stream);
@@ -355,32 +360,32 @@ static void __config_write_value(const config_value_t *value, int type,
/* group */
case CONFIG_TYPE_GROUP:
{
- config_list_t *list = value->list;
+ struct config_list_t *list = value->list;
if(depth > 0)
{
-#ifdef K_AND_R_STYLE /* Horrendous, but many people like it. */
- fputc(' ', stream);
-#else
- fputc('\n', stream);
+ if((config->options & CONFIG_OPTION_OPEN_BRACE_ON_SEPARATE_LINE) != 0)
+ {
+ fputc('\n', stream);
+
+ if(depth > 1)
+ __config_indent(stream, depth, config->tab_width);
+ }
- if(depth > 1)
- __config_indent(stream, depth, tab_width);
-#endif
fprintf(stream, "{\n");
}
if(list)
{
int len = list->length;
- config_setting_t **s;
+ struct config_setting_t **s;
for(s = list->elements; len--; s++)
- __config_write_setting(*s, stream, depth + 1, tab_width);
+ __config_write_setting(config, *s, stream, depth + 1);
}
if(depth > 1)
- __config_indent(stream, depth, tab_width);
+ __config_indent(stream, depth, config->tab_width);
if(depth > 0)
fputc('}', stream);
@@ -397,13 +402,13 @@ static void __config_write_value(const config_value_t *value, int type,
/* ------------------------------------------------------------------------- */
-static void __config_list_add(config_list_t *list, config_setting_t *setting)
+static void __config_list_add(struct config_list_t *list, struct config_setting_t *setting)
{
if((list->length % CHUNK_SIZE) == 0)
{
- list->elements = (config_setting_t **)realloc(
+ list->elements = (struct config_setting_t **)realloc(
list->elements,
- (list->length + CHUNK_SIZE) * sizeof(config_setting_t *));
+ (list->length + CHUNK_SIZE) * sizeof(struct config_setting_t *));
}
list->elements[list->length] = setting;
@@ -412,11 +417,11 @@ static void __config_list_add(config_list_t *list, config_setting_t *setting)
/* ------------------------------------------------------------------------- */
-static config_setting_t *__config_list_search(config_list_t *list,
+static struct config_setting_t *__config_list_search(struct config_list_t *list,
const char *name,
unsigned int *idx)
{
- config_setting_t **found = NULL;
+ struct config_setting_t **found = NULL;
unsigned int i;
if(! list)
@@ -441,15 +446,15 @@ static config_setting_t *__config_list_search(config_list_t *list,
/* ------------------------------------------------------------------------- */
-static config_setting_t *__config_list_remove(config_list_t *list, int idx)
+static struct config_setting_t *__config_list_remove(struct config_list_t *list, int idx)
{
- config_setting_t *removed = *(list->elements + idx);
- int offset = (idx * sizeof(config_setting_t *));
+ struct config_setting_t *removed = *(list->elements + idx);
+ int offset = (idx * sizeof(struct config_setting_t *));
int len = list->length - 1 - idx;
char *base = (char *)list->elements + offset;
- memmove(base, base + sizeof(config_setting_t *),
- len * sizeof(config_setting_t *));
+ memmove(base, base + sizeof(struct config_setting_t *),
+ len * sizeof(struct config_setting_t *));
list->length--;
@@ -460,7 +465,7 @@ static config_setting_t *__config_list_remove(config_list_t *list, int idx)
/* ------------------------------------------------------------------------- */
-static void __config_setting_destroy(config_setting_t *setting)
+static void __config_setting_destroy(struct config_setting_t *setting)
{
if(setting)
{
@@ -487,9 +492,9 @@ static void __config_setting_destroy(config_setting_t *setting)
/* ------------------------------------------------------------------------- */
-static void __config_list_destroy(config_list_t *list)
+static void __config_list_destroy(struct config_list_t *list)
{
- config_setting_t **p;
+ struct config_setting_t **p;
unsigned int i;
if(! list)
@@ -508,7 +513,7 @@ static void __config_list_destroy(config_list_t *list)
/* ------------------------------------------------------------------------- */
-static int __config_vector_checktype(const config_setting_t *vector, int type)
+static int __config_vector_checktype(const struct config_setting_t *vector, int type)
{
/* if the array is empty, then it has no type yet */
@@ -538,9 +543,8 @@ static int __config_validate_name(const char *name)
if(*p == '\0')
return(CONFIG_FALSE);
- if(! isalpha((int)*p) && !isdigit((int)*p) && (*p != '*')) {
+ if(! isalpha((int)*p) && !isdigit((int)*p) && (*p != '*'))
return(CONFIG_FALSE);
- }
for(++p; *p; ++p)
{
@@ -553,20 +557,19 @@ static int __config_validate_name(const char *name)
/* ------------------------------------------------------------------------- */
-static int __config_read(config_t *config, FILE *stream, const char *filename,
+static int __config_read(struct config_t *config, FILE *stream, const char *filename,
const char *str)
{
yyscan_t scanner;
struct scan_context scan_ctx;
struct parse_context parse_ctx;
- /*YY_BUFFER_STATE buffer = NULL;*/
int r;
/* Reinitialize the config */
void (*destructor)(void *) = config->destructor;
const char *include_dir = config->include_dir;
unsigned short tab_width = config->tab_width;
- unsigned short flags = config->flags;
+ int options = config->options;
config->include_dir = NULL;
config_destroy(config);
@@ -575,7 +578,7 @@ static int __config_read(config_t *config, FILE *stream, const char *filename,
config->destructor = destructor;
config->include_dir = include_dir;
config->tab_width = tab_width;
- config->flags = flags;
+ config->options = options;
parsectx_init(&parse_ctx);
parse_ctx.config = config;
@@ -585,13 +588,14 @@ static int __config_read(config_t *config, FILE *stream, const char *filename,
__config_locale_override();
scanctx_init(&scan_ctx, filename);
+ config->root->file = scanctx_current_filename(&scan_ctx);
scan_ctx.config = config;
libconfig_yylex_init_extra(&scan_ctx, &scanner);
if(stream)
libconfig_yyrestart(stream, scanner);
else /* read from string */
- /*buffer = */libconfig_yy_scan_string(str, scanner);
+ (void)libconfig_yy_scan_string(str, scanner);
libconfig_yyset_lineno(1, scanner);
r = libconfig_yyparse(scanner, &parse_ctx, &scan_ctx);
@@ -619,63 +623,91 @@ static int __config_read(config_t *config, FILE *stream, const char *filename,
/* ------------------------------------------------------------------------- */
-int config_read(config_t *config, FILE *stream)
+int config_read(struct config_t *config, FILE *stream)
{
return(__config_read(config, stream, NULL, NULL));
}
/* ------------------------------------------------------------------------- */
-int config_read_string(config_t *config, const char *str)
+int config_read_string(struct config_t *config, const char *str)
{
return(__config_read(config, NULL, NULL, str));
}
/* ------------------------------------------------------------------------- */
-static void __config_write_setting(const config_setting_t *setting,
- FILE *stream, int depth,
- unsigned short tab_width)
+static void __config_write_setting(const struct config_t *config,
+ const struct config_setting_t *setting,
+ FILE *stream, int depth)
{
+ char group_assign_char = __config_has_option(
+ config, CONFIG_OPTION_COLON_ASSIGNMENT_FOR_GROUPS) ? ':' : '=';
+
+ char nongroup_assign_char = __config_has_option(
+ config, CONFIG_OPTION_COLON_ASSIGNMENT_FOR_NON_GROUPS) ? ':' : '=';
+
if(depth > 1)
- __config_indent(stream, depth, tab_width);
+ __config_indent(stream, depth, config->tab_width);
+
if(setting->name)
{
fputs(setting->name, stream);
- fprintf(stream, " %c ", (setting->type == CONFIG_TYPE_GROUP ? ':' : '='));
+ fprintf(stream, " %c ", ((setting->type == CONFIG_TYPE_GROUP)
+ ? group_assign_char
+ : nongroup_assign_char));
}
- __config_write_value(&(setting->value), setting->type,
- config_setting_get_format(setting),
- depth, tab_width, stream);
+ __config_write_value(config, &(setting->value), setting->type,
+ config_setting_get_format(setting), depth, stream);
if(depth > 0)
{
- fputc(';', stream);
+ if(__config_has_option(config, CONFIG_OPTION_SEMICOLON_SEPARATORS))
+ fputc(';', stream);
+
fputc('\n', stream);
}
}
/* ------------------------------------------------------------------------- */
-void config_write(const config_t *config, FILE *stream)
+void config_write(const struct config_t *config, FILE *stream)
{
__config_locale_override();
- __config_write_setting(config->root, stream, 0, config->tab_width);
+ __config_write_setting(config, config->root, stream, 0);
__config_locale_restore();
}
/* ------------------------------------------------------------------------- */
-int config_read_file(config_t *config, const char *filename)
+int config_read_file(struct config_t *config, const char *filename)
{
- int ret;
+ int ret, ok = 0;
+
FILE *stream = fopen(filename, "rt");
- if(! stream)
+ if(stream != NULL)
+ {
+ // On some operating systems, fopen() succeeds on a directory.
+ int fd = fileno(stream);
+ struct stat statbuf;
+
+ if(fstat(fd, &statbuf) == 0)
+ {
+ // Only proceed if this is not a directory.
+ if(!S_ISDIR(statbuf.st_mode))
+ ok = 1;
+ }
+ }
+
+ if(!ok)
{
+ if(stream != NULL)
+ fclose(stream);
+
config->error_text = __io_error;
config->error_type = CONFIG_ERR_FILE_IO;
return(CONFIG_FALSE);
@@ -689,25 +721,26 @@ int config_read_file(config_t *config, const char *filename)
/* ------------------------------------------------------------------------- */
-int config_write_file(config_t *config, const char *filename)
+int config_write_file(struct config_t *config, const char *filename)
{
- FILE *f = fopen(filename, "wt");
- if(! f)
+ FILE *stream = fopen(filename, "wt");
+ if(stream == NULL)
{
config->error_text = __io_error;
config->error_type = CONFIG_ERR_FILE_IO;
+ config->error_file = filename;
return(CONFIG_FALSE);
}
- config_write(config, f);
- fclose(f);
+ config_write(config, stream);
+ fclose(stream);
config->error_type = CONFIG_ERR_NONE;
return(CONFIG_TRUE);
}
/* ------------------------------------------------------------------------- */
-void config_destroy(config_t *config)
+void config_destroy(struct config_t *config)
{
unsigned int count = config->num_filenames;
const char **f;
@@ -720,52 +753,69 @@ void config_destroy(config_t *config)
_delete(config->filenames);
_delete(config->include_dir);
- memset((void *)config, 0, sizeof(config_t));
+ memset((void *)config, 0, sizeof(struct config_t));
}
/* ------------------------------------------------------------------------- */
-void config_init(config_t *config)
+void config_init(struct config_t *config)
{
- memset((void *)config, 0, sizeof(config_t));
+ memset((void *)config, 0, sizeof(struct config_t));
- config->root = _new(config_setting_t);
+ config->root = _new(struct config_setting_t);
config->root->type = CONFIG_TYPE_GROUP;
config->root->config = config;
+ config->options = (CONFIG_OPTION_SEMICOLON_SEPARATORS
+ | CONFIG_OPTION_COLON_ASSIGNMENT_FOR_GROUPS
+ | CONFIG_OPTION_OPEN_BRACE_ON_SEPARATE_LINE);
config->tab_width = 2;
}
/* ------------------------------------------------------------------------- */
-void config_set_auto_convert(config_t *config, int flag)
+void config_set_auto_convert(struct config_t *config, int flag)
{
if(flag)
- config->flags |= CONFIG_OPTION_AUTOCONVERT;
+ config->options |= CONFIG_OPTION_AUTOCONVERT;
else
- config->flags &= ~CONFIG_OPTION_AUTOCONVERT;
+ config->options &= ~CONFIG_OPTION_AUTOCONVERT;
+}
+
+/* ------------------------------------------------------------------------- */
+
+int config_get_auto_convert(const struct config_t *config)
+{
+ return(__config_has_option(config, CONFIG_OPTION_AUTOCONVERT));
+}
+
+/* ------------------------------------------------------------------------- */
+
+void config_set_options(struct config_t *config, int options)
+{
+ config->options = options;
}
/* ------------------------------------------------------------------------- */
-int config_get_auto_convert(const config_t *config)
+int config_get_options(const struct config_t *config)
{
- return((config->flags & CONFIG_OPTION_AUTOCONVERT) != 0);
+ return(config->options);
}
/* ------------------------------------------------------------------------- */
-static config_setting_t *config_setting_create(config_setting_t *parent,
+static struct config_setting_t *config_setting_create(struct config_setting_t *parent,
const char *name, int type)
{
- config_setting_t *setting;
- config_list_t *list;
+ struct config_setting_t *setting;
+ struct config_list_t *list;
if((parent->type != CONFIG_TYPE_GROUP)
&& (parent->type != CONFIG_TYPE_ARRAY)
&& (parent->type != CONFIG_TYPE_LIST))
return(NULL);
- setting = _new(config_setting_t);
+ setting = _new(struct config_setting_t);
setting->parent = parent;
setting->name = (name == NULL) ? NULL : strdup(name);
setting->type = type;
@@ -776,7 +826,7 @@ static config_setting_t *config_setting_create(config_setting_t *parent,
list = parent->value.list;
if(! list)
- list = parent->value.list = _new(config_list_t);
+ list = parent->value.list = _new(struct config_list_t);
__config_list_add(list, setting);
@@ -785,7 +835,7 @@ static config_setting_t *config_setting_create(config_setting_t *parent,
/* ------------------------------------------------------------------------- */
-static int __config_setting_get_int(const config_setting_t *setting,
+static int __config_setting_get_int(const struct config_setting_t *setting,
int *value)
{
switch(setting->type)
@@ -803,7 +853,7 @@ static int __config_setting_get_int(const config_setting_t *setting,
return(CONFIG_TRUE);
case CONFIG_TYPE_FLOAT:
- if((setting->config->flags & CONFIG_OPTION_AUTOCONVERT) != 0)
+ if(__config_has_option(setting->config, CONFIG_OPTION_AUTOCONVERT))
{
*value = (int)(setting->value.fval);
return(CONFIG_TRUE);
@@ -818,7 +868,7 @@ static int __config_setting_get_int(const config_setting_t *setting,
/* ------------------------------------------------------------------------- */
-int config_setting_get_int(const config_setting_t *setting)
+int config_setting_get_int(const struct config_setting_t *setting)
{
int value = 0;
__config_setting_get_int(setting, &value);
@@ -827,7 +877,7 @@ int config_setting_get_int(const config_setting_t *setting)
/* ------------------------------------------------------------------------- */
-static int __config_setting_get_int64(const config_setting_t *setting,
+static int __config_setting_get_int64(const struct config_setting_t *setting,
long long *value)
{
switch(setting->type)
@@ -841,7 +891,7 @@ static int __config_setting_get_int64(const config_setting_t *setting,
return(CONFIG_TRUE);
case CONFIG_TYPE_FLOAT:
- if((setting->config->flags & CONFIG_OPTION_AUTOCONVERT) != 0)
+ if(__config_has_option(setting->config, CONFIG_OPTION_AUTOCONVERT))
{
*value = (long long)(setting->value.fval);
return(CONFIG_TRUE);
@@ -856,7 +906,7 @@ static int __config_setting_get_int64(const config_setting_t *setting,
/* ------------------------------------------------------------------------- */
-long long config_setting_get_int64(const config_setting_t *setting)
+long long config_setting_get_int64(const struct config_setting_t *setting)
{
long long value = 0;
__config_setting_get_int64(setting, &value);
@@ -865,10 +915,10 @@ long long config_setting_get_int64(const config_setting_t *setting)
/* ------------------------------------------------------------------------- */
-int config_setting_lookup_int(const config_setting_t *setting,
+int config_setting_lookup_int(const struct config_setting_t *setting,
const char *name, int *value)
{
- config_setting_t *member = config_setting_get_member(setting, name);
+ struct config_setting_t *member = config_setting_get_member(setting, name);
if(! member)
return(CONFIG_FALSE);
@@ -877,10 +927,10 @@ int config_setting_lookup_int(const config_setting_t *setting,
/* ------------------------------------------------------------------------- */
-int config_setting_lookup_int64(const config_setting_t *setting,
+int config_setting_lookup_int64(const struct config_setting_t *setting,
const char *name, long long *value)
{
- config_setting_t *member = config_setting_get_member(setting, name);
+ struct config_setting_t *member = config_setting_get_member(setting, name);
if(! member)
return(CONFIG_FALSE);
@@ -889,7 +939,7 @@ int config_setting_lookup_int64(const config_setting_t *setting,
/* ------------------------------------------------------------------------- */
-static int __config_setting_get_float(const config_setting_t *setting,
+static int __config_setting_get_float(const struct config_setting_t *setting,
double *value)
{
switch(setting->type)
@@ -923,7 +973,7 @@ static int __config_setting_get_float(const config_setting_t *setting,
/* ------------------------------------------------------------------------- */
-double config_setting_get_float(const config_setting_t *setting)
+double config_setting_get_float(const struct config_setting_t *setting)
{
double value = 0.0;
__config_setting_get_float(setting, &value);
@@ -932,10 +982,10 @@ double config_setting_get_float(const config_setting_t *setting)
/* ------------------------------------------------------------------------- */
-int config_setting_lookup_float(const config_setting_t *setting,
+int config_setting_lookup_float(const struct config_setting_t *setting,
const char *name, double *value)
{
- config_setting_t *member = config_setting_get_member(setting, name);
+ struct config_setting_t *member = config_setting_get_member(setting, name);
if(! member)
return(CONFIG_FALSE);
@@ -944,10 +994,10 @@ int config_setting_lookup_float(const config_setting_t *setting,
/* ------------------------------------------------------------------------- */
-int config_setting_lookup_string(const config_setting_t *setting,
+int config_setting_lookup_string(const struct config_setting_t *setting,
const char *name, const char **value)
{
- config_setting_t *member = config_setting_get_member(setting, name);
+ struct config_setting_t *member = config_setting_get_member(setting, name);
if(! member)
return(CONFIG_FALSE);
@@ -960,10 +1010,10 @@ int config_setting_lookup_string(const config_setting_t *setting,
/* ------------------------------------------------------------------------- */
-int config_setting_lookup_bool(const config_setting_t *setting,
+int config_setting_lookup_bool(const struct config_setting_t *setting,
const char *name, int *value)
{
- config_setting_t *member = config_setting_get_member(setting, name);
+ struct config_setting_t *member = config_setting_get_member(setting, name);
if(! member)
return(CONFIG_FALSE);
@@ -976,7 +1026,7 @@ int config_setting_lookup_bool(const config_setting_t *setting,
/* ------------------------------------------------------------------------- */
-int config_setting_set_int(config_setting_t *setting, int value)
+int config_setting_set_int(struct config_setting_t *setting, int value)
{
switch(setting->type)
{
@@ -1004,7 +1054,7 @@ int config_setting_set_int(config_setting_t *setting, int value)
/* ------------------------------------------------------------------------- */
-int config_setting_set_int64(config_setting_t *setting, long long value)
+int config_setting_set_int64(struct config_setting_t *setting, long long value)
{
switch(setting->type)
{
@@ -1039,7 +1089,7 @@ int config_setting_set_int64(config_setting_t *setting, long long value)
/* ------------------------------------------------------------------------- */
-int config_setting_set_float(config_setting_t *setting, double value)
+int config_setting_set_float(struct config_setting_t *setting, double value)
{
switch(setting->type)
{
@@ -1052,7 +1102,7 @@ int config_setting_set_float(config_setting_t *setting, double value)
return(CONFIG_TRUE);
case CONFIG_TYPE_INT:
- if((setting->config->flags & CONFIG_OPTION_AUTOCONVERT) != 0)
+ if(__config_has_option(setting->config, CONFIG_OPTION_AUTOCONVERT))
{
setting->value.ival = (int)value;
return(CONFIG_TRUE);
@@ -1061,7 +1111,7 @@ int config_setting_set_float(config_setting_t *setting, double value)
return(CONFIG_FALSE);
case CONFIG_TYPE_INT64:
- if((setting->config->flags & CONFIG_OPTION_AUTOCONVERT) != 0)
+ if(__config_has_option(setting->config, CONFIG_OPTION_AUTOCONVERT))
{
setting->value.llval = (long long)value;
return(CONFIG_TRUE);
@@ -1076,14 +1126,14 @@ int config_setting_set_float(config_setting_t *setting, double value)
/* ------------------------------------------------------------------------- */
-int config_setting_get_bool(const config_setting_t *setting)
+int config_setting_get_bool(const struct config_setting_t *setting)
{
return((setting->type == CONFIG_TYPE_BOOL) ? setting->value.ival : 0);
}
/* ------------------------------------------------------------------------- */
-int config_setting_set_bool(config_setting_t *setting, int value)
+int config_setting_set_bool(struct config_setting_t *setting, int value)
{
if(setting->type == CONFIG_TYPE_NONE)
setting->type = CONFIG_TYPE_BOOL;
@@ -1096,14 +1146,14 @@ int config_setting_set_bool(config_setting_t *setting, int value)
/* ------------------------------------------------------------------------- */
-const char *config_setting_get_string(const config_setting_t *setting)
+const char *config_setting_get_string(const struct config_setting_t *setting)
{
return((setting->type == CONFIG_TYPE_STRING) ? setting->value.sval : NULL);
}
/* ------------------------------------------------------------------------- */
-int config_setting_set_string(config_setting_t *setting, const char *value)
+int config_setting_set_string(struct config_setting_t *setting, const char *value)
{
if(setting->type == CONFIG_TYPE_NONE)
setting->type = CONFIG_TYPE_STRING;
@@ -1119,7 +1169,7 @@ int config_setting_set_string(config_setting_t *setting, const char *value)
/* ------------------------------------------------------------------------- */
-int config_setting_set_format(config_setting_t *setting, short format)
+int config_setting_set_format(struct config_setting_t *setting, short format)
{
if(((setting->type != CONFIG_TYPE_INT)
&& (setting->type != CONFIG_TYPE_INT64))
@@ -1133,7 +1183,7 @@ int config_setting_set_format(config_setting_t *setting, short format)
/* ------------------------------------------------------------------------- */
-short config_setting_get_format(const config_setting_t *setting)
+short config_setting_get_format(const struct config_setting_t *setting)
{
return(setting->format != 0 ? setting->format
: setting->config->default_format);
@@ -1141,11 +1191,11 @@ short config_setting_get_format(const config_setting_t *setting)
/* ------------------------------------------------------------------------- */
-config_setting_t *config_lookup_from(config_setting_t *setting,
- const char *path)
+struct config_setting_t *config_setting_lookup(struct config_setting_t *setting,
+ const char *path)
{
const char *p = path;
- config_setting_t *found;
+ struct config_setting_t *found;
for(;;)
{
@@ -1174,17 +1224,17 @@ config_setting_t *config_lookup_from(config_setting_t *setting,
/* ------------------------------------------------------------------------- */
-config_setting_t *config_lookup(const config_t *config, const char *path)
+struct config_setting_t *config_lookup(const struct config_t *config, const char *path)
{
- return(config_lookup_from(config->root, path));
+ return(config_setting_lookup(config->root, path));
}
/* ------------------------------------------------------------------------- */
-int config_lookup_string(const config_t *config, const char *path,
+int config_lookup_string(const struct config_t *config, const char *path,
const char **value)
{
- const config_setting_t *s = config_lookup(config, path);
+ const struct config_setting_t *s = config_lookup(config, path);
if(! s)
return(CONFIG_FALSE);
@@ -1198,10 +1248,10 @@ int config_lookup_string(const config_t *config, const char *path,
/* ------------------------------------------------------------------------- */
-int config_lookup_int(const config_t *config, const char *path,
+int config_lookup_int(const struct config_t *config, const char *path,
int *value)
{
- const config_setting_t *s = config_lookup(config, path);
+ const struct config_setting_t *s = config_lookup(config, path);
if(! s)
return(CONFIG_FALSE);
@@ -1210,10 +1260,10 @@ int config_lookup_int(const config_t *config, const char *path,
/* ------------------------------------------------------------------------- */
-int config_lookup_int64(const config_t *config, const char *path,
+int config_lookup_int64(const struct config_t *config, const char *path,
long long *value)
{
- const config_setting_t *s = config_lookup(config, path);
+ const struct config_setting_t *s = config_lookup(config, path);
if(! s)
return(CONFIG_FALSE);
@@ -1222,10 +1272,10 @@ int config_lookup_int64(const config_t *config, const char *path,
/* ------------------------------------------------------------------------- */
-int config_lookup_float(const config_t *config, const char *path,
+int config_lookup_float(const struct config_t *config, const char *path,
double *value)
{
- const config_setting_t *s = config_lookup(config, path);
+ const struct config_setting_t *s = config_lookup(config, path);
if(! s)
return(CONFIG_FALSE);
@@ -1234,9 +1284,9 @@ int config_lookup_float(const config_t *config, const char *path,
/* ------------------------------------------------------------------------- */
-int config_lookup_bool(const config_t *config, const char *path, int *value)
+int config_lookup_bool(const struct config_t *config, const char *path, int *value)
{
- const config_setting_t *s = config_lookup(config, path);
+ const struct config_setting_t *s = config_lookup(config, path);
if(! s)
return(CONFIG_FALSE);
@@ -1249,19 +1299,19 @@ int config_lookup_bool(const config_t *config, const char *path, int *value)
/* ------------------------------------------------------------------------- */
-int config_setting_get_int_elem(const config_setting_t *vector, int idx)
+int config_setting_get_int_elem(const struct config_setting_t *vector, int idx)
{
- const config_setting_t *element = config_setting_get_elem(vector, idx);
+ const struct config_setting_t *element = config_setting_get_elem(vector, idx);
return(element ? config_setting_get_int(element) : 0);
}
/* ------------------------------------------------------------------------- */
-config_setting_t *config_setting_set_int_elem(config_setting_t *vector,
+struct config_setting_t *config_setting_set_int_elem(struct config_setting_t *vector,
int idx, int value)
{
- config_setting_t *element = NULL;
+ struct config_setting_t *element = NULL;
if((vector->type != CONFIG_TYPE_ARRAY) && (vector->type != CONFIG_TYPE_LIST))
return(NULL);
@@ -1289,20 +1339,20 @@ config_setting_t *config_setting_set_int_elem(config_setting_t *vector,
/* ------------------------------------------------------------------------- */
-long long config_setting_get_int64_elem(const config_setting_t *vector,
+long long config_setting_get_int64_elem(const struct config_setting_t *vector,
int idx)
{
- const config_setting_t *element = config_setting_get_elem(vector, idx);
+ const struct config_setting_t *element = config_setting_get_elem(vector, idx);
return(element ? config_setting_get_int64(element) : 0);
}
/* ------------------------------------------------------------------------- */
-config_setting_t *config_setting_set_int64_elem(config_setting_t *vector,
+struct config_setting_t *config_setting_set_int64_elem(struct config_setting_t *vector,
int idx, long long value)
{
- config_setting_t *element = NULL;
+ struct config_setting_t *element = NULL;
if((vector->type != CONFIG_TYPE_ARRAY) && (vector->type != CONFIG_TYPE_LIST))
return(NULL);
@@ -1330,19 +1380,19 @@ config_setting_t *config_setting_set_int64_elem(config_setting_t *vector,
/* ------------------------------------------------------------------------- */
-double config_setting_get_float_elem(const config_setting_t *vector, int idx)
+double config_setting_get_float_elem(const struct config_setting_t *vector, int idx)
{
- config_setting_t *element = config_setting_get_elem(vector, idx);
+ struct config_setting_t *element = config_setting_get_elem(vector, idx);
return(element ? config_setting_get_float(element) : 0.0);
}
/* ------------------------------------------------------------------------- */
-config_setting_t *config_setting_set_float_elem(config_setting_t *vector,
+struct config_setting_t *config_setting_set_float_elem(struct config_setting_t *vector,
int idx, double value)
{
- config_setting_t *element = NULL;
+ struct config_setting_t *element = NULL;
if((vector->type != CONFIG_TYPE_ARRAY) && (vector->type != CONFIG_TYPE_LIST))
return(NULL);
@@ -1368,9 +1418,9 @@ config_setting_t *config_setting_set_float_elem(config_setting_t *vector,
/* ------------------------------------------------------------------------- */
-int config_setting_get_bool_elem(const config_setting_t *vector, int idx)
+int config_setting_get_bool_elem(const struct config_setting_t *vector, int idx)
{
- config_setting_t *element = config_setting_get_elem(vector, idx);
+ struct config_setting_t *element = config_setting_get_elem(vector, idx);
if(! element)
return(CONFIG_FALSE);
@@ -1383,10 +1433,10 @@ int config_setting_get_bool_elem(const config_setting_t *vector, int idx)
/* ------------------------------------------------------------------------- */
-config_setting_t *config_setting_set_bool_elem(config_setting_t *vector,
+struct config_setting_t *config_setting_set_bool_elem(struct config_setting_t *vector,
int idx, int value)
{
- config_setting_t *element = NULL;
+ struct config_setting_t *element = NULL;
if((vector->type != CONFIG_TYPE_ARRAY) && (vector->type != CONFIG_TYPE_LIST))
return(NULL);
@@ -1412,10 +1462,10 @@ config_setting_t *config_setting_set_bool_elem(config_setting_t *vector,
/* ------------------------------------------------------------------------- */
-const char *config_setting_get_string_elem(const config_setting_t *vector,
+const char *config_setting_get_string_elem(const struct config_setting_t *vector,
int idx)
{
- config_setting_t *element = config_setting_get_elem(vector, idx);
+ struct config_setting_t *element = config_setting_get_elem(vector, idx);
if(! element)
return(NULL);
@@ -1428,10 +1478,10 @@ const char *config_setting_get_string_elem(const config_setting_t *vector,
/* ------------------------------------------------------------------------- */
-config_setting_t *config_setting_set_string_elem(config_setting_t *vector,
+struct config_setting_t *config_setting_set_string_elem(struct config_setting_t *vector,
int idx, const char *value)
{
- config_setting_t *element = NULL;
+ struct config_setting_t *element = NULL;
if((vector->type != CONFIG_TYPE_ARRAY) && (vector->type != CONFIG_TYPE_LIST))
return(NULL);
@@ -1457,10 +1507,10 @@ config_setting_t *config_setting_set_string_elem(config_setting_t *vector,
/* ------------------------------------------------------------------------- */
-config_setting_t *config_setting_get_elem(const config_setting_t *vector,
+struct config_setting_t *config_setting_get_elem(const struct config_setting_t *vector,
unsigned int idx)
{
- config_list_t *list = vector->value.list;
+ struct config_list_t *list = vector->value.list;
if(((vector->type != CONFIG_TYPE_ARRAY)
&& (vector->type != CONFIG_TYPE_LIST)
@@ -1475,7 +1525,7 @@ config_setting_t *config_setting_get_elem(const config_setting_t *vector,
/* ------------------------------------------------------------------------- */
-config_setting_t *config_setting_get_member(const config_setting_t *setting,
+struct config_setting_t *config_setting_get_member(const struct config_setting_t *setting,
const char *name)
{
if(setting->type != CONFIG_TYPE_GROUP)
@@ -1486,14 +1536,14 @@ config_setting_t *config_setting_get_member(const config_setting_t *setting,
/* ------------------------------------------------------------------------- */
-void config_set_destructor(config_t *config, void (*destructor)(void *))
+void config_set_destructor(struct config_t *config, void (*destructor)(void *))
{
config->destructor = destructor;
}
/* ------------------------------------------------------------------------- */
-void config_set_include_dir(config_t *config, const char *include_dir)
+void config_set_include_dir(struct config_t *config, const char *include_dir)
{
_delete(config->include_dir);
config->include_dir = strdup(include_dir);
@@ -1501,7 +1551,7 @@ void config_set_include_dir(config_t *config, const char *include_dir)
/* ------------------------------------------------------------------------- */
-int config_setting_length(const config_setting_t *setting)
+int config_setting_length(const struct config_setting_t *setting)
{
if((setting->type != CONFIG_TYPE_GROUP)
&& (setting->type != CONFIG_TYPE_ARRAY)
@@ -1516,14 +1566,14 @@ int config_setting_length(const config_setting_t *setting)
/* ------------------------------------------------------------------------- */
-void config_setting_set_hook(config_setting_t *setting, void *hook)
+void config_setting_set_hook(struct config_setting_t *setting, void *hook)
{
setting->hook = hook;
}
/* ------------------------------------------------------------------------- */
-config_setting_t *config_setting_add(config_setting_t *parent,
+struct config_setting_t *config_setting_add(struct config_setting_t *parent,
const char *name, int type)
{
if((type < CONFIG_TYPE_NONE) || (type > CONFIG_TYPE_LIST))
@@ -1558,10 +1608,10 @@ config_setting_t *config_setting_add(config_setting_t *parent,
/* ------------------------------------------------------------------------- */
-int config_setting_remove(config_setting_t *parent, const char *name)
+int config_setting_remove(struct config_setting_t *parent, const char *name)
{
unsigned int idx;
- config_setting_t *setting;
+ struct config_setting_t *setting;
if(! parent)
return(CONFIG_FALSE);
@@ -1580,10 +1630,10 @@ int config_setting_remove(config_setting_t *parent, const char *name)
/* ------------------------------------------------------------------------- */
-int config_setting_remove_elem(config_setting_t *parent, unsigned int idx)
+int config_setting_remove_elem(struct config_setting_t *parent, unsigned int idx)
{
- config_list_t *list;
- config_setting_t *removed = NULL;
+ struct config_list_t *list;
+ struct config_setting_t *removed = NULL;
if(! parent)
return(CONFIG_FALSE);
@@ -1606,10 +1656,10 @@ int config_setting_remove_elem(config_setting_t *parent, unsigned int idx)
/* ------------------------------------------------------------------------- */
-int config_setting_index(const config_setting_t *setting)
+int config_setting_index(const struct config_setting_t *setting)
{
- config_setting_t **found = NULL;
- config_list_t *list;
+ struct config_setting_t **found = NULL;
+ struct config_list_t *list;
int i;
if(! setting->parent)
@@ -1627,4 +1677,3 @@ int config_setting_index(const config_setting_t *setting)
}
/* ------------------------------------------------------------------------- */
-/* eof */
diff --git a/3rdparty/libconfig/libconfig.h b/3rdparty/libconfig/libconfig.h
index cc5c5b79f..58c1f914e 100644
--- a/3rdparty/libconfig/libconfig.h
+++ b/3rdparty/libconfig/libconfig.h
@@ -1,7 +1,7 @@
/* ----------------------------------------------------------------------------
libconfig - A library for processing structured configuration files
- Copyright (C) 2013-2015 Hercules Dev Team
- Copyright (C) 2005-2010 Mark A Lindner
+ Copyright (C) 2013-2016 Hercules Dev Team
+ Copyright (C) 2005-2014 Mark A Lindner
This file is part of libconfig.
@@ -40,8 +40,8 @@ extern "C" {
#endif /* WIN32 */
#define LIBCONFIG_VER_MAJOR 1
-#define LIBCONFIG_VER_MINOR 4
-#define LIBCONFIG_VER_REVISION 9
+#define LIBCONFIG_VER_MINOR 5
+#define LIBCONFIG_VER_REVISION 0
#include <stdio.h>
@@ -58,260 +58,267 @@ extern "C" {
#define CONFIG_FORMAT_DEFAULT 0
#define CONFIG_FORMAT_HEX 1
-#define CONFIG_OPTION_AUTOCONVERT 0x01
+#define CONFIG_OPTION_AUTOCONVERT 0x01
+#define CONFIG_OPTION_SEMICOLON_SEPARATORS 0x02
+#define CONFIG_OPTION_COLON_ASSIGNMENT_FOR_GROUPS 0x04
+#define CONFIG_OPTION_COLON_ASSIGNMENT_FOR_NON_GROUPS 0x08
+#define CONFIG_OPTION_OPEN_BRACE_ON_SEPARATE_LINE 0x10
#define CONFIG_TRUE (1)
#define CONFIG_FALSE (0)
-typedef union config_value_t
+union config_value_t
{
int ival;
long long llval;
double fval;
char *sval;
struct config_list_t *list;
-} config_value_t;
+};
-typedef struct config_setting_t
+struct config_setting_t
{
char *name;
short type;
short format;
- config_value_t value;
+ union config_value_t value;
struct config_setting_t *parent;
struct config_t *config;
void *hook;
unsigned int line;
const char *file;
-} config_setting_t;
+};
-typedef enum
+enum config_error_t
{
CONFIG_ERR_NONE = 0,
CONFIG_ERR_FILE_IO = 1,
CONFIG_ERR_PARSE = 2
-} config_error_t;
+};
-typedef struct config_list_t
+struct config_list_t
{
unsigned int length;
- config_setting_t **elements;
-} config_list_t;
+ struct config_setting_t **elements;
+};
-typedef struct config_t
+struct config_t
{
- config_setting_t *root;
+ struct config_setting_t *root;
void (*destructor)(void *);
- unsigned short flags;
+ int options;
unsigned short tab_width;
short default_format;
const char *include_dir;
const char *error_text;
const char *error_file;
int error_line;
- config_error_t error_type;
+ enum config_error_t error_type;
const char **filenames;
unsigned int num_filenames;
-} config_t;
+};
-extern LIBCONFIG_API int config_read(config_t *config, FILE *stream);
-extern LIBCONFIG_API void config_write(const config_t *config, FILE *stream);
+extern LIBCONFIG_API int config_read(struct config_t *config, FILE *stream);
+extern LIBCONFIG_API void config_write(const struct config_t *config, FILE *stream);
-extern LIBCONFIG_API void config_set_default_format(config_t *config,
+extern LIBCONFIG_API void config_set_default_format(struct config_t *config,
short format);
-extern LIBCONFIG_API void config_set_auto_convert(config_t *config, int flag);
-extern LIBCONFIG_API int config_get_auto_convert(const config_t *config);
+extern LIBCONFIG_API void config_set_options(struct config_t *config, int options);
+extern LIBCONFIG_API int config_get_options(const struct config_t *config);
-extern LIBCONFIG_API int config_read_string(config_t *config, const char *str);
+extern LIBCONFIG_API void config_set_auto_convert(struct config_t *config, int flag);
+extern LIBCONFIG_API int config_get_auto_convert(const struct config_t *config);
-extern LIBCONFIG_API int config_read_file(config_t *config,
+extern LIBCONFIG_API int config_read_string(struct config_t *config, const char *str);
+
+extern LIBCONFIG_API int config_read_file(struct config_t *config,
const char *filename);
-extern LIBCONFIG_API int config_write_file(config_t *config,
+extern LIBCONFIG_API int config_write_file(struct config_t *config,
const char *filename);
-extern LIBCONFIG_API void config_set_destructor(config_t *config,
+extern LIBCONFIG_API void config_set_destructor(struct config_t *config,
void (*destructor)(void *));
-extern LIBCONFIG_API void config_set_include_dir(config_t *config,
+extern LIBCONFIG_API void config_set_include_dir(struct config_t *config,
const char *include_dir);
-extern LIBCONFIG_API void config_init(config_t *config);
-extern LIBCONFIG_API void config_destroy(config_t *config);
+extern LIBCONFIG_API void config_init(struct config_t *config);
+extern LIBCONFIG_API void config_destroy(struct config_t *config);
extern LIBCONFIG_API int config_setting_get_int(
- const config_setting_t *setting);
+ const struct config_setting_t *setting);
extern LIBCONFIG_API long long config_setting_get_int64(
- const config_setting_t *setting);
+ const struct config_setting_t *setting);
extern LIBCONFIG_API double config_setting_get_float(
- const config_setting_t *setting);
+ const struct config_setting_t *setting);
extern LIBCONFIG_API int config_setting_get_bool(
- const config_setting_t *setting);
+ const struct config_setting_t *setting);
extern LIBCONFIG_API const char *config_setting_get_string(
- const config_setting_t *setting);
+ const struct config_setting_t *setting);
extern LIBCONFIG_API int config_setting_lookup_int(
- const config_setting_t *setting, const char *name, int *value);
+ const struct config_setting_t *setting, const char *name, int *value);
extern LIBCONFIG_API int config_setting_lookup_int64(
- const config_setting_t *setting, const char *name, long long *value);
+ const struct config_setting_t *setting, const char *name, long long *value);
extern LIBCONFIG_API int config_setting_lookup_float(
- const config_setting_t *setting, const char *name, double *value);
+ const struct config_setting_t *setting, const char *name, double *value);
extern LIBCONFIG_API int config_setting_lookup_bool(
- const config_setting_t *setting, const char *name, int *value);
+ const struct config_setting_t *setting, const char *name, int *value);
extern LIBCONFIG_API int config_setting_lookup_string(
- const config_setting_t *setting, const char *name, const char **value);
+ const struct config_setting_t *setting, const char *name, const char **value);
-extern LIBCONFIG_API int config_setting_set_int(config_setting_t *setting,
+extern LIBCONFIG_API int config_setting_set_int(struct config_setting_t *setting,
int value);
-extern LIBCONFIG_API int config_setting_set_int64(config_setting_t *setting,
+extern LIBCONFIG_API int config_setting_set_int64(struct config_setting_t *setting,
long long value);
-extern LIBCONFIG_API int config_setting_set_float(config_setting_t *setting,
+extern LIBCONFIG_API int config_setting_set_float(struct config_setting_t *setting,
double value);
-extern LIBCONFIG_API int config_setting_set_bool(config_setting_t *setting,
+extern LIBCONFIG_API int config_setting_set_bool(struct config_setting_t *setting,
int value);
-extern LIBCONFIG_API int config_setting_set_string(config_setting_t *setting,
+extern LIBCONFIG_API int config_setting_set_string(struct config_setting_t *setting,
const char *value);
-extern LIBCONFIG_API int config_setting_set_format(config_setting_t *setting,
+extern LIBCONFIG_API int config_setting_set_format(struct config_setting_t *setting,
short format);
extern LIBCONFIG_API short config_setting_get_format(
- const config_setting_t *setting);
+ const struct config_setting_t *setting);
extern LIBCONFIG_API int config_setting_get_int_elem(
- const config_setting_t *setting, int idx);
+ const struct config_setting_t *setting, int idx);
extern LIBCONFIG_API long long config_setting_get_int64_elem(
- const config_setting_t *setting, int idx);
+ const struct config_setting_t *setting, int idx);
extern LIBCONFIG_API double config_setting_get_float_elem(
- const config_setting_t *setting, int idx);
+ const struct config_setting_t *setting, int idx);
extern LIBCONFIG_API int config_setting_get_bool_elem(
- const config_setting_t *setting, int idx);
+ const struct config_setting_t *setting, int idx);
extern LIBCONFIG_API const char *config_setting_get_string_elem(
- const config_setting_t *setting, int idx);
-
-extern LIBCONFIG_API config_setting_t *config_setting_set_int_elem(
- config_setting_t *setting, int idx, int value);
-extern LIBCONFIG_API config_setting_t *config_setting_set_int64_elem(
- config_setting_t *setting, int idx, long long value);
-extern LIBCONFIG_API config_setting_t *config_setting_set_float_elem(
- config_setting_t *setting, int idx, double value);
-extern LIBCONFIG_API config_setting_t *config_setting_set_bool_elem(
- config_setting_t *setting, int idx, int value);
-extern LIBCONFIG_API config_setting_t *config_setting_set_string_elem(
- config_setting_t *setting, int idx, const char *value);
-
-#define /* const char * */ config_get_include_dir(/* const config_t * */ C) \
+ const struct config_setting_t *setting, int idx);
+
+extern LIBCONFIG_API struct config_setting_t *config_setting_set_int_elem(
+ struct config_setting_t *setting, int idx, int value);
+extern LIBCONFIG_API struct config_setting_t *config_setting_set_int64_elem(
+ struct config_setting_t *setting, int idx, long long value);
+extern LIBCONFIG_API struct config_setting_t *config_setting_set_float_elem(
+ struct config_setting_t *setting, int idx, double value);
+extern LIBCONFIG_API struct config_setting_t *config_setting_set_bool_elem(
+ struct config_setting_t *setting, int idx, int value);
+extern LIBCONFIG_API struct config_setting_t *config_setting_set_string_elem(
+ struct config_setting_t *setting, int idx, const char *value);
+
+#define /* const char * */ config_get_include_dir(/* const struct config_t * */ C) \
((C)->include_dir)
-#define /* int */ config_setting_type(/* const config_setting_t * */ S) \
+#define /* int */ config_setting_type(/* const struct config_setting_t * */ S) \
((S)->type)
-#define /* int */ config_setting_is_group(/* const config_setting_t * */ S) \
+#define /* int */ config_setting_is_group(/* const struct config_setting_t * */ S) \
((S)->type == CONFIG_TYPE_GROUP)
-#define /* int */ config_setting_is_array(/* const config_setting_t * */ S) \
+#define /* int */ config_setting_is_array(/* const struct config_setting_t * */ S) \
((S)->type == CONFIG_TYPE_ARRAY)
-#define /* int */ config_setting_is_list(/* const config_setting_t * */ S) \
+#define /* int */ config_setting_is_list(/* const struct config_setting_t * */ S) \
((S)->type == CONFIG_TYPE_LIST)
#define /* int */ config_setting_is_aggregate( \
- /* const config_setting_t * */ S) \
+ /* const struct config_setting_t * */ S) \
(((S)->type == CONFIG_TYPE_GROUP) || ((S)->type == CONFIG_TYPE_LIST) \
|| ((S)->type == CONFIG_TYPE_ARRAY))
-#define /* int */ config_setting_is_number(/* const config_setting_t * */ S) \
+#define /* int */ config_setting_is_number(/* const struct config_setting_t * */ S) \
(((S)->type == CONFIG_TYPE_INT) \
|| ((S)->type == CONFIG_TYPE_INT64) \
|| ((S)->type == CONFIG_TYPE_FLOAT))
-#define /* int */ config_setting_is_scalar(/* const config_setting_t * */ S) \
+#define /* int */ config_setting_is_scalar(/* const struct config_setting_t * */ S) \
(((S)->type == CONFIG_TYPE_BOOL) || ((S)->type == CONFIG_TYPE_STRING) \
|| config_setting_is_number(S))
#define /* const char * */ config_setting_name( \
- /* const config_setting_t * */ S) \
+ /* const struct config_setting_t * */ S) \
((S)->name)
-#define /* config_setting_t * */ config_setting_parent( \
- /* const config_setting_t * */ S) \
+#define /* struct config_setting_t * */ config_setting_parent( \
+ /* const struct config_setting_t * */ S) \
((S)->parent)
#define /* int */ config_setting_is_root( \
- /* const config_setting_t * */ S) \
+ /* const struct config_setting_t * */ S) \
((S)->parent ? CONFIG_FALSE : CONFIG_TRUE)
-extern LIBCONFIG_API int config_setting_index(const config_setting_t *setting);
+extern LIBCONFIG_API int config_setting_index(const struct config_setting_t *setting);
extern LIBCONFIG_API int config_setting_length(
- const config_setting_t *setting);
-extern LIBCONFIG_API config_setting_t *config_setting_get_elem(
- const config_setting_t *setting, unsigned int idx);
+ const struct config_setting_t *setting);
+extern LIBCONFIG_API struct config_setting_t *config_setting_get_elem(
+ const struct config_setting_t *setting, unsigned int idx);
-extern LIBCONFIG_API config_setting_t *config_setting_get_member(
- const config_setting_t *setting, const char *name);
+extern LIBCONFIG_API struct config_setting_t *config_setting_get_member(
+ const struct config_setting_t *setting, const char *name);
-extern LIBCONFIG_API config_setting_t *config_setting_add(
- config_setting_t *parent, const char *name, int type);
-extern LIBCONFIG_API int config_setting_remove(config_setting_t *parent,
+extern LIBCONFIG_API struct config_setting_t *config_setting_add(
+ struct config_setting_t *parent, const char *name, int type);
+extern LIBCONFIG_API int config_setting_remove(struct config_setting_t *parent,
const char *name);
-extern LIBCONFIG_API int config_setting_remove_elem(config_setting_t *parent,
+extern LIBCONFIG_API int config_setting_remove_elem(struct config_setting_t *parent,
unsigned int idx);
-extern LIBCONFIG_API void config_setting_set_hook(config_setting_t *setting,
+extern LIBCONFIG_API void config_setting_set_hook(struct config_setting_t *setting,
void *hook);
#define config_setting_get_hook(S) ((S)->hook)
-extern LIBCONFIG_API config_setting_t *config_lookup(const config_t *config,
+extern LIBCONFIG_API struct config_setting_t *config_lookup(const struct config_t *config,
const char *path);
-extern LIBCONFIG_API config_setting_t *config_lookup_from(
- config_setting_t *setting, const char *path);
+extern LIBCONFIG_API struct config_setting_t *config_setting_lookup(
+ struct config_setting_t *setting, const char *path);
-extern LIBCONFIG_API int config_lookup_int(const config_t *config,
+extern LIBCONFIG_API int config_lookup_int(const struct config_t *config,
const char *path, int *value);
-extern LIBCONFIG_API int config_lookup_int64(const config_t *config,
+extern LIBCONFIG_API int config_lookup_int64(const struct config_t *config,
const char *path,
long long *value);
-extern LIBCONFIG_API int config_lookup_float(const config_t *config,
+extern LIBCONFIG_API int config_lookup_float(const struct config_t *config,
const char *path, double *value);
-extern LIBCONFIG_API int config_lookup_bool(const config_t *config,
+extern LIBCONFIG_API int config_lookup_bool(const struct config_t *config,
const char *path, int *value);
-extern LIBCONFIG_API int config_lookup_string(const config_t *config,
+extern LIBCONFIG_API int config_lookup_string(const struct config_t *config,
const char *path,
const char **value);
-#define /* config_setting_t * */ config_root_setting( \
- /* const config_t * */ C) \
+#define /* struct config_setting_t * */ config_root_setting( \
+ /* const struct config_t * */ C) \
((C)->root)
-#define /* void */ config_set_default_format(/* config_t * */ C, \
+#define /* void */ config_set_default_format(/* struct config_t * */ C, \
/* short */ F) \
(C)->default_format = (F)
-#define /* short */ config_get_default_format(/* config_t * */ C) \
+#define /* short */ config_get_default_format(/* struct config_t * */ C) \
((C)->default_format)
-#define /* void */ config_set_tab_width(/* config_t * */ C, \
+#define /* void */ config_set_tab_width(/* struct config_t * */ C, \
/* unsigned short */ W) \
(C)->tab_width = ((W) & 0x0F)
-#define /* unsigned char */ config_get_tab_width(/* const config_t * */ C) \
+#define /* unsigned char */ config_get_tab_width(/* const struct config_t * */ C) \
((C)->tab_width)
#define /* unsigned short */ config_setting_source_line( \
- /* const config_setting_t * */ S) \
+ /* const struct config_setting_t * */ S) \
((S)->line)
#define /* const char */ config_setting_source_file( \
- /* const config_setting_t * */ S) \
+ /* const struct config_setting_t * */ S) \
((S)->file)
-#define /* const char * */ config_error_text(/* const config_t * */ C) \
+#define /* const char * */ config_error_text(/* const struct config_t * */ C) \
((C)->error_text)
-#define /* const char * */ config_error_file(/* const config_t * */ C) \
+#define /* const char * */ config_error_file(/* const struct config_t * */ C) \
((C)->error_file)
-#define /* int */ config_error_line(/* const config_t * */ C) \
+#define /* int */ config_error_line(/* const struct config_t * */ C) \
((C)->error_line)
-#define /* config_error_t */ config_error_type(/* const config_t * */ C) \
+#define /* enum config_error_t */ config_error_type(/* const struct config_t * */ C) \
((C)->error_type)
#ifdef __cplusplus
diff --git a/3rdparty/libconfig/parsectx.h b/3rdparty/libconfig/parsectx.h
index 732e5f20d..4d1f261d9 100644
--- a/3rdparty/libconfig/parsectx.h
+++ b/3rdparty/libconfig/parsectx.h
@@ -1,7 +1,7 @@
/* ----------------------------------------------------------------------------
libconfig - A library for processing structured configuration files
- Copyright (C) 2013-2015 Hercules Dev Team
- Copyright (C) 2005-2010 Mark A Lindner
+ Copyright (C) 2013-2016 Hercules Dev Team
+ Copyright (C) 2005-2014 Mark A Lindner
This file is part of libconfig.
@@ -28,9 +28,9 @@
struct parse_context
{
- config_t *config;
- config_setting_t *parent;
- config_setting_t *setting;
+ struct config_t *config;
+ struct config_setting_t *parent;
+ struct config_setting_t *setting;
char *name;
strbuf_t string;
};
diff --git a/3rdparty/libconfig/scanctx.c b/3rdparty/libconfig/scanctx.c
index f2fe8cd80..b3d9a6379 100644
--- a/3rdparty/libconfig/scanctx.c
+++ b/3rdparty/libconfig/scanctx.c
@@ -1,7 +1,7 @@
/* ----------------------------------------------------------------------------
libconfig - A library for processing structured configuration files
- Copyright (C) 2013-2015 Hercules Dev Team
- Copyright (C) 2005-2010 Mark A Lindner
+ Copyright (C) 2013-2016 Hercules Dev Team
+ Copyright (C) 2005-2014 Mark A Lindner
This file is part of libconfig.
@@ -40,7 +40,6 @@ static const char *err_include_too_deep = "include file nesting too deep";
static const char *__scanctx_add_filename(struct scan_context *ctx,
const char *filename)
{
-#ifndef __clang_analyzer__ // FIXME: Clang's static analyzer doesn't like this
unsigned int count = ctx->num_filenames;
const char **f;
@@ -62,7 +61,6 @@ static const char *__scanctx_add_filename(struct scan_context *ctx,
ctx->filenames[ctx->num_filenames] = filename;
++ctx->num_filenames;
-#endif // __clang_analyzer__
return(filename);
}
@@ -71,8 +69,10 @@ static const char *__scanctx_add_filename(struct scan_context *ctx,
void scanctx_init(struct scan_context *ctx, const char *top_filename)
{
memset(ctx, 0, sizeof(struct scan_context));
+#ifndef __clang_analyzer__ // FIXME: Clang's static analyzer doesn't like this
if(top_filename)
ctx->top_filename = __scanctx_add_filename(ctx, strdup(top_filename));
+#endif // __clang_analyzer__
}
/* ------------------------------------------------------------------------- */
@@ -124,7 +124,9 @@ FILE *scanctx_push_include(struct scan_context *ctx, void *buffer,
if(fp)
{
ctx->streams[ctx->depth] = fp;
+#ifndef __clang_analyzer__ // FIXME: Clang's static analyzer doesn't like this
ctx->files[ctx->depth] = __scanctx_add_filename(ctx, file);
+#endif // __clang_analyzer__
ctx->buffers[ctx->depth] = buffer;
++(ctx->depth);
}
@@ -170,4 +172,3 @@ const char *scanctx_current_filename(struct scan_context *ctx)
}
/* ------------------------------------------------------------------------- */
-/* eof */
diff --git a/3rdparty/libconfig/scanctx.h b/3rdparty/libconfig/scanctx.h
index 9bb1f1a0d..004523e2a 100644
--- a/3rdparty/libconfig/scanctx.h
+++ b/3rdparty/libconfig/scanctx.h
@@ -1,7 +1,7 @@
/* ----------------------------------------------------------------------------
libconfig - A library for processing structured configuration files
- Copyright (C) 2013-2015 Hercules Dev Team
- Copyright (C) 2005-2010 Mark A Lindner
+ Copyright (C) 2013-2016 Hercules Dev Team
+ Copyright (C) 2005-2014 Mark A Lindner
This file is part of libconfig.
@@ -33,7 +33,7 @@
struct scan_context
{
- config_t *config;
+ struct config_t *config;
const char *top_filename;
const char *files[MAX_INCLUDE_DEPTH];
void *buffers[MAX_INCLUDE_DEPTH];
diff --git a/3rdparty/libconfig/scanner.c b/3rdparty/libconfig/scanner.c
index 96c01fc5f..abe173830 100644
--- a/3rdparty/libconfig/scanner.c
+++ b/3rdparty/libconfig/scanner.c
@@ -1,10 +1,6 @@
#line 2 "scanner.c"
-#line 36 "scanner.l"
-#include "scanctx.h"
-
-
-#line 8 "scanner.c"
+#line 4 "scanner.c"
#define YY_INT_ALIGNED short int
@@ -12,8 +8,8 @@
#define FLEX_SCANNER
#define YY_FLEX_MAJOR_VERSION 2
-#define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 39
+#define YY_FLEX_MINOR_VERSION 6
+#define YY_FLEX_SUBMINOR_VERSION 0
#if YY_FLEX_SUBMINOR_VERSION > 0
#define FLEX_BETA
#endif
@@ -163,7 +159,15 @@ typedef void* yyscan_t;
/* Size of default input buffer. */
#ifndef YY_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k.
+ * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
+ * Ditto for the __ia64__ case accordingly.
+ */
+#define YY_BUF_SIZE 32768
+#else
#define YY_BUF_SIZE 16384
+#endif /* __ia64__ */
#endif
/* The state buf must be large enough to hold one state per character in the main buffer.
@@ -348,7 +352,7 @@ void libconfig_yyfree (void * ,yyscan_t yyscanner );
#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
-#define libconfig_yywrap(yyscanner) 1
+#define libconfig_yywrap(yyscanner) (/*CONSTCOND*/1)
#define YY_SKIP_YYWRAP
typedef unsigned char YY_CHAR;
@@ -360,6 +364,9 @@ typedef int yy_state_type;
static yy_state_type yy_get_previous_state (yyscan_t yyscanner );
static yy_state_type yy_try_NUL_trans (yy_state_type current_state ,yyscan_t yyscanner);
static int yy_get_next_buffer (yyscan_t yyscanner );
+#if defined(__GNUC__) && __GNUC__ >= 3
+__attribute__((__noreturn__))
+#endif
static void yy_fatal_error (yyconst char msg[] ,yyscan_t yyscanner );
/* Done after the current pattern has been matched and before the
@@ -399,7 +406,7 @@ static yyconst flex_int16_t yy_accept[123] =
19, 0
} ;
-static yyconst flex_int32_t yy_ec[256] =
+static yyconst YY_CHAR yy_ec[256] =
{ 0,
1, 1, 1, 1, 1, 1, 1, 1, 2, 3,
1, 4, 5, 1, 1, 1, 1, 1, 1, 1,
@@ -431,7 +438,7 @@ static yyconst flex_int32_t yy_ec[256] =
1, 1, 1, 1, 1
} ;
-static yyconst flex_int32_t yy_meta[51] =
+static yyconst YY_CHAR yy_meta[51] =
{ 0,
1, 1, 1, 1, 1, 2, 1, 3, 1, 1,
3, 1, 1, 3, 3, 1, 4, 4, 1, 1,
@@ -440,7 +447,7 @@ static yyconst flex_int32_t yy_meta[51] =
4, 4, 3, 3, 3, 3, 3, 3, 1, 1
} ;
-static yyconst flex_int16_t yy_base[134] =
+static yyconst flex_uint16_t yy_base[134] =
{ 0,
0, 49, 49, 50, 48, 49, 50, 51, 244, 243,
248, 251, 245, 251, 251, 251, 243, 251, 251, 0,
@@ -478,7 +485,7 @@ static yyconst flex_int16_t yy_def[134] =
122, 122, 122
} ;
-static yyconst flex_int16_t yy_nxt[302] =
+static yyconst flex_uint16_t yy_nxt[302] =
{ 0,
12, 13, 14, 15, 15, 16, 17, 12, 18, 19,
20, 21, 22, 21, 23, 24, 25, 26, 27, 28,
@@ -572,7 +579,8 @@ static yyconst flex_int32_t yy_rule_can_match_eol[46] =
/* -*- mode: C -*- */
/* --------------------------------------------------------------------------
libconfig - A library for processing structured configuration files
- Copyright (C) 2005-2010 Mark A Lindner
+ Copyright (C) 2013-2016 Hercules Dev Team
+ Copyright (C) 2005-2014 Mark A Lindner
This file is part of libconfig.
@@ -592,20 +600,20 @@ static yyconst flex_int32_t yy_rule_can_match_eol[46] =
----------------------------------------------------------------------------
*/
#define YY_NO_UNISTD_H 1
+#line 37 "scanner.l"
-#line 40 "scanner.l"
#ifdef _MSC_VER
#pragma warning (disable: 4996)
-/* disable MSVC warning "signed/unsigned mismatch" associated with code generated by flex versions such as 2.5.35. */
-#pragma warning (disable:4018)
#endif
#include <stdlib.h>
#include <ctype.h>
#include <string.h>
+#include <limits.h>
+#include "parsectx.h"
+#include "scanctx.h"
#include "grammar.h"
#include "wincompat.h"
-#include "parsectx.h"
#define YY_NO_INPUT // Suppress generation of useless input() function
@@ -643,15 +651,8 @@ static unsigned long long fromhex(const char *s)
#endif /* __MINGW32__ */
}
-static int fromihex(const char *s) {
- unsigned long l = strtoul(s, NULL, 16);
- if (l > INT32_MAX)
- l &= INT32_MAX;
- return (int)l;
-}
-
-#line 655 "scanner.c"
+#line 656 "scanner.c"
#define INITIAL 0
#define COMMENT 1
@@ -722,11 +723,11 @@ void libconfig_yyset_extra (YY_EXTRA_TYPE user_defined ,yyscan_t yyscanner );
FILE *libconfig_yyget_in (yyscan_t yyscanner );
-void libconfig_yyset_in (FILE * in_str ,yyscan_t yyscanner );
+void libconfig_yyset_in (FILE * _in_str ,yyscan_t yyscanner );
FILE *libconfig_yyget_out (yyscan_t yyscanner );
-void libconfig_yyset_out (FILE * out_str ,yyscan_t yyscanner );
+void libconfig_yyset_out (FILE * _out_str ,yyscan_t yyscanner );
yy_size_t libconfig_yyget_leng (yyscan_t yyscanner );
@@ -734,11 +735,11 @@ char *libconfig_yyget_text (yyscan_t yyscanner );
int libconfig_yyget_lineno (yyscan_t yyscanner );
-void libconfig_yyset_lineno (int line_number ,yyscan_t yyscanner );
+void libconfig_yyset_lineno (int _line_number ,yyscan_t yyscanner );
int libconfig_yyget_column (yyscan_t yyscanner );
-void libconfig_yyset_column (int column_no ,yyscan_t yyscanner );
+void libconfig_yyset_column (int _column_no ,yyscan_t yyscanner );
YYSTYPE * libconfig_yyget_lval (yyscan_t yyscanner );
@@ -756,6 +757,10 @@ extern int libconfig_yywrap (yyscan_t yyscanner );
#endif
#endif
+#ifndef YY_NO_UNPUT
+
+#endif
+
#ifndef yytext_ptr
static void yy_flex_strncpy (char *,yyconst char *,int ,yyscan_t yyscanner);
#endif
@@ -776,7 +781,12 @@ static int input (yyscan_t yyscanner );
/* Amount of stuff to slurp up with each read. */
#ifndef YY_READ_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k */
+#define YY_READ_BUF_SIZE 16384
+#else
#define YY_READ_BUF_SIZE 8192
+#endif /* __ia64__ */
#endif
/* Copy whatever the last rule matched to the standard output. */
@@ -865,7 +875,7 @@ extern int libconfig_yylex \
/* Code executed at the end of each rule. */
#ifndef YY_BREAK
-#define YY_BREAK break;
+#define YY_BREAK /*LINTED*/break;
#endif
#define YY_RULE_SETUP \
@@ -878,9 +888,9 @@ extern int libconfig_yylex \
*/
YY_DECL
{
- register yy_state_type yy_current_state;
- register char *yy_cp, *yy_bp;
- register int yy_act;
+ yy_state_type yy_current_state;
+ char *yy_cp, *yy_bp;
+ int yy_act;
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
yylval = yylval_param;
@@ -912,12 +922,12 @@ YY_DECL
}
{
-#line 112 "scanner.l"
+#line 103 "scanner.l"
-#line 919 "scanner.c"
+#line 929 "scanner.c"
- while ( 1 ) /* loops until end-of-file is reached */
+ while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */
{
yy_cp = yyg->yy_c_buf_p;
@@ -934,7 +944,7 @@ YY_DECL
yy_match:
do
{
- register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ;
+ YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ;
if ( yy_accept[yy_current_state] )
{
yyg->yy_last_accepting_state = yy_current_state;
@@ -983,69 +993,69 @@ do_action: /* This label is used only to access EOF actions. */
case 1:
YY_RULE_SETUP
-#line 114 "scanner.l"
+#line 105 "scanner.l"
{ BEGIN COMMENT; }
YY_BREAK
case 2:
YY_RULE_SETUP
-#line 115 "scanner.l"
+#line 106 "scanner.l"
{ BEGIN INITIAL; }
YY_BREAK
case 3:
YY_RULE_SETUP
-#line 116 "scanner.l"
+#line 107 "scanner.l"
{ /* ignore */ }
YY_BREAK
case 4:
/* rule 4 can match eol */
YY_RULE_SETUP
-#line 117 "scanner.l"
+#line 108 "scanner.l"
{ /* ignore */ }
YY_BREAK
case 5:
YY_RULE_SETUP
-#line 119 "scanner.l"
+#line 110 "scanner.l"
{ BEGIN STRING; }
YY_BREAK
case 6:
/* rule 6 can match eol */
YY_RULE_SETUP
-#line 120 "scanner.l"
+#line 111 "scanner.l"
{ scanctx_append_string(yyextra, yytext); }
YY_BREAK
case 7:
YY_RULE_SETUP
-#line 121 "scanner.l"
+#line 112 "scanner.l"
{ scanctx_append_string(yyextra, "\n"); }
YY_BREAK
case 8:
YY_RULE_SETUP
-#line 122 "scanner.l"
+#line 113 "scanner.l"
{ scanctx_append_string(yyextra, "\r"); }
YY_BREAK
case 9:
YY_RULE_SETUP
-#line 123 "scanner.l"
+#line 114 "scanner.l"
{ scanctx_append_string(yyextra, "\t"); }
YY_BREAK
case 10:
YY_RULE_SETUP
-#line 124 "scanner.l"
+#line 115 "scanner.l"
{ scanctx_append_string(yyextra, "\f"); }
YY_BREAK
case 11:
YY_RULE_SETUP
-#line 125 "scanner.l"
+#line 116 "scanner.l"
{ scanctx_append_string(yyextra, "\\"); }
YY_BREAK
case 12:
YY_RULE_SETUP
-#line 126 "scanner.l"
+#line 117 "scanner.l"
{ scanctx_append_string(yyextra, "\""); }
YY_BREAK
case 13:
YY_RULE_SETUP
-#line 127 "scanner.l"
+#line 118 "scanner.l"
{
char c[2] = { (char)(strtol(yytext + 2, NULL, 16) & 0xFF),
0 };
@@ -1054,12 +1064,12 @@ YY_RULE_SETUP
YY_BREAK
case 14:
YY_RULE_SETUP
-#line 132 "scanner.l"
+#line 123 "scanner.l"
{ scanctx_append_string(yyextra, "\\"); }
YY_BREAK
case 15:
YY_RULE_SETUP
-#line 133 "scanner.l"
+#line 124 "scanner.l"
{
yylval->sval = scanctx_take_string(yyextra);
BEGIN INITIAL;
@@ -1068,18 +1078,18 @@ YY_RULE_SETUP
YY_BREAK
case 16:
YY_RULE_SETUP
-#line 139 "scanner.l"
+#line 130 "scanner.l"
{ BEGIN SCRIPTBLOCK; }
YY_BREAK
case 17:
/* rule 17 can match eol */
YY_RULE_SETUP
-#line 140 "scanner.l"
+#line 131 "scanner.l"
{ scanctx_append_string(yyextra, yytext); }
YY_BREAK
case 18:
YY_RULE_SETUP
-#line 141 "scanner.l"
+#line 132 "scanner.l"
{
yylval->sval = scanctx_take_string(yyextra);
BEGIN INITIAL;
@@ -1088,28 +1098,28 @@ YY_RULE_SETUP
YY_BREAK
case 19:
YY_RULE_SETUP
-#line 147 "scanner.l"
+#line 138 "scanner.l"
{ BEGIN INCLUDE; }
YY_BREAK
case 20:
/* rule 20 can match eol */
YY_RULE_SETUP
-#line 148 "scanner.l"
+#line 139 "scanner.l"
{ scanctx_append_string(yyextra, yytext); }
YY_BREAK
case 21:
YY_RULE_SETUP
-#line 149 "scanner.l"
+#line 140 "scanner.l"
{ scanctx_append_string(yyextra, "\\"); }
YY_BREAK
case 22:
YY_RULE_SETUP
-#line 150 "scanner.l"
+#line 141 "scanner.l"
{ scanctx_append_string(yyextra, "\""); }
YY_BREAK
case 23:
YY_RULE_SETUP
-#line 151 "scanner.l"
+#line 142 "scanner.l"
{
const char *error;
FILE *fp = scanctx_push_include(yyextra,
@@ -1135,97 +1145,116 @@ YY_RULE_SETUP
case 24:
/* rule 24 can match eol */
YY_RULE_SETUP
-#line 175 "scanner.l"
+#line 166 "scanner.l"
{ /* ignore */ }
YY_BREAK
case 25:
YY_RULE_SETUP
-#line 176 "scanner.l"
+#line 167 "scanner.l"
{ /* ignore */ }
YY_BREAK
case 26:
YY_RULE_SETUP
-#line 178 "scanner.l"
+#line 169 "scanner.l"
{ return(TOK_EQUALS); }
YY_BREAK
case 27:
YY_RULE_SETUP
-#line 179 "scanner.l"
+#line 170 "scanner.l"
{ return(TOK_COMMA); }
YY_BREAK
case 28:
YY_RULE_SETUP
-#line 180 "scanner.l"
+#line 171 "scanner.l"
{ return(TOK_GROUP_START); }
YY_BREAK
case 29:
YY_RULE_SETUP
-#line 181 "scanner.l"
+#line 172 "scanner.l"
{ return(TOK_GROUP_END); }
YY_BREAK
case 30:
YY_RULE_SETUP
-#line 182 "scanner.l"
+#line 173 "scanner.l"
{ yylval->ival = 1; return(TOK_BOOLEAN); }
YY_BREAK
case 31:
YY_RULE_SETUP
-#line 183 "scanner.l"
+#line 174 "scanner.l"
{ yylval->ival = 0; return(TOK_BOOLEAN); }
YY_BREAK
case 32:
YY_RULE_SETUP
-#line 184 "scanner.l"
+#line 175 "scanner.l"
{ yylval->fval = atof(yytext); return(TOK_FLOAT); }
YY_BREAK
case 33:
YY_RULE_SETUP
-#line 185 "scanner.l"
-{ yylval->ival = atoi(yytext); return(TOK_INTEGER); }
+#line 176 "scanner.l"
+{
+ long long llval;
+ llval = atoll(yytext);
+ if((llval < INT_MIN) || (llval > INT_MAX))
+ {
+ yylval->llval = llval;
+ return(TOK_INTEGER64);
+ }
+ else
+ {
+ yylval->ival = (int)llval;
+ return(TOK_INTEGER);
+ }
+ }
YY_BREAK
case 34:
YY_RULE_SETUP
-#line 186 "scanner.l"
+#line 190 "scanner.l"
{ yylval->llval = atoll(yytext); return(TOK_INTEGER64); }
YY_BREAK
case 35:
YY_RULE_SETUP
-#line 187 "scanner.l"
-{ yylval->ival = fromihex(yytext); return(TOK_HEX); }
+#line 191 "scanner.l"
+{
+ unsigned long ulval = strtoul(yytext, NULL, 16);
+ if (ulval > INT32_MAX)
+ ulval &= INT32_MAX;
+ yylval->ival = (int)ulval;
+ return(TOK_HEX);
+ }
YY_BREAK
case 36:
YY_RULE_SETUP
-#line 188 "scanner.l"
+#line 198 "scanner.l"
{ yylval->llval = fromhex(yytext); return(TOK_HEX64); }
YY_BREAK
case 37:
YY_RULE_SETUP
-#line 189 "scanner.l"
+#line 199 "scanner.l"
{ yylval->sval = yytext; return(TOK_NAME); }
YY_BREAK
case 38:
YY_RULE_SETUP
-#line 190 "scanner.l"
+#line 200 "scanner.l"
{ return(TOK_ARRAY_START); }
YY_BREAK
case 39:
YY_RULE_SETUP
-#line 191 "scanner.l"
+#line 201 "scanner.l"
{ return(TOK_ARRAY_END); }
YY_BREAK
case 40:
YY_RULE_SETUP
-#line 192 "scanner.l"
+#line 202 "scanner.l"
{ return(TOK_LIST_START); }
YY_BREAK
case 41:
YY_RULE_SETUP
-#line 193 "scanner.l"
+#line 203 "scanner.l"
{ return(TOK_LIST_END); }
YY_BREAK
case 42:
YY_RULE_SETUP
-#line 194 "scanner.l"
+#line 204 "scanner.l"
{ return(TOK_SEMICOLON); }
YY_BREAK
case 43:
@@ -1233,12 +1262,12 @@ case 43:
yyg->yy_c_buf_p = yy_cp -= 1;
YY_DO_BEFORE_ACTION; /* set up yytext again */
YY_RULE_SETUP
-#line 195 "scanner.l"
+#line 205 "scanner.l"
{ /* ignore */ }
YY_BREAK
case 44:
YY_RULE_SETUP
-#line 196 "scanner.l"
+#line 206 "scanner.l"
{ return(TOK_GARBAGE); }
YY_BREAK
case YY_STATE_EOF(INITIAL):
@@ -1246,7 +1275,7 @@ case YY_STATE_EOF(COMMENT):
case YY_STATE_EOF(STRING):
case YY_STATE_EOF(INCLUDE):
case YY_STATE_EOF(SCRIPTBLOCK):
-#line 198 "scanner.l"
+#line 208 "scanner.l"
{
YY_BUFFER_STATE buf = (YY_BUFFER_STATE)scanctx_pop_include(
yyextra);
@@ -1261,10 +1290,10 @@ case YY_STATE_EOF(SCRIPTBLOCK):
YY_BREAK
case 45:
YY_RULE_SETUP
-#line 209 "scanner.l"
+#line 219 "scanner.l"
ECHO;
YY_BREAK
-#line 1268 "scanner.c"
+#line 1297 "scanner.c"
case YY_END_OF_BUFFER:
{
@@ -1407,9 +1436,9 @@ ECHO;
static int yy_get_next_buffer (yyscan_t yyscanner)
{
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
- register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
- register char *source = yyg->yytext_ptr;
- register int number_to_move, i;
+ char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
+ char *source = yyg->yytext_ptr;
+ yy_size_t number_to_move, i;
int ret_val;
if ( yyg->yy_c_buf_p > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars + 1] )
@@ -1438,7 +1467,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
/* Try to read more data. */
/* First move last chars to start of buffer. */
- number_to_move = (int) (yyg->yy_c_buf_p - yyg->yytext_ptr) - 1;
+ number_to_move = (yy_size_t) (yyg->yy_c_buf_p - yyg->yytext_ptr) - 1;
for ( i = 0; i < number_to_move; ++i )
*(dest++) = *(source++);
@@ -1520,8 +1549,6 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
else
ret_val = EOB_ACT_CONTINUE_SCAN;
-#ifndef __clang_analyzer__
- // FIXME: Clang's static analyzer complains about leaking the result of libconfig_yyrealloc
if ((yy_size_t) (yyg->yy_n_chars + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
/* Extend the array by 50%, plus the number we really need. */
yy_size_t new_size = yyg->yy_n_chars + number_to_move + (yyg->yy_n_chars >> 1);
@@ -1529,7 +1556,6 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
}
-#endif // __clang_analyzer__
yyg->yy_n_chars += number_to_move;
YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars] = YY_END_OF_BUFFER_CHAR;
@@ -1544,8 +1570,8 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
static yy_state_type yy_get_previous_state (yyscan_t yyscanner)
{
- register yy_state_type yy_current_state;
- register char *yy_cp;
+ yy_state_type yy_current_state;
+ char *yy_cp;
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
yy_current_state = yyg->yy_start;
@@ -1553,7 +1579,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
for ( yy_cp = yyg->yytext_ptr + YY_MORE_ADJ; yy_cp < yyg->yy_c_buf_p; ++yy_cp )
{
- register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
+ YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
if ( yy_accept[yy_current_state] )
{
yyg->yy_last_accepting_state = yy_current_state;
@@ -1578,11 +1604,11 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
*/
static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state , yyscan_t yyscanner)
{
- register int yy_is_jam;
+ int yy_is_jam;
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; /* This var may be unused depending upon options. */
- register char *yy_cp = yyg->yy_c_buf_p;
+ char *yy_cp = yyg->yy_c_buf_p;
- register YY_CHAR yy_c = 1;
+ YY_CHAR yy_c = 1;
if ( yy_accept[yy_current_state] )
{
yyg->yy_last_accepting_state = yy_current_state;
@@ -1601,6 +1627,10 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
return yy_is_jam ? 0 : yy_current_state;
}
+#ifndef YY_NO_UNPUT
+
+#endif
+
#ifndef YY_NO_INPUT
#ifdef __cplusplus
static int yyinput (yyscan_t yyscanner)
@@ -1762,7 +1792,7 @@ static void libconfig_yy_load_buffer_state (yyscan_t yyscanner)
if ( ! b )
YY_FATAL_ERROR( "out of dynamic memory in libconfig_yy_create_buffer()" );
- b->yy_buf_size = size;
+ b->yy_buf_size = (yy_size_t)size;
/* yy_ch_buf has to be 2 characters longer than the size given because
* we need to put in 2 end-of-buffer characters.
@@ -1923,7 +1953,7 @@ static void libconfig_yyensure_buffer_stack (yyscan_t yyscanner)
* scanner will even need a stack. We use 2 instead of 1 to avoid an
* immediate realloc on the next call.
*/
- num_to_alloc = 1;
+ num_to_alloc = 1; // After all that talk, this was set to 1 anyways...
yyg->yy_buffer_stack = (struct yy_buffer_state**)libconfig_yyalloc
(num_to_alloc * sizeof(struct yy_buffer_state*)
, yyscanner);
@@ -1940,7 +1970,7 @@ static void libconfig_yyensure_buffer_stack (yyscan_t yyscanner)
if (yyg->yy_buffer_stack_top >= (yyg->yy_buffer_stack_max) - 1){
/* Increase the buffer to prepare for a possible push. */
- int grow_size = 8 /* arbitrary grow size */;
+ yy_size_t grow_size = 8 /* arbitrary grow size */;
num_to_alloc = yyg->yy_buffer_stack_max + grow_size;
yyg->yy_buffer_stack = (struct yy_buffer_state**)libconfig_yyrealloc
@@ -2048,7 +2078,9 @@ YY_BUFFER_STATE libconfig_yy_scan_bytes (yyconst char * yybytes, yy_size_t _yy
static void yy_fatal_error (yyconst char* msg , yyscan_t yyscanner)
{
- (void) fprintf( stderr, "%s\n", msg );
+ struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+ (void)yyg;
+ (void) fprintf( stderr, "%s\n", msg );
exit( YY_EXIT_FAILURE );
}
@@ -2154,10 +2186,10 @@ void libconfig_yyset_extra (YY_EXTRA_TYPE user_defined , yyscan_t yyscanner)
}
/** Set the current line number.
- * @param line_number
+ * @param _line_number line number
* @param yyscanner The scanner object.
*/
-void libconfig_yyset_lineno (int line_number , yyscan_t yyscanner)
+void libconfig_yyset_lineno (int _line_number , yyscan_t yyscanner)
{
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
@@ -2165,14 +2197,14 @@ void libconfig_yyset_lineno (int line_number , yyscan_t yyscanner)
if (! YY_CURRENT_BUFFER )
YY_FATAL_ERROR( "libconfig_yyset_lineno called with no buffer" );
- yylineno = line_number;
+ yylineno = _line_number;
}
/** Set the current column.
- * @param line_number
+ * @param _column_no column number
* @param yyscanner The scanner object.
*/
-void libconfig_yyset_column (int column_no , yyscan_t yyscanner)
+void libconfig_yyset_column (int _column_no , yyscan_t yyscanner)
{
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
@@ -2180,25 +2212,25 @@ void libconfig_yyset_column (int column_no , yyscan_t yyscanner)
if (! YY_CURRENT_BUFFER )
YY_FATAL_ERROR( "libconfig_yyset_column called with no buffer" );
- yycolumn = column_no;
+ yycolumn = _column_no;
}
/** Set the input stream. This does not discard the current
* input buffer.
- * @param in_str A readable stream.
+ * @param _in_str A readable stream.
* @param yyscanner The scanner object.
* @see libconfig_yy_switch_to_buffer
*/
-void libconfig_yyset_in (FILE * in_str , yyscan_t yyscanner)
+void libconfig_yyset_in (FILE * _in_str , yyscan_t yyscanner)
{
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
- yyin = in_str ;
+ yyin = _in_str ;
}
-void libconfig_yyset_out (FILE * out_str , yyscan_t yyscanner)
+void libconfig_yyset_out (FILE * _out_str , yyscan_t yyscanner)
{
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
- yyout = out_str ;
+ yyout = _out_str ;
}
int libconfig_yyget_debug (yyscan_t yyscanner)
@@ -2207,10 +2239,10 @@ int libconfig_yyget_debug (yyscan_t yyscanner)
return yy_flex_debug;
}
-void libconfig_yyset_debug (int bdebug , yyscan_t yyscanner)
+void libconfig_yyset_debug (int _bdebug , yyscan_t yyscanner)
{
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
- yy_flex_debug = bdebug ;
+ yy_flex_debug = _bdebug ;
}
/* Accessor methods for yylval and yylloc */
@@ -2361,7 +2393,10 @@ int libconfig_yylex_destroy (yyscan_t yyscanner)
#ifndef yytext_ptr
static void yy_flex_strncpy (char* s1, yyconst char * s2, int n , yyscan_t yyscanner)
{
- register int i;
+ struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+ (void)yyg;
+
+ int i;
for ( i = 0; i < n; ++i )
s1[i] = s2[i];
}
@@ -2370,7 +2405,7 @@ static void yy_flex_strncpy (char* s1, yyconst char * s2, int n , yyscan_t yysca
#ifdef YY_NEED_STRLEN
static int yy_flex_strlen (yyconst char * s , yyscan_t yyscanner)
{
- register int n;
+ int n;
for ( n = 0; s[n]; ++n )
;
@@ -2380,11 +2415,16 @@ static int yy_flex_strlen (yyconst char * s , yyscan_t yyscanner)
void *libconfig_yyalloc (yy_size_t size , yyscan_t yyscanner)
{
+ struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+ (void)yyg;
return (void *) malloc( size );
}
void *libconfig_yyrealloc (void * ptr, yy_size_t size , yyscan_t yyscanner)
{
+ struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+ (void)yyg;
+
/* The cast to (char *) in the following accommodates both
* implementations that use char* generic pointers, and those
* that use void* generic pointers. It works with the latter
@@ -2397,9 +2437,11 @@ void *libconfig_yyrealloc (void * ptr, yy_size_t size , yyscan_t yyscanner)
void libconfig_yyfree (void * ptr , yyscan_t yyscanner)
{
+ struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+ (void)yyg;
free( (char *) ptr ); /* see libconfig_yyrealloc() for (char *) cast */
}
#define YYTABLES_NAME "yytables"
-#line 209 "scanner.l"
+#line 219 "scanner.l"
diff --git a/3rdparty/libconfig/scanner.h b/3rdparty/libconfig/scanner.h
index f684433ec..ce2f5cc95 100644
--- a/3rdparty/libconfig/scanner.h
+++ b/3rdparty/libconfig/scanner.h
@@ -3,12 +3,8 @@
#define libconfig_yyIN_HEADER 1
#line 6 "scanner.h"
-#line 36 "scanner.l"
-#include "scanctx.h"
-
-
-#line 12 "scanner.h"
+#line 8 "scanner.h"
#define YY_INT_ALIGNED short int
@@ -16,8 +12,8 @@
#define FLEX_SCANNER
#define YY_FLEX_MAJOR_VERSION 2
-#define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 39
+#define YY_FLEX_MINOR_VERSION 6
+#define YY_FLEX_SUBMINOR_VERSION 0
#if YY_FLEX_SUBMINOR_VERSION > 0
#define FLEX_BETA
#endif
@@ -136,7 +132,15 @@ typedef void* yyscan_t;
/* Size of default input buffer. */
#ifndef YY_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k.
+ * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
+ * Ditto for the __ia64__ case accordingly.
+ */
+#define YY_BUF_SIZE 32768
+#else
#define YY_BUF_SIZE 16384
+#endif /* __ia64__ */
#endif
#ifndef YY_TYPEDEF_YY_BUFFER_STATE
@@ -216,7 +220,7 @@ void *libconfig_yyalloc (yy_size_t ,yyscan_t yyscanner );
void *libconfig_yyrealloc (void *,yy_size_t ,yyscan_t yyscanner );
void libconfig_yyfree (void * ,yyscan_t yyscanner );
-#define libconfig_yywrap(yyscanner) 1
+#define libconfig_yywrap(yyscanner) (/*CONSTCOND*/1)
#define YY_SKIP_YYWRAP
#define yytext_ptr yytext_r
@@ -251,11 +255,11 @@ void libconfig_yyset_extra (YY_EXTRA_TYPE user_defined ,yyscan_t yyscanner );
FILE *libconfig_yyget_in (yyscan_t yyscanner );
-void libconfig_yyset_in (FILE * in_str ,yyscan_t yyscanner );
+void libconfig_yyset_in (FILE * _in_str ,yyscan_t yyscanner );
FILE *libconfig_yyget_out (yyscan_t yyscanner );
-void libconfig_yyset_out (FILE * out_str ,yyscan_t yyscanner );
+void libconfig_yyset_out (FILE * _out_str ,yyscan_t yyscanner );
yy_size_t libconfig_yyget_leng (yyscan_t yyscanner );
@@ -263,11 +267,11 @@ char *libconfig_yyget_text (yyscan_t yyscanner );
int libconfig_yyget_lineno (yyscan_t yyscanner );
-void libconfig_yyset_lineno (int line_number ,yyscan_t yyscanner );
+void libconfig_yyset_lineno (int _line_number ,yyscan_t yyscanner );
int libconfig_yyget_column (yyscan_t yyscanner );
-void libconfig_yyset_column (int column_no ,yyscan_t yyscanner );
+void libconfig_yyset_column (int _column_no ,yyscan_t yyscanner );
YYSTYPE * libconfig_yyget_lval (yyscan_t yyscanner );
@@ -299,7 +303,12 @@ static int yy_flex_strlen (yyconst char * ,yyscan_t yyscanner);
/* Amount of stuff to slurp up with each read. */
#ifndef YY_READ_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k */
+#define YY_READ_BUF_SIZE 16384
+#else
#define YY_READ_BUF_SIZE 8192
+#endif /* __ia64__ */
#endif
/* Number of entries by which start-condition stack grows. */
@@ -334,8 +343,8 @@ extern int libconfig_yylex \
#undef YY_DECL
#endif
-#line 209 "scanner.l"
+#line 219 "scanner.l"
-#line 340 "scanner.h"
+#line 349 "scanner.h"
#undef libconfig_yyIN_HEADER
#endif /* libconfig_yyHEADER_H */
diff --git a/3rdparty/libconfig/strbuf.c b/3rdparty/libconfig/strbuf.c
index 1ed17a899..0b5dfe511 100644
--- a/3rdparty/libconfig/strbuf.c
+++ b/3rdparty/libconfig/strbuf.c
@@ -1,7 +1,7 @@
/* ----------------------------------------------------------------------------
libconfig - A library for processing structured configuration files
- Copyright (C) 2013-2015 Hercules Dev Team
- Copyright (C) 2005-2010 Mark A Lindner
+ Copyright (C) 2013-2016 Hercules Dev Team
+ Copyright (C) 2005-2014 Mark A Lindner
This file is part of libconfig.
@@ -55,4 +55,3 @@ void strbuf_append(strbuf_t *buf, const char *text)
}
/* ------------------------------------------------------------------------- */
-/* eof */
diff --git a/3rdparty/libconfig/strbuf.h b/3rdparty/libconfig/strbuf.h
index 8b451e730..948bf4768 100644
--- a/3rdparty/libconfig/strbuf.h
+++ b/3rdparty/libconfig/strbuf.h
@@ -1,7 +1,7 @@
/* ----------------------------------------------------------------------------
libconfig - A library for processing structured configuration files
- Copyright (C) 2013-2015 Hercules Dev Team
- Copyright (C) 2005-2010 Mark A Lindner
+ Copyright (C) 2013-2016 Hercules Dev Team
+ Copyright (C) 2005-2014 Mark A Lindner
This file is part of libconfig.
diff --git a/3rdparty/libconfig/win32/stdint.h b/3rdparty/libconfig/win32/stdint.h
new file mode 100644
index 000000000..71c0776d0
--- /dev/null
+++ b/3rdparty/libconfig/win32/stdint.h
@@ -0,0 +1,221 @@
+// ISO C9x compliant stdint.h for Microsoft Visual Studio
+// Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124
+//
+// Copyright (c) 2006 Alexander Chemeris
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// 1. Redistributions of source code must retain the above copyright notice,
+// this list of conditions and the following disclaimer.
+//
+// 2. Redistributions in binary form must reproduce the above copyright
+// notice, this list of conditions and the following disclaimer in the
+// documentation and/or other materials provided with the distribution.
+//
+// 3. The name of the author may be used to endorse or promote products
+// derived from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _MSC_VER // [
+#error "Use this header only with Microsoft Visual C++ compilers!"
+#endif // _MSC_VER ]
+
+#ifndef _MSC_STDINT_H_ // [
+#define _MSC_STDINT_H_
+
+#if _MSC_VER > 1000
+#pragma once
+#endif
+
+#include <limits.h>
+
+// For Visual Studio 6 in C++ mode wrap <wchar.h> include with 'extern "C++" {}'
+// or compiler give many errors like this:
+// error C2733: second C linkage of overloaded function 'wmemchr' not allowed
+#if (_MSC_VER < 1300) && defined(__cplusplus)
+ extern "C++" {
+#endif
+# include <wchar.h>
+#if (_MSC_VER < 1300) && defined(__cplusplus)
+ }
+#endif
+
+// 7.18.1 Integer types
+
+// 7.18.1.1 Exact-width integer types
+typedef __int8 int8_t;
+typedef __int16 int16_t;
+typedef __int32 int32_t;
+typedef __int64 int64_t;
+typedef unsigned __int8 uint8_t;
+typedef unsigned __int16 uint16_t;
+typedef unsigned __int32 uint32_t;
+typedef unsigned __int64 uint64_t;
+
+// 7.18.1.2 Minimum-width integer types
+typedef int8_t int_least8_t;
+typedef int16_t int_least16_t;
+typedef int32_t int_least32_t;
+typedef int64_t int_least64_t;
+typedef uint8_t uint_least8_t;
+typedef uint16_t uint_least16_t;
+typedef uint32_t uint_least32_t;
+typedef uint64_t uint_least64_t;
+
+// 7.18.1.3 Fastest minimum-width integer types
+typedef int8_t int_fast8_t;
+typedef int16_t int_fast16_t;
+typedef int32_t int_fast32_t;
+typedef int64_t int_fast64_t;
+typedef uint8_t uint_fast8_t;
+typedef uint16_t uint_fast16_t;
+typedef uint32_t uint_fast32_t;
+typedef uint64_t uint_fast64_t;
+
+// 7.18.1.4 Integer types capable of holding object pointers
+#ifdef _WIN64 // [
+ typedef __int64 intptr_t;
+ typedef unsigned __int64 uintptr_t;
+#else // _WIN64 ][
+ typedef int intptr_t;
+ typedef unsigned int uintptr_t;
+#endif // _WIN64 ]
+
+// 7.18.1.5 Greatest-width integer types
+typedef int64_t intmax_t;
+typedef uint64_t uintmax_t;
+
+
+// 7.18.2 Limits of specified-width integer types
+
+#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) // [ See footnote 220 at page 257 and footnote 221 at page 259
+
+// 7.18.2.1 Limits of exact-width integer types
+#define INT8_MIN ((int8_t)_I8_MIN)
+#define INT8_MAX _I8_MAX
+#define INT16_MIN ((int16_t)_I16_MIN)
+#define INT16_MAX _I16_MAX
+#define INT32_MIN ((int32_t)_I32_MIN)
+#define INT32_MAX _I32_MAX
+#define INT64_MIN ((int64_t)_I64_MIN)
+#define INT64_MAX _I64_MAX
+#define UINT8_MAX _UI8_MAX
+#define UINT16_MAX _UI16_MAX
+#define UINT32_MAX _UI32_MAX
+#define UINT64_MAX _UI64_MAX
+
+// 7.18.2.2 Limits of minimum-width integer types
+#define INT_LEAST8_MIN INT8_MIN
+#define INT_LEAST8_MAX INT8_MAX
+#define INT_LEAST16_MIN INT16_MIN
+#define INT_LEAST16_MAX INT16_MAX
+#define INT_LEAST32_MIN INT32_MIN
+#define INT_LEAST32_MAX INT32_MAX
+#define INT_LEAST64_MIN INT64_MIN
+#define INT_LEAST64_MAX INT64_MAX
+#define UINT_LEAST8_MAX UINT8_MAX
+#define UINT_LEAST16_MAX UINT16_MAX
+#define UINT_LEAST32_MAX UINT32_MAX
+#define UINT_LEAST64_MAX UINT64_MAX
+
+// 7.18.2.3 Limits of fastest minimum-width integer types
+#define INT_FAST8_MIN INT8_MIN
+#define INT_FAST8_MAX INT8_MAX
+#define INT_FAST16_MIN INT16_MIN
+#define INT_FAST16_MAX INT16_MAX
+#define INT_FAST32_MIN INT32_MIN
+#define INT_FAST32_MAX INT32_MAX
+#define INT_FAST64_MIN INT64_MIN
+#define INT_FAST64_MAX INT64_MAX
+#define UINT_FAST8_MAX UINT8_MAX
+#define UINT_FAST16_MAX UINT16_MAX
+#define UINT_FAST32_MAX UINT32_MAX
+#define UINT_FAST64_MAX UINT64_MAX
+
+// 7.18.2.4 Limits of integer types capable of holding object pointers
+#ifdef _WIN64 // [
+# define INTPTR_MIN INT64_MIN
+# define INTPTR_MAX INT64_MAX
+# define UINTPTR_MAX UINT64_MAX
+#else // _WIN64 ][
+# define INTPTR_MIN INT32_MIN
+# define INTPTR_MAX INT32_MAX
+# define UINTPTR_MAX UINT32_MAX
+#endif // _WIN64 ]
+
+// 7.18.2.5 Limits of greatest-width integer types
+#define INTMAX_MIN INT64_MIN
+#define INTMAX_MAX INT64_MAX
+#define UINTMAX_MAX UINT64_MAX
+
+// 7.18.3 Limits of other integer types
+
+#ifdef _WIN64 // [
+# define PTRDIFF_MIN _I64_MIN
+# define PTRDIFF_MAX _I64_MAX
+#else // _WIN64 ][
+# define PTRDIFF_MIN _I32_MIN
+# define PTRDIFF_MAX _I32_MAX
+#endif // _WIN64 ]
+
+#define SIG_ATOMIC_MIN INT_MIN
+#define SIG_ATOMIC_MAX INT_MAX
+
+#ifndef SIZE_MAX // [
+# ifdef _WIN64 // [
+# define SIZE_MAX _UI64_MAX
+# else // _WIN64 ][
+# define SIZE_MAX _UI32_MAX
+# endif // _WIN64 ]
+#endif // SIZE_MAX ]
+
+// WCHAR_MIN and WCHAR_MAX are also defined in <wchar.h>
+#ifndef WCHAR_MIN // [
+# define WCHAR_MIN 0
+#endif // WCHAR_MIN ]
+#ifndef WCHAR_MAX // [
+# define WCHAR_MAX _UI16_MAX
+#endif // WCHAR_MAX ]
+
+#define WINT_MIN 0
+#define WINT_MAX _UI16_MAX
+
+#endif // __STDC_LIMIT_MACROS ]
+
+
+// 7.18.4 Limits of other integer types
+
+#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) // [ See footnote 224 at page 260
+
+// 7.18.4.1 Macros for minimum-width integer constants
+
+#define INT8_C(val) val##i8
+#define INT16_C(val) val##i16
+#define INT32_C(val) val##i32
+#define INT64_C(val) val##i64
+
+#define UINT8_C(val) val##ui8
+#define UINT16_C(val) val##ui16
+#define UINT32_C(val) val##ui32
+#define UINT64_C(val) val##ui64
+
+// 7.18.4.2 Macros for greatest-width integer constants
+#define INTMAX_C INT64_C
+#define UINTMAX_C UINT64_C
+
+#endif // __STDC_CONSTANT_MACROS ]
+
+#endif // _MSC_STDINT_H_ ]
diff --git a/3rdparty/libconfig/wincompat.h b/3rdparty/libconfig/wincompat.h
index 418191972..7e30f0e8d 100644
--- a/3rdparty/libconfig/wincompat.h
+++ b/3rdparty/libconfig/wincompat.h
@@ -1,7 +1,7 @@
/* ----------------------------------------------------------------------------
libconfig - A library for processing structured configuration files
- Copyright (C) 2013-2015 Hercules Dev Team
- Copyright (C) 2005-2010 Mark A Lindner
+ Copyright (C) 2013-2016 Hercules Dev Team
+ Copyright (C) 2005-2014 Mark A Lindner
This file is part of libconfig.
@@ -32,12 +32,19 @@
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
+#define fileno _fileno
+#define fstat _fstat
+#define stat _stat // struct stat for fstat()
#define snprintf _snprintf
-#ifndef __MINGW32__
+#if !defined(__MINGW32__) && _MSC_VER < 1800
#define atoll _atoi64
#define strtoull _strtoui64
-#endif /* __MINGW32__ */
+#endif
+
+#if !defined(S_ISDIR) && defined(S_IFMT) && defined(S_IFDIR)
+#define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
+#endif
#endif
diff --git a/src/char/pincode.c b/src/char/pincode.c
index af79d6f11..371442fac 100644
--- a/src/char/pincode.c
+++ b/src/char/pincode.c
@@ -32,6 +32,7 @@
#include "common/socket.h"
#include "common/strlib.h"
+#include <stdio.h>
#include <stdlib.h>
struct pincode_interface pincode_s;
diff --git a/src/common/HPM.c b/src/common/HPM.c
index d9c3262d7..f115c886e 100644
--- a/src/common/HPM.c
+++ b/src/common/HPM.c
@@ -616,8 +616,8 @@ CMDLINEARG(loadplugin)
* Reads the plugin configuration and loads the plugins as necessary.
*/
void hplugins_config_read(void) {
- config_t plugins_conf;
- config_setting_t *plist = NULL;
+ struct config_t plugins_conf;
+ struct config_setting_t *plist = NULL;
const char *config_filename = "conf/plugins.conf"; // FIXME hardcoded name
FILE *fp;
int i;
@@ -628,12 +628,12 @@ void hplugins_config_read(void) {
fclose(fp);
}
- if (libconfig->read_file(&plugins_conf, config_filename))
+ if (!libconfig->load_file(&plugins_conf, config_filename))
return;
plist = libconfig->lookup(&plugins_conf, "plugins_list");
for (i = 0; i < VECTOR_LENGTH(HPM->cmdline_load_plugins); i++) {
- config_setting_t *entry = libconfig->setting_add(plist, NULL, CONFIG_TYPE_STRING);
+ struct config_setting_t *entry = libconfig->setting_add(plist, NULL, CONFIG_TYPE_STRING);
config_setting_set_string(entry, VECTOR_INDEX(HPM->cmdline_load_plugins, i));
}
diff --git a/src/common/conf.c b/src/common/conf.c
index 3e8c08963..25f1013f5 100644
--- a/src/common/conf.c
+++ b/src/common/conf.c
@@ -23,6 +23,7 @@
#include "conf.h"
#include "common/showmsg.h" // ShowError
+#include "common/strlib.h" // safestrncpy
#include <libconfig/libconfig.h>
@@ -30,26 +31,39 @@
struct libconfig_interface libconfig_s;
struct libconfig_interface *libconfig;
-int conf_read_file(config_t *config, const char *config_filename) {
+/**
+ * Initializes 'config' and loads a configuration file.
+ *
+ * Shows error and destroys 'config' in case of failure.
+ * It is the caller's care to destroy 'config' in case of success.
+ *
+ * @param config The config file to initialize.
+ * @param config_filename The file to read.
+ *
+ * @retval CONFIG_TRUE in case of success.
+ * @retval CONFIG_FALSE in case of failure.
+ */
+int config_load_file(struct config_t *config, const char *config_filename)
+{
libconfig->init(config);
- if (!libconfig->read_file_src(config, config_filename)) {
+ if (libconfig->read_file_src(config, config_filename) != CONFIG_TRUE) {
ShowError("%s:%d - %s\n", config_error_file(config),
config_error_line(config), config_error_text(config));
libconfig->destroy(config);
- return 1;
+ return CONFIG_FALSE;
}
- return 0;
+ return CONFIG_TRUE;
}
//
// Functions to copy settings from libconfig/contrib
//
-void config_setting_copy_simple(config_setting_t *parent, const config_setting_t *src) {
+void config_setting_copy_simple(struct config_setting_t *parent, const struct config_setting_t *src)
+{
if (config_setting_is_aggregate(src)) {
libconfig->setting_copy_aggregate(parent, src);
- }
- else {
- config_setting_t *set;
+ } else {
+ struct config_setting_t *set;
if( libconfig->setting_get_member(parent, config_setting_name(src)) != NULL )
return;
@@ -73,8 +87,9 @@ void config_setting_copy_simple(config_setting_t *parent, const config_setting_t
}
}
-void config_setting_copy_elem(config_setting_t *parent, const config_setting_t *src) {
- config_setting_t *set = NULL;
+void config_setting_copy_elem(struct config_setting_t *parent, const struct config_setting_t *src)
+{
+ struct config_setting_t *set = NULL;
if (config_setting_is_aggregate(src))
libconfig->setting_copy_aggregate(parent, src);
@@ -93,8 +108,9 @@ void config_setting_copy_elem(config_setting_t *parent, const config_setting_t *
}
}
-void config_setting_copy_aggregate(config_setting_t *parent, const config_setting_t *src) {
- config_setting_t *newAgg;
+void config_setting_copy_aggregate(struct config_setting_t *parent, const struct config_setting_t *src)
+{
+ struct config_setting_t *newAgg;
int i, n;
if( libconfig->setting_get_member(parent, config_setting_name(src)) != NULL )
@@ -116,7 +132,8 @@ void config_setting_copy_aggregate(config_setting_t *parent, const config_settin
}
}
-int config_setting_copy(config_setting_t *parent, const config_setting_t *src) {
+int config_setting_copy(struct config_setting_t *parent, const struct config_setting_t *src)
+{
if (!config_setting_is_group(parent) && !config_setting_is_list(parent))
return CONFIG_FALSE;
@@ -128,14 +145,237 @@ int config_setting_copy(config_setting_t *parent, const config_setting_t *src) {
return CONFIG_TRUE;
}
+/**
+ * Converts the value of a setting that is type CONFIG_TYPE_BOOL to bool.
+ *
+ * @param setting The setting to read.
+ *
+ * @return The converted value.
+ * @retval false in case of failure.
+ */
+bool config_setting_get_bool_real(const struct config_setting_t *setting)
+{
+ if (setting == NULL || setting->type != CONFIG_TYPE_BOOL)
+ return false;
+
+ return setting->value.ival ? true : false;
+}
+
+/**
+ * Same as config_setting_lookup_bool, but uses bool instead of int.
+ *
+ * @param[in] setting The setting to read.
+ * @param[in] name The setting name to lookup.
+ * @param[out] value The output value.
+ *
+ * @retval CONFIG_TRUE in case of success.
+ * @retval CONFIG_FALSE in case of failure.
+ */
+int config_setting_lookup_bool_real(const struct config_setting_t *setting, const char *name, bool *value)
+{
+ struct config_setting_t *member = config_setting_get_member(setting, name);
+
+ if (!member)
+ return CONFIG_FALSE;
+
+ if (config_setting_type(member) != CONFIG_TYPE_BOOL)
+ return CONFIG_FALSE;
+
+ *value = config_setting_get_bool_real(member);
+
+ return CONFIG_TRUE;
+}
+
+/**
+ * Converts and returns a configuration that is CONFIG_TYPE_INT to unsigned int (uint32).
+ *
+ * @param setting The setting to read.
+ *
+ * @return The converted value.
+ * @retval 0 in case of failure.
+ */
+uint32 config_setting_get_uint32(const struct config_setting_t *setting)
+{
+ if (setting == NULL || setting->type != CONFIG_TYPE_INT)
+ return 0;
+
+ if (setting->value.ival < 0)
+ return 0;
+
+ return (uint32)setting->value.ival;
+}
+
+/**
+ * Looks up a configuration entry of type CONFIG_TYPE_INT and reads it as uint32.
+ *
+ * @param[in] setting The setting to read.
+ * @param[in] name The setting name to lookup.
+ * @param[out] value The output value.
+ *
+ * @retval CONFIG_TRUE in case of success.
+ * @retval CONFIG_FALSE in case of failure.
+ */
+int config_setting_lookup_uint32(const struct config_setting_t *setting, const char *name, uint32 *value)
+{
+ struct config_setting_t *member = config_setting_get_member(setting, name);
+
+ if (!member)
+ return CONFIG_FALSE;
+
+ if (config_setting_type(member) != CONFIG_TYPE_INT)
+ return CONFIG_FALSE;
+
+ *value = config_setting_get_uint32(member);
+
+ return CONFIG_TRUE;
+}
+
+/**
+ * Converts and returns a configuration that is CONFIG_TYPE_INT to uint16
+ *
+ * @param setting The setting to read.
+ *
+ * @return The converted value.
+ * @retval 0 in case of failure.
+ */
+uint16 config_setting_get_uint16(const struct config_setting_t *setting)
+{
+ if (setting == NULL || setting->type != CONFIG_TYPE_INT)
+ return 0;
+
+ if (setting->value.ival > UINT16_MAX)
+ return UINT16_MAX;
+ if (setting->value.ival < UINT16_MIN)
+ return UINT16_MIN;
+
+ return (uint16)setting->value.ival;
+}
+
+/**
+ * Looks up a configuration entry of type CONFIG_TYPE_INT and reads it as uint16.
+ *
+ * @param[in] setting The setting to read.
+ * @param[in] name The setting name to lookup.
+ * @param[out] value The output value.
+ *
+ * @retval CONFIG_TRUE in case of success.
+ * @retval CONFIG_FALSE in case of failure.
+ */
+int config_setting_lookup_uint16(const struct config_setting_t *setting, const char *name, uint16 *value)
+{
+ struct config_setting_t *member = config_setting_get_member(setting, name);
+
+ if (!member)
+ return CONFIG_FALSE;
+
+ if (config_setting_type(member) != CONFIG_TYPE_INT)
+ return CONFIG_FALSE;
+
+ *value = config_setting_get_uint16(member);
+
+ return CONFIG_TRUE;
+}
+
+/**
+ * Converts and returns a configuration that is CONFIG_TYPE_INT to int16
+ *
+ * @param setting The setting to read.
+ *
+ * @return The converted value.
+ * @retval 0 in case of failure.
+ */
+int16 config_setting_get_int16(const struct config_setting_t *setting)
+{
+ if (setting == NULL || setting->type != CONFIG_TYPE_INT)
+ return 0;
+
+ if (setting->value.ival > INT16_MAX)
+ return INT16_MAX;
+ if (setting->value.ival < INT16_MIN)
+ return INT16_MIN;
+
+ return (int16)setting->value.ival;
+}
+
+/**
+ * Looks up a configuration entry of type CONFIG_TYPE_INT and reads it as int16.
+ *
+ * @param[in] setting The setting to read.
+ * @param[in] name The setting name to lookup.
+ * @param[out] value The output value.
+ *
+ * @retval CONFIG_TRUE in case of success.
+ * @retval CONFIG_FALSE in case of failure.
+ */
+int config_setting_lookup_int16(const struct config_setting_t *setting, const char *name, int16 *value)
+{
+ struct config_setting_t *member = config_setting_get_member(setting, name);
+
+ if (!member)
+ return CONFIG_FALSE;
+
+ if (config_setting_type(member) != CONFIG_TYPE_INT)
+ return CONFIG_FALSE;
+
+ *value = config_setting_get_int16(member);
+
+ return CONFIG_TRUE;
+}
+
+/**
+ * Looks up a configuration entry of type CONFIG_TYPE_STRING inside a struct config_setting_t and copies it into a (non-const) char buffer.
+ *
+ * @param[in] setting The setting to read.
+ * @param[in] name The setting name to lookup.
+ * @param[out] out The output buffer.
+ * @param[in] out_size The size of the output buffer.
+ *
+ * @retval CONFIG_TRUE in case of success.
+ * @retval CONFIG_FALSE in case of failure.
+ */
+int config_setting_lookup_mutable_string(const struct config_setting_t *setting, const char *name, char *out, size_t out_size)
+{
+ const char *str = NULL;
+
+ if (libconfig->setting_lookup_string(setting, name, &str) == CONFIG_TRUE) {
+ safestrncpy(out, str, out_size);
+ return CONFIG_TRUE;
+ }
+
+ return CONFIG_FALSE;
+}
+
+/**
+ * Looks up a configuration entry of type CONFIG_TYPE_STRING inside a struct config_t and copies it into a (non-const) char buffer.
+ *
+ * @param[in] config The configuration to read.
+ * @param[in] name The setting name to lookup.
+ * @param[out] out The output buffer.
+ * @param[in] out_size The size of the output buffer.
+ *
+ * @retval CONFIG_TRUE in case of success.
+ * @retval CONFIG_FALSE in case of failure.
+ */
+int config_lookup_mutable_string(const struct config_t *config, const char *name, char *out, size_t out_size)
+{
+ const char *str = NULL;
+
+ if (libconfig->lookup_string(config, name, &str) == CONFIG_TRUE) {
+ safestrncpy(out, str, out_size);
+ return CONFIG_TRUE;
+ }
+
+ return CONFIG_FALSE;
+}
+
void libconfig_defaults(void) {
libconfig = &libconfig_s;
libconfig->read = config_read;
libconfig->write = config_write;
/* */
- libconfig->set_auto_convert = config_set_auto_convert;
- libconfig->get_auto_convert = config_get_auto_convert;
+ libconfig->set_options = config_set_options;
+ libconfig->get_options = config_get_options;
/* */
libconfig->read_string = config_read_string;
libconfig->read_file_src = config_read_file;
@@ -153,6 +393,7 @@ void libconfig_defaults(void) {
libconfig->setting_get_bool = config_setting_get_bool;
libconfig->setting_get_string = config_setting_get_string;
/* */
+ libconfig->setting_lookup = config_setting_lookup;
libconfig->setting_lookup_int = config_setting_lookup_int;
libconfig->setting_lookup_int64 = config_setting_lookup_int64;
libconfig->setting_lookup_float = config_setting_lookup_float;
@@ -193,7 +434,6 @@ void libconfig_defaults(void) {
libconfig->setting_set_hook = config_setting_set_hook;
/* */
libconfig->lookup = config_lookup;
- libconfig->lookup_from = config_lookup_from;
/* */
libconfig->lookup_int = config_lookup_int;
libconfig->lookup_int64 = config_lookup_int64;
@@ -201,9 +441,23 @@ void libconfig_defaults(void) {
libconfig->lookup_bool = config_lookup_bool;
libconfig->lookup_string = config_lookup_string;
/* those are custom and are from src/common/conf.c */
- libconfig->read_file = conf_read_file;
+ libconfig->load_file = config_load_file;
libconfig->setting_copy_simple = config_setting_copy_simple;
libconfig->setting_copy_elem = config_setting_copy_elem;
libconfig->setting_copy_aggregate = config_setting_copy_aggregate;
libconfig->setting_copy = config_setting_copy;
+
+ /* Functions to get different types */
+ libconfig->setting_get_bool_real = config_setting_get_bool_real;
+ libconfig->setting_get_uint32 = config_setting_get_uint32;
+ libconfig->setting_get_uint16 = config_setting_get_uint16;
+ libconfig->setting_get_int16 = config_setting_get_int16;
+
+ /* Functions to lookup different types */
+ libconfig->setting_lookup_int16 = config_setting_lookup_int16;
+ libconfig->setting_lookup_bool_real = config_setting_lookup_bool_real;
+ libconfig->setting_lookup_uint32 = config_setting_lookup_uint32;
+ libconfig->setting_lookup_uint16 = config_setting_lookup_uint16;
+ libconfig->setting_lookup_mutable_string = config_setting_lookup_mutable_string;
+ libconfig->lookup_mutable_string = config_lookup_mutable_string;
}
diff --git a/src/common/conf.h b/src/common/conf.h
index 19b13c51a..f2bfcac62 100644
--- a/src/common/conf.h
+++ b/src/common/conf.h
@@ -29,82 +29,94 @@
* The libconfig interface -- specially for plugins, but we enforce it throughout the core to be consistent
**/
struct libconfig_interface {
- int (*read) (config_t *config, FILE *stream);
- void (*write) (const config_t *config, FILE *stream);
+ int (*read) (struct config_t *config, FILE *stream);
+ void (*write) (const struct config_t *config, FILE *stream);
/* */
- void (*set_auto_convert) (config_t *config, int flag); // TODO: Replace with config_set_options
- int (*get_auto_convert) (const config_t *config); // TODO: Replace with config_get_options
+ void (*set_options) (struct config_t *config, int options);
+ int (*get_options) (const struct config_t *config);
/* */
- int (*read_string) (config_t *config, const char *str);
- int (*read_file_src) (config_t *config, const char *filename);
- int (*write_file) (config_t *config, const char *filename);
-
- void (*set_destructor) (config_t *config, void (*destructor)(void *));
- void (*set_include_dir) (config_t *config, const char *include_dir);
-
- void (*init) (config_t *config);
- void (*destroy) (config_t *config);
-
- int (*setting_get_int) (const config_setting_t *setting);
- long long (*setting_get_int64) (const config_setting_t *setting);
- double (*setting_get_float) (const config_setting_t *setting);
-
- int (*setting_get_bool) (const config_setting_t *setting);
-
- const char * (*setting_get_string) (const config_setting_t *setting);
-
- int (*setting_lookup_int) (const config_setting_t *setting, const char *name, int *value);
- int (*setting_lookup_int64) (const config_setting_t *setting, const char *name, long long *value);
- int (*setting_lookup_float) (const config_setting_t *setting, const char *name, double *value);
- int (*setting_lookup_bool) (const config_setting_t *setting, const char *name, int *value);
- int (*setting_lookup_string) (const config_setting_t *setting, const char *name, const char **value);
- int (*setting_set_int) (config_setting_t *setting ,int value);
- int (*setting_set_int64) (config_setting_t *setting, long long value);
- int (*setting_set_float) (config_setting_t *setting, double value);
- int (*setting_set_bool) (config_setting_t *setting, int value);
- int (*setting_set_string) (config_setting_t *setting, const char *value);
-
- int (*setting_set_format) (config_setting_t *setting, short format);
- short (*setting_get_format) (const config_setting_t *setting);
-
- int (*setting_get_int_elem) (const config_setting_t *setting, int idx);
- long long (*setting_get_int64_elem) (const config_setting_t *setting, int idx);
- double (*setting_get_float_elem) (const config_setting_t *setting, int idx);
- int (*setting_get_bool_elem) (const config_setting_t *setting, int idx);
- const char * (*setting_get_string_elem) (const config_setting_t *setting, int idx);
- config_setting_t * (*setting_set_int_elem) (config_setting_t *setting, int idx, int value);
- config_setting_t * (*setting_set_int64_elem) (config_setting_t *setting, int idx, long long value);
- config_setting_t * (*setting_set_float_elem) (config_setting_t *setting, int idx, double value);
- config_setting_t * (*setting_set_bool_elem) (config_setting_t *setting, int idx, int value);
- config_setting_t * (*setting_set_string_elem) (config_setting_t *setting, int idx, const char *value);
-
- int (*setting_index) (const config_setting_t *setting);
- int (*setting_length) (const config_setting_t *setting);
-
- config_setting_t * (*setting_get_elem) (const config_setting_t *setting, unsigned int idx);
- config_setting_t * (*setting_get_member) (const config_setting_t *setting, const char *name);
-
- config_setting_t * (*setting_add) (config_setting_t *parent, const char *name, int type);
- int (*setting_remove) (config_setting_t *parent, const char *name);
-
- int (*setting_remove_elem) (config_setting_t *parent, unsigned int idx);
- void (*setting_set_hook) (config_setting_t *setting, void *hook);
-
- config_setting_t * (*lookup) (const config_t *config, const char *filepath);
- config_setting_t * (*lookup_from) (config_setting_t *setting, const char *filepath);
- int (*lookup_int) (const config_t *config, const char *filepath, int *value);
- int (*lookup_int64) (const config_t *config, const char *filepath, long long *value);
- int (*lookup_float) (const config_t *config, const char *filepath, double *value);
- int (*lookup_bool) (const config_t *config, const char *filepath, int *value);
- int (*lookup_string) (const config_t *config, const char *filepath, const char **value);
+ int (*read_string) (struct config_t *config, const char *str);
+ int (*read_file_src) (struct config_t *config, const char *filename);
+ int (*write_file) (struct config_t *config, const char *filename);
+
+ void (*set_destructor) (struct config_t *config, void (*destructor)(void *));
+ void (*set_include_dir) (struct config_t *config, const char *include_dir);
+
+ void (*init) (struct config_t *config);
+ void (*destroy) (struct config_t *config);
+
+ int (*setting_get_int) (const struct config_setting_t *setting);
+ long long (*setting_get_int64) (const struct config_setting_t *setting);
+ double (*setting_get_float) (const struct config_setting_t *setting);
+
+ int (*setting_get_bool) (const struct config_setting_t *setting);
+
+ const char * (*setting_get_string) (const struct config_setting_t *setting);
+
+ struct config_setting_t * (*setting_lookup) (struct config_setting_t *setting, const char *name);
+ int (*setting_lookup_int) (const struct config_setting_t *setting, const char *name, int *value);
+ int (*setting_lookup_int64) (const struct config_setting_t *setting, const char *name, long long *value);
+ int (*setting_lookup_float) (const struct config_setting_t *setting, const char *name, double *value);
+ int (*setting_lookup_bool) (const struct config_setting_t *setting, const char *name, int *value);
+ int (*setting_lookup_string) (const struct config_setting_t *setting, const char *name, const char **value);
+ int (*setting_set_int) (struct config_setting_t *setting ,int value);
+ int (*setting_set_int64) (struct config_setting_t *setting, long long value);
+ int (*setting_set_float) (struct config_setting_t *setting, double value);
+ int (*setting_set_bool) (struct config_setting_t *setting, int value);
+ int (*setting_set_string) (struct config_setting_t *setting, const char *value);
+
+ int (*setting_set_format) (struct config_setting_t *setting, short format);
+ short (*setting_get_format) (const struct config_setting_t *setting);
+
+ int (*setting_get_int_elem) (const struct config_setting_t *setting, int idx);
+ long long (*setting_get_int64_elem) (const struct config_setting_t *setting, int idx);
+ double (*setting_get_float_elem) (const struct config_setting_t *setting, int idx);
+ int (*setting_get_bool_elem) (const struct config_setting_t *setting, int idx);
+ const char * (*setting_get_string_elem) (const struct config_setting_t *setting, int idx);
+ struct config_setting_t * (*setting_set_int_elem) (struct config_setting_t *setting, int idx, int value);
+ struct config_setting_t * (*setting_set_int64_elem) (struct config_setting_t *setting, int idx, long long value);
+ struct config_setting_t * (*setting_set_float_elem) (struct config_setting_t *setting, int idx, double value);
+ struct config_setting_t * (*setting_set_bool_elem) (struct config_setting_t *setting, int idx, int value);
+ struct config_setting_t * (*setting_set_string_elem) (struct config_setting_t *setting, int idx, const char *value);
+
+ int (*setting_index) (const struct config_setting_t *setting);
+ int (*setting_length) (const struct config_setting_t *setting);
+
+ struct config_setting_t * (*setting_get_elem) (const struct config_setting_t *setting, unsigned int idx);
+ struct config_setting_t * (*setting_get_member) (const struct config_setting_t *setting, const char *name);
+
+ struct config_setting_t * (*setting_add) (struct config_setting_t *parent, const char *name, int type);
+ int (*setting_remove) (struct config_setting_t *parent, const char *name);
+
+ int (*setting_remove_elem) (struct config_setting_t *parent, unsigned int idx);
+ void (*setting_set_hook) (struct config_setting_t *setting, void *hook);
+
+ struct config_setting_t * (*lookup) (const struct config_t *config, const char *filepath);
+ int (*lookup_int) (const struct config_t *config, const char *filepath, int *value);
+ int (*lookup_int64) (const struct config_t *config, const char *filepath, long long *value);
+ int (*lookup_float) (const struct config_t *config, const char *filepath, double *value);
+ int (*lookup_bool) (const struct config_t *config, const char *filepath, int *value);
+ int (*lookup_string) (const struct config_t *config, const char *filepath, const char **value);
/* those are custom and are from src/common/conf.c */
/* Functions to copy settings from libconfig/contrib */
- int (*read_file) (config_t *config, const char *config_filename);
- void (*setting_copy_simple) (config_setting_t *parent, const config_setting_t *src);
- void (*setting_copy_elem) (config_setting_t *parent, const config_setting_t *src);
- void (*setting_copy_aggregate) (config_setting_t *parent, const config_setting_t *src);
- int (*setting_copy) (config_setting_t *parent, const config_setting_t *src);
+ int (*load_file) (struct config_t *config, const char *config_filename);
+ void (*setting_copy_simple) (struct config_setting_t *parent, const struct config_setting_t *src);
+ void (*setting_copy_elem) (struct config_setting_t *parent, const struct config_setting_t *src);
+ void (*setting_copy_aggregate) (struct config_setting_t *parent, const struct config_setting_t *src);
+ int (*setting_copy) (struct config_setting_t *parent, const struct config_setting_t *src);
+ /* Functions to get other types */
+ bool (*setting_get_bool_real) (const struct config_setting_t *setting);
+ uint32 (*setting_get_uint32) (const struct config_setting_t *setting);
+ uint16 (*setting_get_uint16) (const struct config_setting_t *setting);
+ int16 (*setting_get_int16) (const struct config_setting_t *setting);
+
+ int (*setting_lookup_bool_real) (const struct config_setting_t *setting, const char *name, bool *value);
+ int (*setting_lookup_uint32) (const struct config_setting_t *setting, const char *name, uint32 *value);
+ int (*setting_lookup_uint16) (const struct config_setting_t *setting, const char *name, uint16 *value);
+ int (*setting_lookup_int16) (const struct config_setting_t *setting, const char *name, int16 *value);
+ int (*setting_lookup_mutable_string) (const struct config_setting_t *setting, const char *name, char *out, size_t out_size);
+ int (*lookup_mutable_string) (const struct config_t *config, const char *name, char *out, size_t out_size);
};
#ifdef HERCULES_CORE
diff --git a/src/common/showmsg.c b/src/common/showmsg.c
index 956222a7d..4d4c72b42 100644
--- a/src/common/showmsg.c
+++ b/src/common/showmsg.c
@@ -23,11 +23,10 @@
#include "showmsg.h"
#include "common/cbasetypes.h"
+#include "common/conf.h"
#include "common/core.h" //[Ind] - For SERVER_TYPE
#include "common/strlib.h" // StringBuf
-#include <libconfig/libconfig.h>
-
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h> // atexit
@@ -799,8 +798,8 @@ void showmsg_showWarning(const char *string, ...)
vShowMessage_(MSG_WARNING, string, ap);
va_end(ap);
}
-void showmsg_showConfigWarning(config_setting_t *config, const char *string, ...) __attribute__((format(printf, 2, 3)));
-void showmsg_showConfigWarning(config_setting_t *config, const char *string, ...)
+void showmsg_showConfigWarning(struct config_setting_t *config, const char *string, ...) __attribute__((format(printf, 2, 3)));
+void showmsg_showConfigWarning(struct config_setting_t *config, const char *string, ...)
{
StringBuf buf;
va_list ap;
diff --git a/src/common/showmsg.h b/src/common/showmsg.h
index ed8776fb0..7b48d0df2 100644
--- a/src/common/showmsg.h
+++ b/src/common/showmsg.h
@@ -23,10 +23,11 @@
#include "common/hercules.h"
-#include <libconfig/libconfig.h>
-
#include <stdarg.h>
+/* Forward Declarations */
+struct config_setting_t;
+
// for help with the console colors look here:
// http://www.edoceo.com/liberum/?doc=printf-with-color
// some code explanation (used here):
@@ -118,7 +119,7 @@ struct showmsg_interface {
void (*showDebug) (const char *, ...) __attribute__((format(printf, 1, 2)));
void (*showError) (const char *, ...) __attribute__((format(printf, 1, 2)));
void (*showFatalError) (const char *, ...) __attribute__((format(printf, 1, 2)));
- void (*showConfigWarning) (config_setting_t *config, const char *string, ...) __attribute__((format(printf, 2, 3)));
+ void (*showConfigWarning) (struct config_setting_t *config, const char *string, ...) __attribute__((format(printf, 2, 3)));
};
/* the purpose of these macros is simply to not make calling them be an annoyance */
diff --git a/src/common/socket.c b/src/common/socket.c
index 740c07bdc..8b1ab3959 100644
--- a/src/common/socket.c
+++ b/src/common/socket.c
@@ -25,6 +25,7 @@
#include "common/HPM.h"
#include "common/cbasetypes.h"
+#include "common/conf.h"
#include "common/db.h"
#include "common/memmgr.h"
#include "common/mmo.h"
@@ -1686,7 +1687,7 @@ bool socket_trusted_ip_check(uint32 ip)
* @param[in] groupname Current group name, for output/logging reasons.
* @return The amount of entries read, zero in case of errors.
*/
-int socket_net_config_read_sub(config_setting_t *t, struct s_subnet_vector *list, const char *filename, const char *groupname)
+int socket_net_config_read_sub(struct config_setting_t *t, struct s_subnet_vector *list, const char *filename, const char *groupname)
{
int i, len;
char ipbuf[64], maskbuf[64];
@@ -1722,11 +1723,11 @@ int socket_net_config_read_sub(config_setting_t *t, struct s_subnet_vector *list
*/
void socket_net_config_read(const char *filename)
{
- config_t network_config;
+ struct config_t network_config;
int i;
nullpo_retv(filename);
- if (libconfig->read_file(&network_config, filename)) {
+ if (!libconfig->load_file(&network_config, filename)) {
ShowError("LAN Support configuration file is not found: '%s'. This server won't be able to accept connections from any servers.\n", filename);
return;
}
diff --git a/src/common/socket.h b/src/common/socket.h
index e99278052..70fbc3492 100644
--- a/src/common/socket.h
+++ b/src/common/socket.h
@@ -22,7 +22,6 @@
#define COMMON_SOCKET_H
#include "common/hercules.h"
-#include "common/conf.h"
#include "common/db.h"
#ifdef WIN32
@@ -34,7 +33,9 @@
# include <sys/types.h>
#endif
+/* Forward Declarations */
struct hplugin_data_store;
+struct config_setting_t;
#define FIFOSIZE_SERVERLINK 256*1024
@@ -214,7 +215,7 @@ struct socket_interface {
uint32 (*lan_subnet_check) (uint32 ip, struct s_subnet *info);
bool (*allowed_ip_check) (uint32 ip);
bool (*trusted_ip_check) (uint32 ip);
- int (*net_config_read_sub) (config_setting_t *t, struct s_subnet_vector *list, const char *filename, const char *groupname);
+ int (*net_config_read_sub) (struct config_setting_t *t, struct s_subnet_vector *list, const char *filename, const char *groupname);
void (*net_config_read) (const char *filename);
};
diff --git a/src/common/sql.c b/src/common/sql.c
index f6280c436..b1e77e636 100644
--- a/src/common/sql.c
+++ b/src/common/sql.c
@@ -32,6 +32,7 @@
# include "common/winapi.h" // Needed before mysql.h
#endif
#include <mysql.h>
+#include <stdio.h>
#include <stdlib.h> // strtoul
void hercules_mysql_error_handler(unsigned int ecode);
diff --git a/src/login/login.c b/src/login/login.c
index d4768df86..71cdded02 100644
--- a/src/login/login.c
+++ b/src/login/login.c
@@ -28,7 +28,6 @@
#include "login/loginlog.h"
#include "common/HPM.h"
#include "common/cbasetypes.h"
-#include "common/conf.h"
#include "common/core.h"
#include "common/db.h"
#include "common/memmgr.h"
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index bc539837d..eb48adc1d 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -3613,16 +3613,16 @@ ACMD(reloadskilldb)
* @reloadatcommand - reloads conf/atcommand.conf conf/groups.conf
*------------------------------------------*/
ACMD(reloadatcommand) {
- config_t run_test;
+ struct config_t run_test;
- if (libconfig->read_file(&run_test, "conf/groups.conf")) {
+ if (!libconfig->load_file(&run_test, "conf/groups.conf")) {
clif->message(fd, msg_fd(fd,1036)); // Error reading groups.conf, reload failed.
return false;
}
libconfig->destroy(&run_test);
- if (libconfig->read_file(&run_test, map->ATCOMMAND_CONF_FILENAME)) {
+ if (!libconfig->load_file(&run_test, map->ATCOMMAND_CONF_FILENAME)) {
clif->message(fd, msg_fd(fd,1037)); // Error reading atcommand.conf, reload failed.
return false;
}
@@ -10006,13 +10006,13 @@ bool atcommand_exec(const int fd, struct map_session_data *sd, const char *messa
*
*------------------------------------------*/
void atcommand_config_read(const char* config_filename) {
- config_t atcommand_config;
- config_setting_t *aliases = NULL, *help = NULL, *nolog = NULL;
+ struct config_t atcommand_config;
+ struct config_setting_t *aliases = NULL, *help = NULL, *nolog = NULL;
const char *symbol = NULL;
int num_aliases = 0;
nullpo_retv(config_filename);
- if (libconfig->read_file(&atcommand_config, config_filename))
+ if (!libconfig->load_file(&atcommand_config, config_filename))
return;
// Command symbols
@@ -10041,7 +10041,7 @@ void atcommand_config_read(const char* config_filename) {
int count = libconfig->setting_length(aliases);
for (i = 0; i < count; ++i) {
- config_setting_t *command;
+ struct config_setting_t *command;
const char *commandname = NULL;
int j = 0, alias_count = 0;
AtCommandInfo *commandinfo = NULL;
@@ -10079,7 +10079,7 @@ void atcommand_config_read(const char* config_filename) {
int count = libconfig->setting_length(nolog);
for (i = 0; i < count; ++i) {
- config_setting_t *command;
+ struct config_setting_t *command;
const char *commandname = NULL;
AtCommandInfo *commandinfo = NULL;
@@ -10101,7 +10101,7 @@ void atcommand_config_read(const char* config_filename) {
int i;
for (i = 0; i < count; ++i) {
- config_setting_t *command;
+ struct config_setting_t *command;
const char *commandname;
AtCommandInfo *commandinfo = NULL;
@@ -10144,7 +10144,7 @@ static inline int atcommand_command_type2idx(AtCommandType type)
* Loads permissions for groups to use commands.
*
*/
-void atcommand_db_load_groups(GroupSettings **groups, config_setting_t **commands_, size_t sz)
+void atcommand_db_load_groups(GroupSettings **groups, struct config_setting_t **commands_, size_t sz)
{
DBIterator *iter = db_iterator(atcommand->db);
AtCommandInfo *atcmd;
@@ -10157,7 +10157,7 @@ void atcommand_db_load_groups(GroupSettings **groups, config_setting_t **command
CREATE(atcmd->char_groups, char, sz);
for (i = 0; i < sz; i++) {
GroupSettings *group = groups[i];
- config_setting_t *commands = commands_[i];
+ struct config_setting_t *commands = commands_[i];
int result = 0;
int idx = -1;
@@ -10178,7 +10178,7 @@ void atcommand_db_load_groups(GroupSettings **groups, config_setting_t **command
}
if (commands != NULL) {
- config_setting_t *cmd = NULL;
+ struct config_setting_t *cmd = NULL;
// <commandname> : <bool> (only atcommand)
if (config_setting_lookup_bool(commands, atcmd->command, &result) && result) {
diff --git a/src/map/atcommand.h b/src/map/atcommand.h
index 5c4acdf01..a4f9afce7 100644
--- a/src/map/atcommand.h
+++ b/src/map/atcommand.h
@@ -23,7 +23,6 @@
#include "map/pc_groups.h"
#include "common/hercules.h"
-#include "common/conf.h"
#include "common/db.h"
#include <stdarg.h>
@@ -34,6 +33,7 @@
struct map_session_data;
struct AtCommandInfo;
struct block_list;
+struct config_setting_t;
/**
* Defines
@@ -110,7 +110,7 @@ struct atcommand_interface {
bool (*create) (char *name, AtCommandFunc func);
bool (*can_use) (struct map_session_data *sd, const char *command);
bool (*can_use2) (struct map_session_data *sd, const char *command, AtCommandType type);
- void (*load_groups) (GroupSettings **groups, config_setting_t **commands_, size_t sz);
+ void (*load_groups) (GroupSettings **groups, struct config_setting_t **commands_, size_t sz);
AtCommandInfo* (*exists) (const char* name);
bool (*msg_read) (const char *cfg_name, bool allow_override);
void (*final_msg) (void);
diff --git a/src/map/battleground.c b/src/map/battleground.c
index e3fedbf34..d25aef851 100644
--- a/src/map/battleground.c
+++ b/src/map/battleground.c
@@ -330,18 +330,18 @@ enum bg_queue_types bg_str2teamtype (const char *str) {
}
void bg_config_read(void) {
- config_t bg_conf;
- config_setting_t *data = NULL;
+ struct config_t bg_conf;
+ struct config_setting_t *data = NULL;
const char *config_filename = "conf/battlegrounds.conf"; // FIXME hardcoded name
- if (libconfig->read_file(&bg_conf, config_filename))
+ if (!libconfig->load_file(&bg_conf, config_filename))
return;
data = libconfig->lookup(&bg_conf, "battlegrounds");
if (data != NULL) {
- config_setting_t *settings = libconfig->setting_get_elem(data, 0);
- config_setting_t *arenas;
+ struct config_setting_t *settings = libconfig->setting_get_elem(data, 0);
+ struct config_setting_t *arenas;
const char *delay_var;
int offline = 0;
@@ -361,8 +361,8 @@ void bg_config_read(void) {
int arena_count = libconfig->setting_length(arenas);
CREATE( bg->arena, struct bg_arena *, arena_count );
for(i = 0; i < arena_count; i++) {
- config_setting_t *arena = libconfig->setting_get_elem(arenas, i);
- config_setting_t *reward;
+ struct config_setting_t *arena = libconfig->setting_get_elem(arenas, i);
+ struct config_setting_t *reward;
const char *aName, *aEvent, *aDelayVar, *aTeamTypes;
int minLevel = 0, maxLevel = 0;
int prizeWin, prizeLoss, prizeDraw;
diff --git a/src/map/channel.c b/src/map/channel.c
index d778b355d..45b59898c 100644
--- a/src/map/channel.c
+++ b/src/map/channel.c
@@ -589,19 +589,19 @@ 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->read_file(&channels_conf, config_filename))
+ if (!libconfig->load_file(&channels_conf, config_filename))
return;
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);
diff --git a/src/map/clif.c b/src/map/clif.c
index 3b2f255ef..66a8e92b8 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -17308,8 +17308,8 @@ void clif_parse_MoveItem(int fd, struct map_session_data *sd) {
/* [Ind/Hercules] */
void clif_cashshop_db(void) {
- config_t cashshop_conf;
- config_setting_t *cashshop = NULL, *cats = NULL;
+ struct config_t cashshop_conf;
+ struct config_setting_t *cashshop = NULL, *cats = NULL;
const char *config_filename = "db/cashshop_db.conf"; // FIXME hardcoded name
int i, item_count_t = 0;
for( i = 0; i < CASHSHOP_TAB_MAX; i++ ) {
@@ -17317,16 +17317,14 @@ void clif_cashshop_db(void) {
clif->cs.item_count[i] = 0;
}
- if (libconfig->read_file(&cashshop_conf, config_filename)) {
- ShowError("can't read %s\n", config_filename);
+ if (!libconfig->load_file(&cashshop_conf, config_filename))
return;
- }
cashshop = libconfig->lookup(&cashshop_conf, "cash_shop");
if( cashshop != NULL && (cats = libconfig->setting_get_elem(cashshop, 0)) != NULL ) {
for(i = 0; i < CASHSHOP_TAB_MAX; i++) {
- config_setting_t *cat;
+ struct config_setting_t *cat;
char entry_name[10];
sprintf(entry_name,"cat_%d",i);
@@ -17335,7 +17333,7 @@ void clif_cashshop_db(void) {
int k, item_count = libconfig->setting_length(cat);
for(k = 0; k < item_count; k++) {
- config_setting_t *entry = libconfig->setting_get_elem(cat,k);
+ struct config_setting_t *entry = libconfig->setting_get_elem(cat,k);
const char *name = config_setting_name(entry);
int price = libconfig->setting_get_int(entry);
struct item_data * data = NULL;
@@ -18368,8 +18366,8 @@ void clif_parse_RouletteRecvItem(int fd, struct map_session_data* sd) {
}
bool clif_parse_roulette_db(void) {
- config_t roulette_conf;
- config_setting_t *roulette = NULL, *levels = NULL;
+ struct config_t roulette_conf;
+ struct config_setting_t *roulette = NULL, *levels = NULL;
const char *config_filename = "db/roulette_db.conf"; // FIXME hardcoded name
int i, j, item_count_t = 0;
@@ -18377,15 +18375,13 @@ bool clif_parse_roulette_db(void) {
clif->rd.items[i] = 0;
}
- if (libconfig->read_file(&roulette_conf, config_filename)) {
- ShowError("can't read %s\n", config_filename);
+ if (!libconfig->load_file(&roulette_conf, config_filename))
return false;
- }
roulette = libconfig->lookup(&roulette_conf, "roulette");
if( roulette != NULL && (levels = libconfig->setting_get_elem(roulette, 0)) != NULL ) {
for(i = 0; i < MAX_ROULETTE_LEVEL; i++) {
- config_setting_t *level;
+ struct config_setting_t *level;
char entry_name[10];
sprintf(entry_name,"level_%d",i+1);
@@ -18394,7 +18390,7 @@ bool clif_parse_roulette_db(void) {
int k, item_count = libconfig->setting_length(level);
for(k = 0; k < item_count; k++) {
- config_setting_t *entry = libconfig->setting_get_elem(level,k);
+ struct config_setting_t *entry = libconfig->setting_get_elem(level,k);
const char *name = config_setting_name(entry);
int qty = libconfig->setting_get_int(entry);
struct item_data * data = NULL;
diff --git a/src/map/itemdb.c b/src/map/itemdb.c
index bd552dd16..da72ab05a 100644
--- a/src/map/itemdb.c
+++ b/src/map/itemdb.c
@@ -637,8 +637,8 @@ int itemdb_isidentified2(struct item_data *data) {
}
void itemdb_read_groups(void) {
- config_t item_group_conf;
- config_setting_t *itg = NULL, *it = NULL;
+ struct config_t item_group_conf;
+ struct config_setting_t *itg = NULL, *it = NULL;
#ifdef RENEWAL
const char *config_filename = "db/re/item_group.conf"; // FIXME hardcoded name
#else
@@ -648,10 +648,8 @@ void itemdb_read_groups(void) {
int i = 0, count = 0, c;
unsigned int *gsize = NULL;
- if (libconfig->read_file(&item_group_conf, config_filename)) {
- ShowError("can't read %s\n", config_filename);
+ if (!libconfig->load_file(&item_group_conf, config_filename))
return;
- }
gsize = aMalloc( libconfig->setting_length(item_group_conf.root) * sizeof(unsigned int) );
@@ -929,8 +927,8 @@ bool itemdb_read_cached_packages(const char *config_filename) {
return true;
}
void itemdb_read_packages(void) {
- config_t item_packages_conf;
- config_setting_t *itg = NULL, *it = NULL, *t = NULL;
+ struct config_t item_packages_conf;
+ struct config_setting_t *itg = NULL, *it = NULL, *t = NULL;
#ifdef RENEWAL
const char *config_filename = "db/re/item_packages.conf"; // FIXME hardcoded name
#else
@@ -946,10 +944,8 @@ void itemdb_read_packages(void) {
return;
}
- if (libconfig->read_file(&item_packages_conf, config_filename)) {
- ShowError("can't read %s\n", config_filename);
+ if (!libconfig->load_file(&item_packages_conf, config_filename))
return;
- }
must = aMalloc( libconfig->setting_length(item_packages_conf.root) * sizeof(unsigned int) );
random = aMalloc( libconfig->setting_length(item_packages_conf.root) * sizeof(unsigned int) );
@@ -1161,8 +1157,8 @@ void itemdb_read_packages(void) {
}
void itemdb_read_chains(void) {
- config_t item_chain_conf;
- config_setting_t *itc = NULL;
+ struct config_t item_chain_conf;
+ struct config_setting_t *itc = NULL;
#ifdef RENEWAL
const char *config_filename = "db/re/item_chain.conf"; // FIXME hardcoded name
#else
@@ -1170,10 +1166,8 @@ void itemdb_read_chains(void) {
#endif
int i = 0, count = 0;
- if (libconfig->read_file(&item_chain_conf, config_filename)) {
- ShowError("can't read %s\n", config_filename);
+ if (!libconfig->load_file(&item_chain_conf, config_filename))
return;
- }
CREATE(itemdb->chains, struct item_chain, libconfig->setting_length(item_chain_conf.root));
itemdb->chain_count = (unsigned short)libconfig->setting_length(item_chain_conf.root);
@@ -1186,7 +1180,7 @@ void itemdb_read_chains(void) {
struct item_chain_entry *prev = NULL;
const char *name = config_setting_name(itc);
int c = 0;
- config_setting_t *entry = NULL;
+ struct config_setting_t *entry = NULL;
script->set_constant2(name, i-1, false, false);
itemdb->chains[count].qty = (unsigned short)libconfig->setting_length(itc);
@@ -1535,7 +1529,7 @@ int itemdb_validate_entry(struct item_data *entry, int n, const char *source) {
return item->nameid;
}
-void itemdb_readdb_additional_fields(int itemid, config_setting_t *it, int n, const char *source)
+void itemdb_readdb_additional_fields(int itemid, struct config_setting_t *it, int n, const char *source)
{
// do nothing. plugins can do own work
}
@@ -1553,9 +1547,9 @@ void itemdb_readdb_additional_fields(int itemid, config_setting_t *it, int n, co
* validation errors.
* @return Nameid of the validated entry, or 0 in case of failure.
*/
-int itemdb_readdb_libconfig_sub(config_setting_t *it, int n, const char *source) {
+int itemdb_readdb_libconfig_sub(struct config_setting_t *it, int n, const char *source) {
struct item_data id = { 0 };
- config_setting_t *t = NULL;
+ struct config_setting_t *t = NULL;
const char *str = NULL;
int i32 = 0;
bool inherit = false;
@@ -1736,7 +1730,7 @@ int itemdb_readdb_libconfig_sub(config_setting_t *it, int n, const char *source)
if ( (t = libconfig->setting_get_member(it, "Trade")) ) {
if (config_setting_is_group(t)) {
- config_setting_t *tt = NULL;
+ struct config_setting_t *tt = NULL;
if ((tt = libconfig->setting_get_member(t, "override"))) {
id.gm_lv_trade_override = libconfig->setting_get_int(tt);
@@ -1802,7 +1796,7 @@ int itemdb_readdb_libconfig_sub(config_setting_t *it, int n, const char *source)
if ((t = libconfig->setting_get_member(it, "Nouse"))) {
if (config_setting_is_group(t)) {
- config_setting_t *nt = NULL;
+ struct config_setting_t *nt = NULL;
if ((nt = libconfig->setting_get_member(t, "override"))) {
id.item_usage.override = libconfig->setting_get_int(nt);
@@ -1850,7 +1844,7 @@ int itemdb_readdb_libconfig_sub(config_setting_t *it, int n, const char *source)
return itemdb->validate_entry(&id, n, source);
}
-bool itemdb_lookup_const(const config_setting_t *it, const char *name, int *value)
+bool itemdb_lookup_const(const struct config_setting_t *it, const char *name, int *value)
{
nullpo_retr(false, name);
nullpo_retr(false, value);
@@ -1879,19 +1873,24 @@ bool itemdb_lookup_const(const config_setting_t *it, const char *name, int *valu
*/
int itemdb_readdb_libconfig(const char *filename) {
bool duplicate[MAX_ITEMDB];
- config_t item_db_conf;
- config_setting_t *itdb, *it;
+ struct config_t item_db_conf;
+ struct config_setting_t *itdb, *it;
char filepath[256];
int i = 0, count = 0;
nullpo_ret(filename);
+
sprintf(filepath, "%s/%s", map->db_path, filename);
- memset(&duplicate,0,sizeof(duplicate));
- if( libconfig->read_file(&item_db_conf, filepath) || !(itdb = libconfig->setting_get_member(item_db_conf.root, "item_db")) ) {
+ if (!libconfig->load_file(&item_db_conf, filepath))
+ return 0;
+
+ if ((itdb = libconfig->setting_get_member(item_db_conf.root, "item_db")) == NULL) {
ShowError("can't read %s\n", filepath);
return 0;
}
+ memset(&duplicate,0,sizeof(duplicate));
+
while( (it = libconfig->setting_get_elem(itdb,i++)) ) {
int nameid = itemdb->readdb_libconfig_sub(it, i-1, filename);
diff --git a/src/map/itemdb.h b/src/map/itemdb.h
index 8a0ec389d..b83c27ed2 100644
--- a/src/map/itemdb.h
+++ b/src/map/itemdb.h
@@ -23,10 +23,10 @@
/* #include "map/map.h" */
#include "common/hercules.h"
-#include "common/conf.h"
#include "common/db.h"
#include "common/mmo.h" // ITEM_NAME_LENGTH
+struct config_setting_t;
struct script_code;
struct hplugin_data_store;
@@ -631,8 +631,8 @@ struct itemdb_interface {
void (*read_combos) (void);
int (*gendercheck) (struct item_data *id);
int (*validate_entry) (struct item_data *entry, int n, const char *source);
- void (*readdb_additional_fields) (int itemid, config_setting_t *it, int n, const char *source);
- int (*readdb_libconfig_sub) (config_setting_t *it, int n, const char *source);
+ void (*readdb_additional_fields) (int itemid, struct config_setting_t *it, int n, const char *source);
+ int (*readdb_libconfig_sub) (struct config_setting_t *it, int n, const char *source);
int (*readdb_libconfig) (const char *filename);
uint64 (*unique_id) (struct map_session_data *sd);
void (*read) (bool minimal);
@@ -641,7 +641,7 @@ struct itemdb_interface {
void (*clear) (bool total);
struct item_combo * (*id2combo) (unsigned short id);
bool (*is_item_usable) (struct item_data *item);
- bool (*lookup_const) (const config_setting_t *it, const char *name, int *value);
+ bool (*lookup_const) (const struct config_setting_t *it, const char *name, int *value);
};
#ifdef HERCULES_CORE
diff --git a/src/map/map.c b/src/map/map.c
index 3dad25fce..c17dd9b0e 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -4982,27 +4982,27 @@ enum bl_type map_zone_bl_type(const char *entry, enum map_zone_skill_subtype *su
}
/* [Ind/Hercules] */
void read_map_zone_db(void) {
- config_t map_zone_db;
- config_setting_t *zones = NULL;
+ struct config_t map_zone_db;
+ struct config_setting_t *zones = NULL;
/* TODO: #ifndef required for re/pre-re */
#ifdef RENEWAL
const char *config_filename = "db/re/map_zone_db.conf"; // FIXME hardcoded name
#else
const char *config_filename = "db/pre-re/map_zone_db.conf"; // FIXME hardcoded name
#endif
- if (libconfig->read_file(&map_zone_db, config_filename))
+ if (!libconfig->load_file(&map_zone_db, config_filename))
return;
zones = libconfig->lookup(&map_zone_db, "zones");
if (zones != NULL) {
struct map_zone_data *zone;
- config_setting_t *zone_e;
- config_setting_t *skills;
- config_setting_t *items;
- config_setting_t *mapflags;
- config_setting_t *commands;
- config_setting_t *caps;
+ struct config_setting_t *zone_e;
+ struct config_setting_t *skills;
+ struct config_setting_t *items;
+ struct config_setting_t *mapflags;
+ struct config_setting_t *commands;
+ struct config_setting_t *caps;
const char *name;
const char *zonename;
int i,h,v,j;
@@ -5054,7 +5054,7 @@ void read_map_zone_db(void) {
disabled_skills_count = libconfig->setting_length(skills);
/* validate */
for(h = 0; h < libconfig->setting_length(skills); h++) {
- config_setting_t *skillinfo = libconfig->setting_get_elem(skills, h);
+ struct config_setting_t *skillinfo = libconfig->setting_get_elem(skills, h);
name = config_setting_name(skillinfo);
if( !map->zone_str2skillid(name) ) {
ShowError("map_zone_db: unknown skill (%s) in disabled_skills for zone '%s', skipping skill...\n",name,zone->name);
@@ -5069,7 +5069,7 @@ void read_map_zone_db(void) {
/* all ok, process */
CREATE( zone->disabled_skills, struct map_zone_disabled_skill_entry *, disabled_skills_count );
for(h = 0, v = 0; h < libconfig->setting_length(skills); h++) {
- config_setting_t *skillinfo = libconfig->setting_get_elem(skills, h);
+ struct config_setting_t *skillinfo = libconfig->setting_get_elem(skills, h);
struct map_zone_disabled_skill_entry * entry;
enum bl_type type;
name = config_setting_name(skillinfo);
@@ -5092,7 +5092,7 @@ void read_map_zone_db(void) {
disabled_items_count = libconfig->setting_length(items);
/* validate */
for(h = 0; h < libconfig->setting_length(items); h++) {
- config_setting_t *item = libconfig->setting_get_elem(items, h);
+ struct config_setting_t *item = libconfig->setting_get_elem(items, h);
name = config_setting_name(item);
if( !map->zone_str2itemid(name) ) {
ShowError("map_zone_db: unknown item (%s) in disabled_items for zone '%s', skipping item...\n",name,zone->name);
@@ -5111,7 +5111,7 @@ void read_map_zone_db(void) {
CREATE(zone->cant_disable_items, int, zone->cant_disable_items_count);
}
for(h = 0, v = 0, j = 0; h < libconfig->setting_length(items); h++) {
- config_setting_t *item = libconfig->setting_get_elem(items, h);
+ struct config_setting_t *item = libconfig->setting_get_elem(items, h);
name = config_setting_name(item);
if( libconfig->setting_get_bool(item) ) { /* only add if enabled */
@@ -5143,7 +5143,7 @@ void read_map_zone_db(void) {
disabled_commands_count = libconfig->setting_length(commands);
/* validate */
for(h = 0; h < libconfig->setting_length(commands); h++) {
- config_setting_t *command = libconfig->setting_get_elem(commands, h);
+ struct config_setting_t *command = libconfig->setting_get_elem(commands, h);
name = config_setting_name(command);
if( !atcommand->exists(name) ) {
ShowError("map_zone_db: unknown command '%s' in disabled_commands for zone '%s', skipping entry...\n",name,zone->name);
@@ -5158,7 +5158,7 @@ void read_map_zone_db(void) {
/* all ok, process */
CREATE( zone->disabled_commands, struct map_zone_disabled_command_entry *, disabled_commands_count );
for(h = 0, v = 0; h < libconfig->setting_length(commands); h++) {
- config_setting_t *command = libconfig->setting_get_elem(commands, h);
+ struct config_setting_t *command = libconfig->setting_get_elem(commands, h);
struct map_zone_disabled_command_entry * entry;
int group_lv;
name = config_setting_name(command);
@@ -5179,7 +5179,7 @@ void read_map_zone_db(void) {
capped_skills_count = libconfig->setting_length(caps);
/* validate */
for(h = 0; h < libconfig->setting_length(caps); h++) {
- config_setting_t *cap = libconfig->setting_get_elem(caps, h);
+ struct config_setting_t *cap = libconfig->setting_get_elem(caps, h);
name = config_setting_name(cap);
if( !map->zone_str2skillid(name) ) {
ShowError("map_zone_db: unknown skill (%s) in skill_damage_cap for zone '%s', skipping skill...\n",name,zone->name);
@@ -5194,7 +5194,7 @@ void read_map_zone_db(void) {
/* all ok, process */
CREATE( zone->capped_skills, struct map_zone_skill_damage_cap_entry *, capped_skills_count );
for(h = 0, v = 0; h < libconfig->setting_length(caps); h++) {
- config_setting_t *cap = libconfig->setting_get_elem(caps, h);
+ struct config_setting_t *cap = libconfig->setting_get_elem(caps, h);
struct map_zone_skill_damage_cap_entry * entry;
enum bl_type type;
name = config_setting_name(cap);
@@ -5219,8 +5219,8 @@ void read_map_zone_db(void) {
/* process inheritance, aka loop through the whole thing again :P */
for (i = 0; i < zone_count; ++i) {
- config_setting_t *inherit_tree = NULL;
- config_setting_t *new_entry = NULL;
+ struct config_setting_t *inherit_tree = NULL;
+ struct config_setting_t *new_entry = NULL;
int inherit_count;
zone_e = libconfig->setting_get_elem(zones, i);
@@ -5278,7 +5278,7 @@ void read_map_zone_db(void) {
for(j = 0; j < disabled_skills_count_i; j++) {
int k;
for(k = 0; k < disabled_skills_count; k++) {
- config_setting_t *skillinfo = libconfig->setting_get_elem(skills, k);
+ struct config_setting_t *skillinfo = libconfig->setting_get_elem(skills, k);
if( map->zone_str2skillid(config_setting_name(skillinfo)) == izone->disabled_skills[j]->nameid ) {
break;
}
@@ -5302,7 +5302,7 @@ void read_map_zone_db(void) {
for(j = 0; j < disabled_items_count_i; j++) {
int k;
for(k = 0; k < disabled_items_count; k++) {
- config_setting_t *item = libconfig->setting_get_elem(items, k);
+ struct config_setting_t *item = libconfig->setting_get_elem(items, k);
name = config_setting_name(item);
@@ -5348,7 +5348,7 @@ void read_map_zone_db(void) {
for(j = 0; j < disabled_commands_count_i; j++) {
int k;
for(k = 0; k < disabled_commands_count; k++) {
- config_setting_t *command = libconfig->setting_get_elem(commands, k);
+ struct config_setting_t *command = libconfig->setting_get_elem(commands, k);
if( atcommand->exists(config_setting_name(command))->func == izone->disabled_commands[j]->cmd ) {
break;
}
@@ -5372,7 +5372,7 @@ void read_map_zone_db(void) {
for(j = 0; j < capped_skills_count_i; j++) {
int k;
for(k = 0; k < capped_skills_count; k++) {
- config_setting_t *cap = libconfig->setting_get_elem(caps, k);
+ struct config_setting_t *cap = libconfig->setting_get_elem(caps, k);
if( map->zone_str2skillid(config_setting_name(cap)) == izone->capped_skills[j]->nameid ) {
break;
}
diff --git a/src/map/mob.c b/src/map/mob.c
index 86f3ddc0d..2ae54ba69 100644
--- a/src/map/mob.c
+++ b/src/map/mob.c
@@ -46,6 +46,7 @@
#include "map/status.h"
#include "common/HPM.h"
#include "common/cbasetypes.h"
+#include "common/conf.h"
#include "common/db.h"
#include "common/ers.h"
#include "common/memmgr.h"
@@ -3691,7 +3692,7 @@ static inline int mob_parse_dbrow_cap_value(int class_, int min, int max, int va
* (mob_id is expected to be already set).
* @param[in] t The libconfig entry.
*/
-void mob_read_db_stats_sub(struct mob_db *entry, config_setting_t *t)
+void mob_read_db_stats_sub(struct mob_db *entry, struct config_setting_t *t)
{
int i32;
if (mob->lookup_const(t, "Str", &i32) && i32 >= 0) {
@@ -3722,10 +3723,10 @@ void mob_read_db_stats_sub(struct mob_db *entry, config_setting_t *t)
*
* @return The parsed mode.
*/
-int mob_read_db_mode_sub(struct mob_db *entry, config_setting_t *t)
+int mob_read_db_mode_sub(struct mob_db *entry, struct config_setting_t *t)
{
int mode = 0;
- config_setting_t *t2;
+ struct config_setting_t *t2;
if ((t2 = libconfig->setting_get_member(t, "CanMove")))
mode |= libconfig->setting_get_bool(t2) ? MD_CANMOVE : 0;
@@ -3768,9 +3769,9 @@ int mob_read_db_mode_sub(struct mob_db *entry, config_setting_t *t)
* (mob_id is expected to be already set).
* @param[in] t The libconfig entry.
*/
-void mob_read_db_mvpdrops_sub(struct mob_db *entry, config_setting_t *t)
+void mob_read_db_mvpdrops_sub(struct mob_db *entry, struct config_setting_t *t)
{
- config_setting_t *drop;
+ struct config_setting_t *drop;
int i = 0;
int idx = 0;
int i32;
@@ -3824,9 +3825,9 @@ void mob_read_db_mvpdrops_sub(struct mob_db *entry, config_setting_t *t)
* (mob_id, status.mode are expected to be already set).
* @param[in] t The libconfig entry.
*/
-void mob_read_db_drops_sub(struct mob_db *entry, config_setting_t *t)
+void mob_read_db_drops_sub(struct mob_db *entry, struct config_setting_t *t)
{
- config_setting_t *drop;
+ struct config_setting_t *drop;
int i = 0;
int idx = 0;
int i32;
@@ -4051,10 +4052,10 @@ int mob_db_validate_entry(struct mob_db *entry, int n, const char *source)
* validation errors.
* @return Mob ID of the validated entry, or 0 in case of failure.
*/
-int mob_read_db_sub(config_setting_t *mobt, int n, const char *source)
+int mob_read_db_sub(struct config_setting_t *mobt, int n, const char *source)
{
struct mob_db md = { 0 };
- config_setting_t *t = NULL;
+ struct config_setting_t *t = NULL;
const char *str = NULL;
int i32 = 0;
bool inherit = false;
@@ -4359,12 +4360,12 @@ int mob_read_db_sub(config_setting_t *mobt, int n, const char *source)
* @param[in] source Source of the entry (file name), to be displayed in
* case of validation errors.
*/
-void mob_read_db_additional_fields(struct mob_db *entry, config_setting_t *t, int n, const char *source)
+void mob_read_db_additional_fields(struct mob_db *entry, struct config_setting_t *t, int n, const char *source)
{
// do nothing. plugins can do own work
}
-bool mob_lookup_const(const config_setting_t *it, const char *name, int *value)
+bool mob_lookup_const(const struct config_setting_t *it, const char *name, int *value)
{
if (libconfig->setting_lookup_int(it, name, value))
{
@@ -4382,7 +4383,7 @@ bool mob_lookup_const(const config_setting_t *it, const char *name, int *value)
return false;
}
-bool mob_get_const(const config_setting_t *it, int *value)
+bool mob_get_const(const struct config_setting_t *it, int *value)
{
const char *str = config_setting_get_string(it);
if (str && *str && script->get_constant(str, value))
@@ -4419,10 +4420,10 @@ void mob_readdb(void) {
int mob_read_libconfig(const char *filename, bool ignore_missing)
{
bool duplicate[MAX_MOB_DB] = { 0 };
- config_t mob_db_conf;
+ struct config_t mob_db_conf;
char filepath[256];
- config_setting_t *mdb;
- config_setting_t *t;
+ struct config_setting_t *mdb;
+ struct config_setting_t *t;
int i = 0, count = 0;
nullpo_ret(filename);
@@ -4431,7 +4432,10 @@ int mob_read_libconfig(const char *filename, bool ignore_missing)
if (ignore_missing && !exists(filepath))
return 0;
- if (libconfig->read_file(&mob_db_conf, filepath) || !(mdb = libconfig->setting_get_member(mob_db_conf.root, "mob_db"))) {
+ if (!libconfig->load_file(&mob_db_conf, filepath))
+ return 0;
+
+ if ((mdb = libconfig->setting_get_member(mob_db_conf.root, "mob_db")) == NULL) {
ShowError("can't read %s\n", filepath);
return 0;
}
diff --git a/src/map/mob.h b/src/map/mob.h
index 9a5239b11..00e2b0723 100644
--- a/src/map/mob.h
+++ b/src/map/mob.h
@@ -510,16 +510,16 @@ struct mob_interface {
unsigned int (*drop_adjust) (int baserate, int rate_adjust, unsigned short rate_min, unsigned short rate_max);
void (*item_dropratio_adjust) (int nameid, int mob_id, int *rate_adjust);
void (*readdb) (void);
- bool (*lookup_const) (const config_setting_t *it, const char *name, int *value);
- bool (*get_const) (const config_setting_t *it, int *value);
+ bool (*lookup_const) (const struct config_setting_t *it, const char *name, int *value);
+ bool (*get_const) (const struct config_setting_t *it, int *value);
int (*db_validate_entry) (struct mob_db *entry, int n, const char *source);
int (*read_libconfig) (const char *filename, bool ignore_missing);
- void (*read_db_additional_fields) (struct mob_db *entry, config_setting_t *it, int n, const char *source);
- int (*read_db_sub) (config_setting_t *mobt, int id, const char *source);
- void (*read_db_drops_sub) (struct mob_db *entry, config_setting_t *t);
- void (*read_db_mvpdrops_sub) (struct mob_db *entry, config_setting_t *t);
- int (*read_db_mode_sub) (struct mob_db *entry, config_setting_t *t);
- void (*read_db_stats_sub) (struct mob_db *entry, config_setting_t *t);
+ void (*read_db_additional_fields) (struct mob_db *entry, struct config_setting_t *it, int n, const char *source);
+ int (*read_db_sub) (struct config_setting_t *mobt, int id, const char *source);
+ void (*read_db_drops_sub) (struct mob_db *entry, struct config_setting_t *t);
+ void (*read_db_mvpdrops_sub) (struct mob_db *entry, struct config_setting_t *t);
+ int (*read_db_mode_sub) (struct mob_db *entry, struct config_setting_t *t);
+ void (*read_db_stats_sub) (struct mob_db *entry, struct config_setting_t *t);
void (*name_constants) (void);
bool (*readdb_mobavail) (char *str[], int columns, int current);
int (*read_randommonster) (void);
diff --git a/src/map/pc.c b/src/map/pc.c
index 8d1df71a9..fb6fc523c 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -10642,8 +10642,8 @@ int pc_split_atoui(char* str, unsigned int* val, char sep, int max)
*/
void pc_read_skill_tree(void)
{
- config_t skill_tree_conf;
- config_setting_t *skt = NULL;
+ struct config_t skill_tree_conf;
+ struct config_setting_t *skt = NULL;
char config_filename[128];
int i = 0;
struct s_mapiterator *iter;
@@ -10651,14 +10651,12 @@ void pc_read_skill_tree(void)
bool loaded[CLASS_COUNT] = { false };
safesnprintf(config_filename, sizeof(config_filename), "%s/"DBPATH"skill_tree.conf", map->db_path);
- if (libconfig->read_file(&skill_tree_conf, config_filename)) {
- ShowError("can't read %s\n", config_filename);
+ if (!libconfig->load_file(&skill_tree_conf, config_filename))
return;
- }
// Foreach job
while ((skt = libconfig->setting_get_elem(skill_tree_conf.root, i++))) {
- config_setting_t *t = NULL;
+ struct config_setting_t *t = NULL;
int job_idx;
const char *job_name = config_setting_name(skt);
int job_id = pc->check_job_name(job_name);
@@ -10748,11 +10746,11 @@ void pc_read_skill_tree(void)
}
if ((t = libconfig->setting_get_member(skt, "skills")) != NULL) {
int j = 0;
- config_setting_t *sk = NULL;
+ struct config_setting_t *sk = NULL;
// Foreach skill
while ((sk = libconfig->setting_get_elem(t, j++)) != NULL) {
int skill_id, sk_idx;
- config_setting_t *rsk = NULL;
+ struct config_setting_t *rsk = NULL;
const char *sk_name = config_setting_name(sk);
struct skill_tree_entry *tree_entry = NULL;
diff --git a/src/map/pc_groups.c b/src/map/pc_groups.c
index bd46b9616..72935adc3 100644
--- a/src/map/pc_groups.c
+++ b/src/map/pc_groups.c
@@ -63,12 +63,12 @@ static inline GroupSettings* name2group(const char* group_name)
* @private
*/
static void read_config(void) {
- config_t pc_group_config;
- config_setting_t *groups = NULL;
+ struct config_t pc_group_config;
+ struct config_setting_t *groups = NULL;
const char *config_filename = "conf/groups.conf"; // FIXME hardcoded name
int group_count = 0;
- if (libconfig->read_file(&pc_group_config, config_filename))
+ if (!libconfig->load_file(&pc_group_config, config_filename))
return;
groups = libconfig->lookup(&pc_group_config, "groups");
@@ -83,7 +83,7 @@ static void read_config(void) {
int id = 0, level = 0;
const char *groupname = NULL;
int log_commands = 0;
- config_setting_t *group = libconfig->setting_get_elem(groups, i);
+ struct config_setting_t *group = libconfig->setting_get_elem(groups, i);
if (!libconfig->setting_lookup_int(group, "id", &id)) {
ShowConfigWarning(group, "pc_groups:read_config: \"groups\" list member #%d has undefined id, removing...", i);
@@ -106,7 +106,7 @@ static void read_config(void) {
if (!libconfig->setting_lookup_string(group, "name", &groupname)) {
char temp[20];
- config_setting_t *name = NULL;
+ struct config_setting_t *name = NULL;
snprintf(temp, sizeof(temp), "Group %d", id);
if ((name = config_setting_add(group, "name", CONFIG_TYPE_STRING)) == NULL ||
!config_setting_set_string(name, temp)) {
@@ -148,7 +148,7 @@ static void read_config(void) {
// Check if all commands and permissions exist
iter = db_iterator(pcg->db);
for (group_settings = dbi_first(iter); dbi_exists(iter); group_settings = dbi_next(iter)) {
- config_setting_t *commands = group_settings->commands, *permissions = group_settings->permissions;
+ struct config_setting_t *commands = group_settings->commands, *permissions = group_settings->permissions;
int count = 0;
// Make sure there is "commands" group
@@ -157,7 +157,7 @@ static void read_config(void) {
count = libconfig->setting_length(commands);
for (i = 0; i < count; ++i) {
- config_setting_t *command = libconfig->setting_get_elem(commands, i);
+ struct config_setting_t *command = libconfig->setting_get_elem(commands, i);
const char *name = config_setting_name(command);
if (!atcommand->exists(name)) {
ShowConfigWarning(command, "pc_groups:read_config: non-existent command name '%s', removing...", name);
@@ -173,7 +173,7 @@ static void read_config(void) {
count = libconfig->setting_length(permissions);
for(i = 0; i < count; ++i) {
- config_setting_t *permission = libconfig->setting_get_elem(permissions, i);
+ struct config_setting_t *permission = libconfig->setting_get_elem(permissions, i);
const char *name = config_setting_name(permission);
int j;
@@ -193,7 +193,7 @@ static void read_config(void) {
while (i < group_count) {
iter = db_iterator(pcg->db);
for (group_settings = dbi_first(iter); dbi_exists(iter); group_settings = dbi_next(iter)) {
- config_setting_t *inherit = NULL,
+ struct config_setting_t *inherit = NULL,
*commands = group_settings->commands,
*permissions = group_settings->permissions;
int j, inherit_count = 0, done = 0;
@@ -258,11 +258,11 @@ static void read_config(void) {
// Pack permissions into GroupSettings.e_permissions for faster checking
iter = db_iterator(pcg->db);
for (group_settings = dbi_first(iter); dbi_exists(iter); group_settings = dbi_next(iter)) {
- config_setting_t *permissions = group_settings->permissions;
+ struct config_setting_t *permissions = group_settings->permissions;
int count = libconfig->setting_length(permissions);
for (i = 0; i < count; ++i) {
- config_setting_t *perm = libconfig->setting_get_elem(permissions, i);
+ struct config_setting_t *perm = libconfig->setting_get_elem(permissions, i);
const char *name = config_setting_name(perm);
int val = libconfig->setting_get_bool(perm);
int j;
@@ -280,9 +280,9 @@ static void read_config(void) {
// to atcommand->load_group() for processing.
if (group_count > 0) {
GroupSettings **pc_groups = NULL;
- config_setting_t **commands = NULL;
+ struct config_setting_t **commands = NULL;
CREATE(pc_groups, GroupSettings*, group_count);
- CREATE(commands, config_setting_t*, group_count);
+ CREATE(commands, struct config_setting_t*, group_count);
i = 0;
iter = db_iterator(pcg->db);
for (group_settings = dbi_first(iter); dbi_exists(iter); group_settings = dbi_next(iter)) {
diff --git a/src/map/pc_groups.h b/src/map/pc_groups.h
index 62704fb12..3f95237b7 100644
--- a/src/map/pc_groups.h
+++ b/src/map/pc_groups.h
@@ -22,9 +22,11 @@
#define MAP_PC_GROUPS_H
#include "common/hercules.h"
-#include "common/conf.h"
#include "common/db.h"
+/* Forward Declarations */
+struct config_setting_t;
+
/// PC permissions
enum e_pc_permission {
PC_PERM_NONE = 0, // #0
@@ -66,11 +68,11 @@ struct GroupSettings {
bool log_commands; // groups.[].log_commands
int index; // internal index of the group (contiguous range starting at 0) [Ind]
/// Following are used/available only during config reading
- config_setting_t *commands; // groups.[].commands
- config_setting_t *permissions; // groups.[].permissions
- config_setting_t *inherit; // groups.[].inherit
+ struct config_setting_t *commands; // groups.[].commands
+ struct config_setting_t *permissions; // groups.[].permissions
+ struct config_setting_t *inherit; // groups.[].inherit
bool inheritance_done; // have all inheritance rules been evaluated?
- config_setting_t *root; // groups.[]
+ struct config_setting_t *root; // groups.[]
};
typedef struct GroupSettings GroupSettings;
diff --git a/src/map/quest.c b/src/map/quest.c
index 0dbea56f8..7e2421c79 100644
--- a/src/map/quest.c
+++ b/src/map/quest.c
@@ -425,10 +425,10 @@ int quest_check(struct map_session_data *sd, int quest_id, enum quest_check_type
* @return The parsed quest entry.
* @retval NULL in case of errors.
*/
-struct quest_db *quest_read_db_sub(config_setting_t *cs, int n, const char *source)
+struct quest_db *quest_read_db_sub(struct config_setting_t *cs, int n, const char *source)
{
struct quest_db *entry = NULL;
- config_setting_t *t = NULL;
+ struct config_setting_t *t = NULL;
int i32 = 0, quest_id;
const char *str = NULL;
/*
@@ -477,7 +477,7 @@ struct quest_db *quest_read_db_sub(config_setting_t *cs, int n, const char *sour
for (i = 0; i < len && entry->objectives_count < MAX_QUEST_OBJECTIVES; i++) {
// Note: We ensure that objectives_count < MAX_QUEST_OBJECTIVES because
// quest_log (as well as the client) expect this maximum size.
- config_setting_t *tt = libconfig->setting_get_elem(t, i);
+ struct config_setting_t *tt = libconfig->setting_get_elem(t, i);
int mob_id = 0, count = 0;
if (!tt)
break;
@@ -496,7 +496,7 @@ struct quest_db *quest_read_db_sub(config_setting_t *cs, int n, const char *sour
if ((t=libconfig->setting_get_member(cs, "Drops")) && config_setting_is_list(t)) {
int i, len = libconfig->setting_length(t);
for (i = 0; i < len; i++) {
- config_setting_t *tt = libconfig->setting_get_elem(t, i);
+ struct config_setting_t *tt = libconfig->setting_get_elem(t, i);
int mob_id = 0, nameid = 0, rate = 0;
if (!tt)
break;
@@ -527,13 +527,16 @@ struct quest_db *quest_read_db_sub(config_setting_t *cs, int n, const char *sour
int quest_read_db(void)
{
char filepath[256];
- config_t quest_db_conf;
- config_setting_t *qdb = NULL, *q = NULL;
+ struct config_t quest_db_conf;
+ struct config_setting_t *qdb = NULL, *q = NULL;
int i = 0, count = 0;
const char *filename = "quest_db.conf";
sprintf(filepath, "%s/%s", map->db_path, filename);
- if (libconfig->read_file(&quest_db_conf, filepath) || !(qdb = libconfig->setting_get_member(quest_db_conf.root, "quest_db"))) {
+ if (!libconfig->load_file(&quest_db_conf, filepath))
+ return -1;
+
+ if ((qdb = libconfig->setting_get_member(quest_db_conf.root, "quest_db")) == NULL) {
ShowError("can't read %s\n", filepath);
return -1;
}
diff --git a/src/map/quest.h b/src/map/quest.h
index 8e2cb4e23..e0768ef40 100644
--- a/src/map/quest.h
+++ b/src/map/quest.h
@@ -22,10 +22,11 @@
#define MAP_QUEST_H
#include "common/hercules.h"
-#include "common/conf.h"
#include "common/mmo.h" // enum quest_state
+/* Forward Declarations */
struct block_list;
+struct config_setting_t;
struct map_session_data;
#define MAX_QUEST_DB (60355+1) // Highest quest ID + 1
@@ -77,7 +78,7 @@ struct quest_interface {
int (*check) (struct map_session_data *sd, int quest_id, enum quest_check_type type);
void (*clear) (void);
int (*read_db) (void);
- struct quest_db *(*read_db_sub) (config_setting_t *cs, int n, const char *source);
+ struct quest_db *(*read_db_sub) (struct config_setting_t *cs, int n, const char *source);
};
#ifdef HERCULES_CORE
diff --git a/src/map/script.c b/src/map/script.c
index f3c839555..4b3bf960c 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -55,6 +55,7 @@
#include "map/storage.h"
#include "map/unit.h"
#include "common/cbasetypes.h"
+#include "common/conf.h"
#include "common/memmgr.h"
#include "common/md5calc.h"
#include "common/mmo.h" // NEW_CARTS
@@ -2289,15 +2290,18 @@ void script_set_constant2(const char *name, int value, bool is_parameter, bool i
*/
void read_constdb(void)
{
- config_t constants_conf;
+ struct config_t constants_conf;
char filepath[256];
- config_setting_t *cdb;
- config_setting_t *t;
+ struct config_setting_t *cdb;
+ struct config_setting_t *t;
int i = 0;
sprintf(filepath, "%s/constants.conf", map->db_path);
- if (libconfig->read_file(&constants_conf, filepath) || !(cdb = libconfig->setting_get_member(constants_conf.root, "constants_db"))) {
+ if (!libconfig->load_file(&constants_conf, filepath))
+ return;
+
+ if ((cdb = libconfig->setting_get_member(constants_conf.root, "constants_db")) == NULL) {
ShowError("can't read %s\n", filepath);
return;
}
@@ -4800,9 +4804,9 @@ uint8 script_add_language(const char *name) {
* Goes thru db/translations.conf file
**/
void script_load_translations(void) {
- config_t translations_conf;
+ struct config_t translations_conf;
const char *config_filename = "db/translations.conf"; // FIXME hardcoded name
- config_setting_t *translations = NULL;
+ struct config_setting_t *translations = NULL;
int i, size;
uint32 total = 0;
uint8 lang_id = 0, k;
@@ -4822,12 +4826,10 @@ void script_load_translations(void) {
script->add_language("English");/* 0 is default, which is whatever is in the npc files hardcoded (in our case, English) */
- if (libconfig->read_file(&translations_conf, config_filename)) {
- ShowError("load_translations: can't read '%s'\n", config_filename);
+ if (!libconfig->load_file(&translations_conf, config_filename))
return;
- }
- if( !(translations = libconfig->lookup(&translations_conf, "translations")) ) {
+ if ((translations = libconfig->lookup(&translations_conf, "translations")) == NULL) {
ShowError("load_translations: invalid format on '%s'\n",config_filename);
return;
}
diff --git a/src/map/status.c b/src/map/status.c
index 26db1750b..39df5c693 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -12556,9 +12556,9 @@ int status_get_sc_type(sc_type type) {
return status->dbs->sc_conf[type];
}
-void status_read_job_db_sub(int idx, const char *name, config_setting_t *jdb)
+void status_read_job_db_sub(int idx, const char *name, struct config_setting_t *jdb)
{
- config_setting_t *temp = NULL;
+ struct config_setting_t *temp = NULL;
int i32 = 0;
struct {
@@ -12698,7 +12698,7 @@ void status_read_job_db_sub(int idx, const char *name, config_setting_t *jdb)
if ((temp = libconfig->setting_get_member(jdb, "BaseASPD"))) {
int widx = 0;
- config_setting_t *wpn = NULL;
+ struct config_setting_t *wpn = NULL;
while ((wpn = libconfig->setting_get_elem(temp, widx++))) {
int w, wlen = ARRAYLENGTH(wnames);
const char *wname = config_setting_name(wpn);
@@ -12714,7 +12714,7 @@ void status_read_job_db_sub(int idx, const char *name, config_setting_t *jdb)
if ((temp = libconfig->setting_get_member(jdb, "HPTable"))) {
int level = 0, avg_increment, base;
- config_setting_t *hp = NULL;
+ struct config_setting_t *hp = NULL;
while (level <= MAX_LEVEL && (hp = libconfig->setting_get_elem(temp, level)) != NULL) {
i32 = libconfig->setting_get_int(hp);
status->dbs->HP_table[idx][++level] = min(i32, battle_config.max_hp);
@@ -12734,7 +12734,7 @@ void status_read_job_db_sub(int idx, const char *name, config_setting_t *jdb)
if ((temp = libconfig->setting_get_member(jdb, "SPTable"))) {
int level = 0, avg_increment, base;
- config_setting_t *sp = NULL;
+ struct config_setting_t *sp = NULL;
while (level <= MAX_LEVEL && (sp = libconfig->setting_get_elem(temp, level)) != NULL) {
i32 = libconfig->setting_get_int(sp);
status->dbs->SP_table[idx][++level] = min(i32, battle_config.max_sp);
@@ -12762,18 +12762,17 @@ void status_read_job_db_sub(int idx, const char *name, config_setting_t *jdb)
*------------------------------------------*/
void status_read_job_db(void) { /* [malufett/Hercules] */
int i = 0;
- config_t job_db_conf;
- config_setting_t *jdb = NULL;
+ struct config_t job_db_conf;
+ struct config_setting_t *jdb = NULL;
#ifdef RENEWAL_ASPD
const char *config_filename = "db/re/job_db.conf";
#else
const char *config_filename = "db/pre-re/job_db.conf";
#endif
- if ( libconfig->read_file(&job_db_conf, config_filename) ) {
- ShowError("can't read %s\n", config_filename);
+ if (!libconfig->load_file(&job_db_conf, config_filename))
return;
- }
+
while ( (jdb = libconfig->setting_get_elem(job_db_conf.root, i++)) ) {
int class_, idx;
const char *name = config_setting_name(jdb);
@@ -12833,9 +12832,9 @@ bool status_readdb_sizefix(char* fields[], int columns, int current)
* validation errors.
* @return # of the validated entry, or 0 in case of failure.
*/
-int status_readdb_refine_libconfig_sub(config_setting_t *r, const char *name, const char *source)
+int status_readdb_refine_libconfig_sub(struct config_setting_t *r, const char *name, const char *source)
{
- config_setting_t *rate = NULL;
+ struct config_setting_t *rate = NULL;
int type = REFINE_TYPE_ARMOR, bonus_per_level = 0, rnd_bonus_v = 0, rnd_bonus_lv = 0;
char lv[4];
nullpo_ret(r);
@@ -12866,7 +12865,7 @@ int status_readdb_refine_libconfig_sub(config_setting_t *r, const char *name, co
}
if ((rate=libconfig->setting_get_member(r, "Rates")) != NULL && config_setting_is_group(rate)) {
- config_setting_t *t = NULL;
+ struct config_setting_t *t = NULL;
bool duplicate[MAX_REFINE];
int bonus[MAX_REFINE], rnd_bonus[MAX_REFINE], chance[MAX_REFINE];
int i;
@@ -12926,17 +12925,16 @@ int status_readdb_refine_libconfig_sub(config_setting_t *r, const char *name, co
*/
int status_readdb_refine_libconfig(const char *filename) {
bool duplicate[REFINE_TYPE_MAX];
- config_t refine_db_conf;
- config_setting_t *r;
+ struct config_t refine_db_conf;
+ struct config_setting_t *r;
char filepath[256];
int i = 0, count = 0,type = 0;
sprintf(filepath, "%s/%s", map->db_path, filename);
- memset(&duplicate,0,sizeof(duplicate));
- if( libconfig->read_file(&refine_db_conf, filepath) ) {
- ShowError("can't read %s\n", filepath);
+ if (!libconfig->load_file(&refine_db_conf, filepath))
return 0;
- }
+
+ memset(&duplicate,0,sizeof(duplicate));
while((r = libconfig->setting_get_elem(refine_db_conf.root,i++))) {
char *name = config_setting_name(r);
diff --git a/src/map/status.h b/src/map/status.h
index be6d4c209..85219b280 100644
--- a/src/map/status.h
+++ b/src/map/status.h
@@ -21,11 +21,11 @@
#ifndef MAP_STATUS_H
#define MAP_STATUS_H
-#include "common/conf.h"
#include "common/hercules.h"
#include "common/mmo.h" // NEW_CARTS
struct block_list;
+struct config_setting_t;
struct elemental_data;
struct homun_data;
struct mercenary_data;
@@ -2298,10 +2298,10 @@ struct status_interface {
bool (*readdb_job2) (char *fields[], int columns, int current);
bool (*readdb_sizefix) (char *fields[], int columns, int current);
int (*readdb_refine_libconfig) (const char *filename);
- int (*readdb_refine_libconfig_sub) (config_setting_t *r, const char *name, const char *source);
+ int (*readdb_refine_libconfig_sub) (struct config_setting_t *r, const char *name, const char *source);
bool (*readdb_scconfig) (char *fields[], int columns, int current);
void (*read_job_db) (void);
- void (*read_job_db_sub) (int idx, const char *name, config_setting_t *jdb);
+ void (*read_job_db_sub) (int idx, const char *name, struct config_setting_t *jdb);
};
#ifdef HERCULES_CORE
diff --git a/src/plugins/HPMHooking/HPMHooking_char.HPMHooksCore.inc b/src/plugins/HPMHooking/HPMHooking_char.HPMHooksCore.inc
index 9d8a2750d..849354fa1 100644
--- a/src/plugins/HPMHooking/HPMHooking_char.HPMHooksCore.inc
+++ b/src/plugins/HPMHooking/HPMHooking_char.HPMHooksCore.inc
@@ -610,10 +610,10 @@ struct {
struct HPMHookPoint *HP_libconfig_read_post;
struct HPMHookPoint *HP_libconfig_write_pre;
struct HPMHookPoint *HP_libconfig_write_post;
- struct HPMHookPoint *HP_libconfig_set_auto_convert_pre;
- struct HPMHookPoint *HP_libconfig_set_auto_convert_post;
- struct HPMHookPoint *HP_libconfig_get_auto_convert_pre;
- struct HPMHookPoint *HP_libconfig_get_auto_convert_post;
+ struct HPMHookPoint *HP_libconfig_set_options_pre;
+ struct HPMHookPoint *HP_libconfig_set_options_post;
+ struct HPMHookPoint *HP_libconfig_get_options_pre;
+ struct HPMHookPoint *HP_libconfig_get_options_post;
struct HPMHookPoint *HP_libconfig_read_string_pre;
struct HPMHookPoint *HP_libconfig_read_string_post;
struct HPMHookPoint *HP_libconfig_read_file_src_pre;
@@ -638,6 +638,8 @@ struct {
struct HPMHookPoint *HP_libconfig_setting_get_bool_post;
struct HPMHookPoint *HP_libconfig_setting_get_string_pre;
struct HPMHookPoint *HP_libconfig_setting_get_string_post;
+ struct HPMHookPoint *HP_libconfig_setting_lookup_pre;
+ struct HPMHookPoint *HP_libconfig_setting_lookup_post;
struct HPMHookPoint *HP_libconfig_setting_lookup_int_pre;
struct HPMHookPoint *HP_libconfig_setting_lookup_int_post;
struct HPMHookPoint *HP_libconfig_setting_lookup_int64_pre;
@@ -700,8 +702,6 @@ struct {
struct HPMHookPoint *HP_libconfig_setting_set_hook_post;
struct HPMHookPoint *HP_libconfig_lookup_pre;
struct HPMHookPoint *HP_libconfig_lookup_post;
- struct HPMHookPoint *HP_libconfig_lookup_from_pre;
- struct HPMHookPoint *HP_libconfig_lookup_from_post;
struct HPMHookPoint *HP_libconfig_lookup_int_pre;
struct HPMHookPoint *HP_libconfig_lookup_int_post;
struct HPMHookPoint *HP_libconfig_lookup_int64_pre;
@@ -712,8 +712,8 @@ struct {
struct HPMHookPoint *HP_libconfig_lookup_bool_post;
struct HPMHookPoint *HP_libconfig_lookup_string_pre;
struct HPMHookPoint *HP_libconfig_lookup_string_post;
- struct HPMHookPoint *HP_libconfig_read_file_pre;
- struct HPMHookPoint *HP_libconfig_read_file_post;
+ struct HPMHookPoint *HP_libconfig_load_file_pre;
+ struct HPMHookPoint *HP_libconfig_load_file_post;
struct HPMHookPoint *HP_libconfig_setting_copy_simple_pre;
struct HPMHookPoint *HP_libconfig_setting_copy_simple_post;
struct HPMHookPoint *HP_libconfig_setting_copy_elem_pre;
@@ -722,6 +722,26 @@ struct {
struct HPMHookPoint *HP_libconfig_setting_copy_aggregate_post;
struct HPMHookPoint *HP_libconfig_setting_copy_pre;
struct HPMHookPoint *HP_libconfig_setting_copy_post;
+ struct HPMHookPoint *HP_libconfig_setting_get_bool_real_pre;
+ struct HPMHookPoint *HP_libconfig_setting_get_bool_real_post;
+ struct HPMHookPoint *HP_libconfig_setting_get_uint32_pre;
+ struct HPMHookPoint *HP_libconfig_setting_get_uint32_post;
+ struct HPMHookPoint *HP_libconfig_setting_get_uint16_pre;
+ struct HPMHookPoint *HP_libconfig_setting_get_uint16_post;
+ struct HPMHookPoint *HP_libconfig_setting_get_int16_pre;
+ struct HPMHookPoint *HP_libconfig_setting_get_int16_post;
+ struct HPMHookPoint *HP_libconfig_setting_lookup_bool_real_pre;
+ struct HPMHookPoint *HP_libconfig_setting_lookup_bool_real_post;
+ struct HPMHookPoint *HP_libconfig_setting_lookup_uint32_pre;
+ struct HPMHookPoint *HP_libconfig_setting_lookup_uint32_post;
+ struct HPMHookPoint *HP_libconfig_setting_lookup_uint16_pre;
+ struct HPMHookPoint *HP_libconfig_setting_lookup_uint16_post;
+ struct HPMHookPoint *HP_libconfig_setting_lookup_int16_pre;
+ struct HPMHookPoint *HP_libconfig_setting_lookup_int16_post;
+ struct HPMHookPoint *HP_libconfig_setting_lookup_mutable_string_pre;
+ struct HPMHookPoint *HP_libconfig_setting_lookup_mutable_string_post;
+ struct HPMHookPoint *HP_libconfig_lookup_mutable_string_pre;
+ struct HPMHookPoint *HP_libconfig_lookup_mutable_string_post;
struct HPMHookPoint *HP_loginif_init_pre;
struct HPMHookPoint *HP_loginif_init_post;
struct HPMHookPoint *HP_loginif_final_pre;
@@ -1989,10 +2009,10 @@ struct {
int HP_libconfig_read_post;
int HP_libconfig_write_pre;
int HP_libconfig_write_post;
- int HP_libconfig_set_auto_convert_pre;
- int HP_libconfig_set_auto_convert_post;
- int HP_libconfig_get_auto_convert_pre;
- int HP_libconfig_get_auto_convert_post;
+ int HP_libconfig_set_options_pre;
+ int HP_libconfig_set_options_post;
+ int HP_libconfig_get_options_pre;
+ int HP_libconfig_get_options_post;
int HP_libconfig_read_string_pre;
int HP_libconfig_read_string_post;
int HP_libconfig_read_file_src_pre;
@@ -2017,6 +2037,8 @@ struct {
int HP_libconfig_setting_get_bool_post;
int HP_libconfig_setting_get_string_pre;
int HP_libconfig_setting_get_string_post;
+ int HP_libconfig_setting_lookup_pre;
+ int HP_libconfig_setting_lookup_post;
int HP_libconfig_setting_lookup_int_pre;
int HP_libconfig_setting_lookup_int_post;
int HP_libconfig_setting_lookup_int64_pre;
@@ -2079,8 +2101,6 @@ struct {
int HP_libconfig_setting_set_hook_post;
int HP_libconfig_lookup_pre;
int HP_libconfig_lookup_post;
- int HP_libconfig_lookup_from_pre;
- int HP_libconfig_lookup_from_post;
int HP_libconfig_lookup_int_pre;
int HP_libconfig_lookup_int_post;
int HP_libconfig_lookup_int64_pre;
@@ -2091,8 +2111,8 @@ struct {
int HP_libconfig_lookup_bool_post;
int HP_libconfig_lookup_string_pre;
int HP_libconfig_lookup_string_post;
- int HP_libconfig_read_file_pre;
- int HP_libconfig_read_file_post;
+ int HP_libconfig_load_file_pre;
+ int HP_libconfig_load_file_post;
int HP_libconfig_setting_copy_simple_pre;
int HP_libconfig_setting_copy_simple_post;
int HP_libconfig_setting_copy_elem_pre;
@@ -2101,6 +2121,26 @@ struct {
int HP_libconfig_setting_copy_aggregate_post;
int HP_libconfig_setting_copy_pre;
int HP_libconfig_setting_copy_post;
+ int HP_libconfig_setting_get_bool_real_pre;
+ int HP_libconfig_setting_get_bool_real_post;
+ int HP_libconfig_setting_get_uint32_pre;
+ int HP_libconfig_setting_get_uint32_post;
+ int HP_libconfig_setting_get_uint16_pre;
+ int HP_libconfig_setting_get_uint16_post;
+ int HP_libconfig_setting_get_int16_pre;
+ int HP_libconfig_setting_get_int16_post;
+ int HP_libconfig_setting_lookup_bool_real_pre;
+ int HP_libconfig_setting_lookup_bool_real_post;
+ int HP_libconfig_setting_lookup_uint32_pre;
+ int HP_libconfig_setting_lookup_uint32_post;
+ int HP_libconfig_setting_lookup_uint16_pre;
+ int HP_libconfig_setting_lookup_uint16_post;
+ int HP_libconfig_setting_lookup_int16_pre;
+ int HP_libconfig_setting_lookup_int16_post;
+ int HP_libconfig_setting_lookup_mutable_string_pre;
+ int HP_libconfig_setting_lookup_mutable_string_post;
+ int HP_libconfig_lookup_mutable_string_pre;
+ int HP_libconfig_lookup_mutable_string_post;
int HP_loginif_init_pre;
int HP_loginif_init_post;
int HP_loginif_final_pre;
diff --git a/src/plugins/HPMHooking/HPMHooking_char.HookingPoints.inc b/src/plugins/HPMHooking/HPMHooking_char.HookingPoints.inc
index fe3e806b1..7f359a9b4 100644
--- a/src/plugins/HPMHooking/HPMHooking_char.HookingPoints.inc
+++ b/src/plugins/HPMHooking/HPMHooking_char.HookingPoints.inc
@@ -335,8 +335,8 @@ struct HookingPointData HookingPoints[] = {
/* libconfig */
{ HP_POP(libconfig->read, HP_libconfig_read) },
{ HP_POP(libconfig->write, HP_libconfig_write) },
- { HP_POP(libconfig->set_auto_convert, HP_libconfig_set_auto_convert) },
- { HP_POP(libconfig->get_auto_convert, HP_libconfig_get_auto_convert) },
+ { HP_POP(libconfig->set_options, HP_libconfig_set_options) },
+ { HP_POP(libconfig->get_options, HP_libconfig_get_options) },
{ HP_POP(libconfig->read_string, HP_libconfig_read_string) },
{ HP_POP(libconfig->read_file_src, HP_libconfig_read_file_src) },
{ HP_POP(libconfig->write_file, HP_libconfig_write_file) },
@@ -349,6 +349,7 @@ struct HookingPointData HookingPoints[] = {
{ HP_POP(libconfig->setting_get_float, HP_libconfig_setting_get_float) },
{ HP_POP(libconfig->setting_get_bool, HP_libconfig_setting_get_bool) },
{ HP_POP(libconfig->setting_get_string, HP_libconfig_setting_get_string) },
+ { HP_POP(libconfig->setting_lookup, HP_libconfig_setting_lookup) },
{ HP_POP(libconfig->setting_lookup_int, HP_libconfig_setting_lookup_int) },
{ HP_POP(libconfig->setting_lookup_int64, HP_libconfig_setting_lookup_int64) },
{ HP_POP(libconfig->setting_lookup_float, HP_libconfig_setting_lookup_float) },
@@ -380,17 +381,26 @@ struct HookingPointData HookingPoints[] = {
{ HP_POP(libconfig->setting_remove_elem, HP_libconfig_setting_remove_elem) },
{ HP_POP(libconfig->setting_set_hook, HP_libconfig_setting_set_hook) },
{ HP_POP(libconfig->lookup, HP_libconfig_lookup) },
- { HP_POP(libconfig->lookup_from, HP_libconfig_lookup_from) },
{ HP_POP(libconfig->lookup_int, HP_libconfig_lookup_int) },
{ HP_POP(libconfig->lookup_int64, HP_libconfig_lookup_int64) },
{ HP_POP(libconfig->lookup_float, HP_libconfig_lookup_float) },
{ HP_POP(libconfig->lookup_bool, HP_libconfig_lookup_bool) },
{ HP_POP(libconfig->lookup_string, HP_libconfig_lookup_string) },
- { HP_POP(libconfig->read_file, HP_libconfig_read_file) },
+ { HP_POP(libconfig->load_file, HP_libconfig_load_file) },
{ HP_POP(libconfig->setting_copy_simple, HP_libconfig_setting_copy_simple) },
{ HP_POP(libconfig->setting_copy_elem, HP_libconfig_setting_copy_elem) },
{ HP_POP(libconfig->setting_copy_aggregate, HP_libconfig_setting_copy_aggregate) },
{ HP_POP(libconfig->setting_copy, HP_libconfig_setting_copy) },
+ { HP_POP(libconfig->setting_get_bool_real, HP_libconfig_setting_get_bool_real) },
+ { HP_POP(libconfig->setting_get_uint32, HP_libconfig_setting_get_uint32) },
+ { HP_POP(libconfig->setting_get_uint16, HP_libconfig_setting_get_uint16) },
+ { HP_POP(libconfig->setting_get_int16, HP_libconfig_setting_get_int16) },
+ { HP_POP(libconfig->setting_lookup_bool_real, HP_libconfig_setting_lookup_bool_real) },
+ { HP_POP(libconfig->setting_lookup_uint32, HP_libconfig_setting_lookup_uint32) },
+ { HP_POP(libconfig->setting_lookup_uint16, HP_libconfig_setting_lookup_uint16) },
+ { HP_POP(libconfig->setting_lookup_int16, HP_libconfig_setting_lookup_int16) },
+ { HP_POP(libconfig->setting_lookup_mutable_string, HP_libconfig_setting_lookup_mutable_string) },
+ { HP_POP(libconfig->lookup_mutable_string, HP_libconfig_lookup_mutable_string) },
/* loginif */
{ HP_POP(loginif->init, HP_loginif_init) },
{ HP_POP(loginif->final, HP_loginif_final) },
diff --git a/src/plugins/HPMHooking/HPMHooking_char.Hooks.inc b/src/plugins/HPMHooking/HPMHooking_char.Hooks.inc
index e6100ffdd..10b518e98 100644
--- a/src/plugins/HPMHooking/HPMHooking_char.Hooks.inc
+++ b/src/plugins/HPMHooking/HPMHooking_char.Hooks.inc
@@ -7824,11 +7824,11 @@ int HP_inter_storage_parse_frommap(int fd) {
return retVal___;
}
/* libconfig */
-int HP_libconfig_read(config_t *config, FILE *stream) {
+int HP_libconfig_read(struct config_t *config, FILE *stream) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_read_pre ) {
- int (*preHookFunc) (config_t *config, FILE *stream);
+ int (*preHookFunc) (struct config_t *config, FILE *stream);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_read_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_read_pre[hIndex].func;
@@ -7843,7 +7843,7 @@ int HP_libconfig_read(config_t *config, FILE *stream) {
retVal___ = HPMHooks.source.libconfig.read(config, stream);
}
if( HPMHooks.count.HP_libconfig_read_post ) {
- int (*postHookFunc) (int retVal___, config_t *config, FILE *stream);
+ int (*postHookFunc) (int retVal___, struct config_t *config, FILE *stream);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_read_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_read_post[hIndex].func;
retVal___ = postHookFunc(retVal___, config, stream);
@@ -7851,10 +7851,10 @@ int HP_libconfig_read(config_t *config, FILE *stream) {
}
return retVal___;
}
-void HP_libconfig_write(const config_t *config, FILE *stream) {
+void HP_libconfig_write(const struct config_t *config, FILE *stream) {
int hIndex = 0;
if( HPMHooks.count.HP_libconfig_write_pre ) {
- void (*preHookFunc) (const config_t *config, FILE *stream);
+ void (*preHookFunc) (const struct config_t *config, FILE *stream);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_write_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_write_pre[hIndex].func;
@@ -7869,7 +7869,7 @@ void HP_libconfig_write(const config_t *config, FILE *stream) {
HPMHooks.source.libconfig.write(config, stream);
}
if( HPMHooks.count.HP_libconfig_write_post ) {
- void (*postHookFunc) (const config_t *config, FILE *stream);
+ void (*postHookFunc) (const struct config_t *config, FILE *stream);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_write_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_write_post[hIndex].func;
postHookFunc(config, stream);
@@ -7877,14 +7877,14 @@ void HP_libconfig_write(const config_t *config, FILE *stream) {
}
return;
}
-void HP_libconfig_set_auto_convert(config_t *config, int flag) {
+void HP_libconfig_set_options(struct config_t *config, int options) {
int hIndex = 0;
- if( HPMHooks.count.HP_libconfig_set_auto_convert_pre ) {
- void (*preHookFunc) (config_t *config, int *flag);
+ if( HPMHooks.count.HP_libconfig_set_options_pre ) {
+ void (*preHookFunc) (struct config_t *config, int *options);
*HPMforce_return = false;
- for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_auto_convert_pre; hIndex++ ) {
- preHookFunc = HPMHooks.list.HP_libconfig_set_auto_convert_pre[hIndex].func;
- preHookFunc(config, &flag);
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_options_pre; hIndex++ ) {
+ preHookFunc = HPMHooks.list.HP_libconfig_set_options_pre[hIndex].func;
+ preHookFunc(config, &options);
}
if( *HPMforce_return ) {
*HPMforce_return = false;
@@ -7892,25 +7892,25 @@ void HP_libconfig_set_auto_convert(config_t *config, int flag) {
}
}
{
- HPMHooks.source.libconfig.set_auto_convert(config, flag);
+ HPMHooks.source.libconfig.set_options(config, options);
}
- if( HPMHooks.count.HP_libconfig_set_auto_convert_post ) {
- void (*postHookFunc) (config_t *config, int *flag);
- for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_auto_convert_post; hIndex++ ) {
- postHookFunc = HPMHooks.list.HP_libconfig_set_auto_convert_post[hIndex].func;
- postHookFunc(config, &flag);
+ if( HPMHooks.count.HP_libconfig_set_options_post ) {
+ void (*postHookFunc) (struct config_t *config, int *options);
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_options_post; hIndex++ ) {
+ postHookFunc = HPMHooks.list.HP_libconfig_set_options_post[hIndex].func;
+ postHookFunc(config, &options);
}
}
return;
}
-int HP_libconfig_get_auto_convert(const config_t *config) {
+int HP_libconfig_get_options(const struct config_t *config) {
int hIndex = 0;
int retVal___ = 0;
- if( HPMHooks.count.HP_libconfig_get_auto_convert_pre ) {
- int (*preHookFunc) (const config_t *config);
+ if( HPMHooks.count.HP_libconfig_get_options_pre ) {
+ int (*preHookFunc) (const struct config_t *config);
*HPMforce_return = false;
- for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_get_auto_convert_pre; hIndex++ ) {
- preHookFunc = HPMHooks.list.HP_libconfig_get_auto_convert_pre[hIndex].func;
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_get_options_pre; hIndex++ ) {
+ preHookFunc = HPMHooks.list.HP_libconfig_get_options_pre[hIndex].func;
retVal___ = preHookFunc(config);
}
if( *HPMforce_return ) {
@@ -7919,22 +7919,22 @@ int HP_libconfig_get_auto_convert(const config_t *config) {
}
}
{
- retVal___ = HPMHooks.source.libconfig.get_auto_convert(config);
+ retVal___ = HPMHooks.source.libconfig.get_options(config);
}
- if( HPMHooks.count.HP_libconfig_get_auto_convert_post ) {
- int (*postHookFunc) (int retVal___, const config_t *config);
- for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_get_auto_convert_post; hIndex++ ) {
- postHookFunc = HPMHooks.list.HP_libconfig_get_auto_convert_post[hIndex].func;
+ if( HPMHooks.count.HP_libconfig_get_options_post ) {
+ int (*postHookFunc) (int retVal___, const struct config_t *config);
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_get_options_post; hIndex++ ) {
+ postHookFunc = HPMHooks.list.HP_libconfig_get_options_post[hIndex].func;
retVal___ = postHookFunc(retVal___, config);
}
}
return retVal___;
}
-int HP_libconfig_read_string(config_t *config, const char *str) {
+int HP_libconfig_read_string(struct config_t *config, const char *str) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_read_string_pre ) {
- int (*preHookFunc) (config_t *config, const char *str);
+ int (*preHookFunc) (struct config_t *config, const char *str);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_read_string_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_read_string_pre[hIndex].func;
@@ -7949,7 +7949,7 @@ int HP_libconfig_read_string(config_t *config, const char *str) {
retVal___ = HPMHooks.source.libconfig.read_string(config, str);
}
if( HPMHooks.count.HP_libconfig_read_string_post ) {
- int (*postHookFunc) (int retVal___, config_t *config, const char *str);
+ int (*postHookFunc) (int retVal___, struct config_t *config, const char *str);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_read_string_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_read_string_post[hIndex].func;
retVal___ = postHookFunc(retVal___, config, str);
@@ -7957,11 +7957,11 @@ int HP_libconfig_read_string(config_t *config, const char *str) {
}
return retVal___;
}
-int HP_libconfig_read_file_src(config_t *config, const char *filename) {
+int HP_libconfig_read_file_src(struct config_t *config, const char *filename) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_read_file_src_pre ) {
- int (*preHookFunc) (config_t *config, const char *filename);
+ int (*preHookFunc) (struct config_t *config, const char *filename);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_read_file_src_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_read_file_src_pre[hIndex].func;
@@ -7976,7 +7976,7 @@ int HP_libconfig_read_file_src(config_t *config, const char *filename) {
retVal___ = HPMHooks.source.libconfig.read_file_src(config, filename);
}
if( HPMHooks.count.HP_libconfig_read_file_src_post ) {
- int (*postHookFunc) (int retVal___, config_t *config, const char *filename);
+ int (*postHookFunc) (int retVal___, struct config_t *config, const char *filename);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_read_file_src_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_read_file_src_post[hIndex].func;
retVal___ = postHookFunc(retVal___, config, filename);
@@ -7984,11 +7984,11 @@ int HP_libconfig_read_file_src(config_t *config, const char *filename) {
}
return retVal___;
}
-int HP_libconfig_write_file(config_t *config, const char *filename) {
+int HP_libconfig_write_file(struct config_t *config, const char *filename) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_write_file_pre ) {
- int (*preHookFunc) (config_t *config, const char *filename);
+ int (*preHookFunc) (struct config_t *config, const char *filename);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_write_file_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_write_file_pre[hIndex].func;
@@ -8003,7 +8003,7 @@ int HP_libconfig_write_file(config_t *config, const char *filename) {
retVal___ = HPMHooks.source.libconfig.write_file(config, filename);
}
if( HPMHooks.count.HP_libconfig_write_file_post ) {
- int (*postHookFunc) (int retVal___, config_t *config, const char *filename);
+ int (*postHookFunc) (int retVal___, struct config_t *config, const char *filename);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_write_file_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_write_file_post[hIndex].func;
retVal___ = postHookFunc(retVal___, config, filename);
@@ -8011,10 +8011,10 @@ int HP_libconfig_write_file(config_t *config, const char *filename) {
}
return retVal___;
}
-void HP_libconfig_set_destructor(config_t *config, void ( *destructor ) (void *)) {
+void HP_libconfig_set_destructor(struct config_t *config, void ( *destructor ) (void *)) {
int hIndex = 0;
if( HPMHooks.count.HP_libconfig_set_destructor_pre ) {
- void (*preHookFunc) (config_t *config, void ( *destructor ) (void *));
+ void (*preHookFunc) (struct config_t *config, void ( *destructor ) (void *));
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_destructor_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_set_destructor_pre[hIndex].func;
@@ -8029,7 +8029,7 @@ void HP_libconfig_set_destructor(config_t *config, void ( *destructor ) (void *)
HPMHooks.source.libconfig.set_destructor(config, destructor);
}
if( HPMHooks.count.HP_libconfig_set_destructor_post ) {
- void (*postHookFunc) (config_t *config, void ( *destructor ) (void *));
+ void (*postHookFunc) (struct config_t *config, void ( *destructor ) (void *));
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_destructor_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_set_destructor_post[hIndex].func;
postHookFunc(config, destructor);
@@ -8037,10 +8037,10 @@ void HP_libconfig_set_destructor(config_t *config, void ( *destructor ) (void *)
}
return;
}
-void HP_libconfig_set_include_dir(config_t *config, const char *include_dir) {
+void HP_libconfig_set_include_dir(struct config_t *config, const char *include_dir) {
int hIndex = 0;
if( HPMHooks.count.HP_libconfig_set_include_dir_pre ) {
- void (*preHookFunc) (config_t *config, const char *include_dir);
+ void (*preHookFunc) (struct config_t *config, const char *include_dir);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_include_dir_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_set_include_dir_pre[hIndex].func;
@@ -8055,7 +8055,7 @@ void HP_libconfig_set_include_dir(config_t *config, const char *include_dir) {
HPMHooks.source.libconfig.set_include_dir(config, include_dir);
}
if( HPMHooks.count.HP_libconfig_set_include_dir_post ) {
- void (*postHookFunc) (config_t *config, const char *include_dir);
+ void (*postHookFunc) (struct config_t *config, const char *include_dir);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_include_dir_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_set_include_dir_post[hIndex].func;
postHookFunc(config, include_dir);
@@ -8063,10 +8063,10 @@ void HP_libconfig_set_include_dir(config_t *config, const char *include_dir) {
}
return;
}
-void HP_libconfig_init(config_t *config) {
+void HP_libconfig_init(struct config_t *config) {
int hIndex = 0;
if( HPMHooks.count.HP_libconfig_init_pre ) {
- void (*preHookFunc) (config_t *config);
+ void (*preHookFunc) (struct config_t *config);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_init_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_init_pre[hIndex].func;
@@ -8081,7 +8081,7 @@ void HP_libconfig_init(config_t *config) {
HPMHooks.source.libconfig.init(config);
}
if( HPMHooks.count.HP_libconfig_init_post ) {
- void (*postHookFunc) (config_t *config);
+ void (*postHookFunc) (struct config_t *config);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_init_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_init_post[hIndex].func;
postHookFunc(config);
@@ -8089,10 +8089,10 @@ void HP_libconfig_init(config_t *config) {
}
return;
}
-void HP_libconfig_destroy(config_t *config) {
+void HP_libconfig_destroy(struct config_t *config) {
int hIndex = 0;
if( HPMHooks.count.HP_libconfig_destroy_pre ) {
- void (*preHookFunc) (config_t *config);
+ void (*preHookFunc) (struct config_t *config);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_destroy_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_destroy_pre[hIndex].func;
@@ -8107,7 +8107,7 @@ void HP_libconfig_destroy(config_t *config) {
HPMHooks.source.libconfig.destroy(config);
}
if( HPMHooks.count.HP_libconfig_destroy_post ) {
- void (*postHookFunc) (config_t *config);
+ void (*postHookFunc) (struct config_t *config);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_destroy_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_destroy_post[hIndex].func;
postHookFunc(config);
@@ -8115,11 +8115,11 @@ void HP_libconfig_destroy(config_t *config) {
}
return;
}
-int HP_libconfig_setting_get_int(const config_setting_t *setting) {
+int HP_libconfig_setting_get_int(const struct config_setting_t *setting) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_setting_get_int_pre ) {
- int (*preHookFunc) (const config_setting_t *setting);
+ int (*preHookFunc) (const struct config_setting_t *setting);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_get_int_pre[hIndex].func;
@@ -8134,7 +8134,7 @@ int HP_libconfig_setting_get_int(const config_setting_t *setting) {
retVal___ = HPMHooks.source.libconfig.setting_get_int(setting);
}
if( HPMHooks.count.HP_libconfig_setting_get_int_post ) {
- int (*postHookFunc) (int retVal___, const config_setting_t *setting);
+ int (*postHookFunc) (int retVal___, const struct config_setting_t *setting);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_get_int_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting);
@@ -8142,11 +8142,11 @@ int HP_libconfig_setting_get_int(const config_setting_t *setting) {
}
return retVal___;
}
-long long HP_libconfig_setting_get_int64(const config_setting_t *setting) {
+long long HP_libconfig_setting_get_int64(const struct config_setting_t *setting) {
int hIndex = 0;
long long retVal___ = 0;
if( HPMHooks.count.HP_libconfig_setting_get_int64_pre ) {
- long long (*preHookFunc) (const config_setting_t *setting);
+ long long (*preHookFunc) (const struct config_setting_t *setting);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int64_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_get_int64_pre[hIndex].func;
@@ -8161,7 +8161,7 @@ long long HP_libconfig_setting_get_int64(const config_setting_t *setting) {
retVal___ = HPMHooks.source.libconfig.setting_get_int64(setting);
}
if( HPMHooks.count.HP_libconfig_setting_get_int64_post ) {
- long long (*postHookFunc) (long long retVal___, const config_setting_t *setting);
+ long long (*postHookFunc) (long long retVal___, const struct config_setting_t *setting);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int64_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_get_int64_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting);
@@ -8169,11 +8169,11 @@ long long HP_libconfig_setting_get_int64(const config_setting_t *setting) {
}
return retVal___;
}
-double HP_libconfig_setting_get_float(const config_setting_t *setting) {
+double HP_libconfig_setting_get_float(const struct config_setting_t *setting) {
int hIndex = 0;
double retVal___ = 0.;
if( HPMHooks.count.HP_libconfig_setting_get_float_pre ) {
- double (*preHookFunc) (const config_setting_t *setting);
+ double (*preHookFunc) (const struct config_setting_t *setting);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_float_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_get_float_pre[hIndex].func;
@@ -8188,7 +8188,7 @@ double HP_libconfig_setting_get_float(const config_setting_t *setting) {
retVal___ = HPMHooks.source.libconfig.setting_get_float(setting);
}
if( HPMHooks.count.HP_libconfig_setting_get_float_post ) {
- double (*postHookFunc) (double retVal___, const config_setting_t *setting);
+ double (*postHookFunc) (double retVal___, const struct config_setting_t *setting);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_float_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_get_float_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting);
@@ -8196,11 +8196,11 @@ double HP_libconfig_setting_get_float(const config_setting_t *setting) {
}
return retVal___;
}
-int HP_libconfig_setting_get_bool(const config_setting_t *setting) {
+int HP_libconfig_setting_get_bool(const struct config_setting_t *setting) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_setting_get_bool_pre ) {
- int (*preHookFunc) (const config_setting_t *setting);
+ int (*preHookFunc) (const struct config_setting_t *setting);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_bool_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_get_bool_pre[hIndex].func;
@@ -8215,7 +8215,7 @@ int HP_libconfig_setting_get_bool(const config_setting_t *setting) {
retVal___ = HPMHooks.source.libconfig.setting_get_bool(setting);
}
if( HPMHooks.count.HP_libconfig_setting_get_bool_post ) {
- int (*postHookFunc) (int retVal___, const config_setting_t *setting);
+ int (*postHookFunc) (int retVal___, const struct config_setting_t *setting);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_bool_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_get_bool_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting);
@@ -8223,11 +8223,11 @@ int HP_libconfig_setting_get_bool(const config_setting_t *setting) {
}
return retVal___;
}
-const char* HP_libconfig_setting_get_string(const config_setting_t *setting) {
+const char* HP_libconfig_setting_get_string(const struct config_setting_t *setting) {
int hIndex = 0;
const char* retVal___ = NULL;
if( HPMHooks.count.HP_libconfig_setting_get_string_pre ) {
- const char* (*preHookFunc) (const config_setting_t *setting);
+ const char* (*preHookFunc) (const struct config_setting_t *setting);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_string_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_get_string_pre[hIndex].func;
@@ -8242,7 +8242,7 @@ const char* HP_libconfig_setting_get_string(const config_setting_t *setting) {
retVal___ = HPMHooks.source.libconfig.setting_get_string(setting);
}
if( HPMHooks.count.HP_libconfig_setting_get_string_post ) {
- const char* (*postHookFunc) (const char* retVal___, const config_setting_t *setting);
+ const char* (*postHookFunc) (const char* retVal___, const struct config_setting_t *setting);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_string_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_get_string_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting);
@@ -8250,11 +8250,38 @@ const char* HP_libconfig_setting_get_string(const config_setting_t *setting) {
}
return retVal___;
}
-int HP_libconfig_setting_lookup_int(const config_setting_t *setting, const char *name, int *value) {
+struct config_setting_t* HP_libconfig_setting_lookup(struct config_setting_t *setting, const char *name) {
+ int hIndex = 0;
+ struct config_setting_t* retVal___ = NULL;
+ if( HPMHooks.count.HP_libconfig_setting_lookup_pre ) {
+ struct config_setting_t* (*preHookFunc) (struct config_setting_t *setting, const char *name);
+ *HPMforce_return = false;
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_pre; hIndex++ ) {
+ preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_pre[hIndex].func;
+ retVal___ = preHookFunc(setting, name);
+ }
+ if( *HPMforce_return ) {
+ *HPMforce_return = false;
+ return retVal___;
+ }
+ }
+ {
+ retVal___ = HPMHooks.source.libconfig.setting_lookup(setting, name);
+ }
+ if( HPMHooks.count.HP_libconfig_setting_lookup_post ) {
+ struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, const char *name);
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_post; hIndex++ ) {
+ postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_post[hIndex].func;
+ retVal___ = postHookFunc(retVal___, setting, name);
+ }
+ }
+ return retVal___;
+}
+int HP_libconfig_setting_lookup_int(const struct config_setting_t *setting, const char *name, int *value) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_setting_lookup_int_pre ) {
- int (*preHookFunc) (const config_setting_t *setting, const char *name, int *value);
+ int (*preHookFunc) (const struct config_setting_t *setting, const char *name, int *value);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_int_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_int_pre[hIndex].func;
@@ -8269,7 +8296,7 @@ int HP_libconfig_setting_lookup_int(const config_setting_t *setting, const char
retVal___ = HPMHooks.source.libconfig.setting_lookup_int(setting, name, value);
}
if( HPMHooks.count.HP_libconfig_setting_lookup_int_post ) {
- int (*postHookFunc) (int retVal___, const config_setting_t *setting, const char *name, int *value);
+ int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, int *value);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_int_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_int_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting, name, value);
@@ -8277,11 +8304,11 @@ int HP_libconfig_setting_lookup_int(const config_setting_t *setting, const char
}
return retVal___;
}
-int HP_libconfig_setting_lookup_int64(const config_setting_t *setting, const char *name, long long *value) {
+int HP_libconfig_setting_lookup_int64(const struct config_setting_t *setting, const char *name, long long *value) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_setting_lookup_int64_pre ) {
- int (*preHookFunc) (const config_setting_t *setting, const char *name, long long *value);
+ int (*preHookFunc) (const struct config_setting_t *setting, const char *name, long long *value);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_int64_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_int64_pre[hIndex].func;
@@ -8296,7 +8323,7 @@ int HP_libconfig_setting_lookup_int64(const config_setting_t *setting, const cha
retVal___ = HPMHooks.source.libconfig.setting_lookup_int64(setting, name, value);
}
if( HPMHooks.count.HP_libconfig_setting_lookup_int64_post ) {
- int (*postHookFunc) (int retVal___, const config_setting_t *setting, const char *name, long long *value);
+ int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, long long *value);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_int64_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_int64_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting, name, value);
@@ -8304,11 +8331,11 @@ int HP_libconfig_setting_lookup_int64(const config_setting_t *setting, const cha
}
return retVal___;
}
-int HP_libconfig_setting_lookup_float(const config_setting_t *setting, const char *name, double *value) {
+int HP_libconfig_setting_lookup_float(const struct config_setting_t *setting, const char *name, double *value) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_setting_lookup_float_pre ) {
- int (*preHookFunc) (const config_setting_t *setting, const char *name, double *value);
+ int (*preHookFunc) (const struct config_setting_t *setting, const char *name, double *value);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_float_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_float_pre[hIndex].func;
@@ -8323,7 +8350,7 @@ int HP_libconfig_setting_lookup_float(const config_setting_t *setting, const cha
retVal___ = HPMHooks.source.libconfig.setting_lookup_float(setting, name, value);
}
if( HPMHooks.count.HP_libconfig_setting_lookup_float_post ) {
- int (*postHookFunc) (int retVal___, const config_setting_t *setting, const char *name, double *value);
+ int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, double *value);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_float_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_float_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting, name, value);
@@ -8331,11 +8358,11 @@ int HP_libconfig_setting_lookup_float(const config_setting_t *setting, const cha
}
return retVal___;
}
-int HP_libconfig_setting_lookup_bool(const config_setting_t *setting, const char *name, int *value) {
+int HP_libconfig_setting_lookup_bool(const struct config_setting_t *setting, const char *name, int *value) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_setting_lookup_bool_pre ) {
- int (*preHookFunc) (const config_setting_t *setting, const char *name, int *value);
+ int (*preHookFunc) (const struct config_setting_t *setting, const char *name, int *value);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_bool_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_bool_pre[hIndex].func;
@@ -8350,7 +8377,7 @@ int HP_libconfig_setting_lookup_bool(const config_setting_t *setting, const char
retVal___ = HPMHooks.source.libconfig.setting_lookup_bool(setting, name, value);
}
if( HPMHooks.count.HP_libconfig_setting_lookup_bool_post ) {
- int (*postHookFunc) (int retVal___, const config_setting_t *setting, const char *name, int *value);
+ int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, int *value);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_bool_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_bool_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting, name, value);
@@ -8358,11 +8385,11 @@ int HP_libconfig_setting_lookup_bool(const config_setting_t *setting, const char
}
return retVal___;
}
-int HP_libconfig_setting_lookup_string(const config_setting_t *setting, const char *name, const char **value) {
+int HP_libconfig_setting_lookup_string(const struct config_setting_t *setting, const char *name, const char **value) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_setting_lookup_string_pre ) {
- int (*preHookFunc) (const config_setting_t *setting, const char *name, const char **value);
+ int (*preHookFunc) (const struct config_setting_t *setting, const char *name, const char **value);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_string_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_string_pre[hIndex].func;
@@ -8377,7 +8404,7 @@ int HP_libconfig_setting_lookup_string(const config_setting_t *setting, const ch
retVal___ = HPMHooks.source.libconfig.setting_lookup_string(setting, name, value);
}
if( HPMHooks.count.HP_libconfig_setting_lookup_string_post ) {
- int (*postHookFunc) (int retVal___, const config_setting_t *setting, const char *name, const char **value);
+ int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, const char **value);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_string_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_string_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting, name, value);
@@ -8385,11 +8412,11 @@ int HP_libconfig_setting_lookup_string(const config_setting_t *setting, const ch
}
return retVal___;
}
-int HP_libconfig_setting_set_int(config_setting_t *setting, int value) {
+int HP_libconfig_setting_set_int(struct config_setting_t *setting, int value) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_setting_set_int_pre ) {
- int (*preHookFunc) (config_setting_t *setting, int *value);
+ int (*preHookFunc) (struct config_setting_t *setting, int *value);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_set_int_pre[hIndex].func;
@@ -8404,7 +8431,7 @@ int HP_libconfig_setting_set_int(config_setting_t *setting, int value) {
retVal___ = HPMHooks.source.libconfig.setting_set_int(setting, value);
}
if( HPMHooks.count.HP_libconfig_setting_set_int_post ) {
- int (*postHookFunc) (int retVal___, config_setting_t *setting, int *value);
+ int (*postHookFunc) (int retVal___, struct config_setting_t *setting, int *value);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_set_int_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting, &value);
@@ -8412,11 +8439,11 @@ int HP_libconfig_setting_set_int(config_setting_t *setting, int value) {
}
return retVal___;
}
-int HP_libconfig_setting_set_int64(config_setting_t *setting, long long value) {
+int HP_libconfig_setting_set_int64(struct config_setting_t *setting, long long value) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_setting_set_int64_pre ) {
- int (*preHookFunc) (config_setting_t *setting, long long *value);
+ int (*preHookFunc) (struct config_setting_t *setting, long long *value);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int64_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_set_int64_pre[hIndex].func;
@@ -8431,7 +8458,7 @@ int HP_libconfig_setting_set_int64(config_setting_t *setting, long long value) {
retVal___ = HPMHooks.source.libconfig.setting_set_int64(setting, value);
}
if( HPMHooks.count.HP_libconfig_setting_set_int64_post ) {
- int (*postHookFunc) (int retVal___, config_setting_t *setting, long long *value);
+ int (*postHookFunc) (int retVal___, struct config_setting_t *setting, long long *value);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int64_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_set_int64_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting, &value);
@@ -8439,11 +8466,11 @@ int HP_libconfig_setting_set_int64(config_setting_t *setting, long long value) {
}
return retVal___;
}
-int HP_libconfig_setting_set_float(config_setting_t *setting, double value) {
+int HP_libconfig_setting_set_float(struct config_setting_t *setting, double value) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_setting_set_float_pre ) {
- int (*preHookFunc) (config_setting_t *setting, double *value);
+ int (*preHookFunc) (struct config_setting_t *setting, double *value);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_float_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_set_float_pre[hIndex].func;
@@ -8458,7 +8485,7 @@ int HP_libconfig_setting_set_float(config_setting_t *setting, double value) {
retVal___ = HPMHooks.source.libconfig.setting_set_float(setting, value);
}
if( HPMHooks.count.HP_libconfig_setting_set_float_post ) {
- int (*postHookFunc) (int retVal___, config_setting_t *setting, double *value);
+ int (*postHookFunc) (int retVal___, struct config_setting_t *setting, double *value);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_float_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_set_float_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting, &value);
@@ -8466,11 +8493,11 @@ int HP_libconfig_setting_set_float(config_setting_t *setting, double value) {
}
return retVal___;
}
-int HP_libconfig_setting_set_bool(config_setting_t *setting, int value) {
+int HP_libconfig_setting_set_bool(struct config_setting_t *setting, int value) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_setting_set_bool_pre ) {
- int (*preHookFunc) (config_setting_t *setting, int *value);
+ int (*preHookFunc) (struct config_setting_t *setting, int *value);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_bool_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_set_bool_pre[hIndex].func;
@@ -8485,7 +8512,7 @@ int HP_libconfig_setting_set_bool(config_setting_t *setting, int value) {
retVal___ = HPMHooks.source.libconfig.setting_set_bool(setting, value);
}
if( HPMHooks.count.HP_libconfig_setting_set_bool_post ) {
- int (*postHookFunc) (int retVal___, config_setting_t *setting, int *value);
+ int (*postHookFunc) (int retVal___, struct config_setting_t *setting, int *value);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_bool_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_set_bool_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting, &value);
@@ -8493,11 +8520,11 @@ int HP_libconfig_setting_set_bool(config_setting_t *setting, int value) {
}
return retVal___;
}
-int HP_libconfig_setting_set_string(config_setting_t *setting, const char *value) {
+int HP_libconfig_setting_set_string(struct config_setting_t *setting, const char *value) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_setting_set_string_pre ) {
- int (*preHookFunc) (config_setting_t *setting, const char *value);
+ int (*preHookFunc) (struct config_setting_t *setting, const char *value);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_string_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_set_string_pre[hIndex].func;
@@ -8512,7 +8539,7 @@ int HP_libconfig_setting_set_string(config_setting_t *setting, const char *value
retVal___ = HPMHooks.source.libconfig.setting_set_string(setting, value);
}
if( HPMHooks.count.HP_libconfig_setting_set_string_post ) {
- int (*postHookFunc) (int retVal___, config_setting_t *setting, const char *value);
+ int (*postHookFunc) (int retVal___, struct config_setting_t *setting, const char *value);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_string_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_set_string_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting, value);
@@ -8520,11 +8547,11 @@ int HP_libconfig_setting_set_string(config_setting_t *setting, const char *value
}
return retVal___;
}
-int HP_libconfig_setting_set_format(config_setting_t *setting, short format) {
+int HP_libconfig_setting_set_format(struct config_setting_t *setting, short format) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_setting_set_format_pre ) {
- int (*preHookFunc) (config_setting_t *setting, short *format);
+ int (*preHookFunc) (struct config_setting_t *setting, short *format);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_format_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_set_format_pre[hIndex].func;
@@ -8539,7 +8566,7 @@ int HP_libconfig_setting_set_format(config_setting_t *setting, short format) {
retVal___ = HPMHooks.source.libconfig.setting_set_format(setting, format);
}
if( HPMHooks.count.HP_libconfig_setting_set_format_post ) {
- int (*postHookFunc) (int retVal___, config_setting_t *setting, short *format);
+ int (*postHookFunc) (int retVal___, struct config_setting_t *setting, short *format);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_format_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_set_format_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting, &format);
@@ -8547,11 +8574,11 @@ int HP_libconfig_setting_set_format(config_setting_t *setting, short format) {
}
return retVal___;
}
-short HP_libconfig_setting_get_format(const config_setting_t *setting) {
+short HP_libconfig_setting_get_format(const struct config_setting_t *setting) {
int hIndex = 0;
short retVal___ = 0;
if( HPMHooks.count.HP_libconfig_setting_get_format_pre ) {
- short (*preHookFunc) (const config_setting_t *setting);
+ short (*preHookFunc) (const struct config_setting_t *setting);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_format_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_get_format_pre[hIndex].func;
@@ -8566,7 +8593,7 @@ short HP_libconfig_setting_get_format(const config_setting_t *setting) {
retVal___ = HPMHooks.source.libconfig.setting_get_format(setting);
}
if( HPMHooks.count.HP_libconfig_setting_get_format_post ) {
- short (*postHookFunc) (short retVal___, const config_setting_t *setting);
+ short (*postHookFunc) (short retVal___, const struct config_setting_t *setting);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_format_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_get_format_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting);
@@ -8574,11 +8601,11 @@ short HP_libconfig_setting_get_format(const config_setting_t *setting) {
}
return retVal___;
}
-int HP_libconfig_setting_get_int_elem(const config_setting_t *setting, int idx) {
+int HP_libconfig_setting_get_int_elem(const struct config_setting_t *setting, int idx) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_setting_get_int_elem_pre ) {
- int (*preHookFunc) (const config_setting_t *setting, int *idx);
+ int (*preHookFunc) (const struct config_setting_t *setting, int *idx);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int_elem_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_get_int_elem_pre[hIndex].func;
@@ -8593,7 +8620,7 @@ int HP_libconfig_setting_get_int_elem(const config_setting_t *setting, int idx)
retVal___ = HPMHooks.source.libconfig.setting_get_int_elem(setting, idx);
}
if( HPMHooks.count.HP_libconfig_setting_get_int_elem_post ) {
- int (*postHookFunc) (int retVal___, const config_setting_t *setting, int *idx);
+ int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, int *idx);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int_elem_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_get_int_elem_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting, &idx);
@@ -8601,11 +8628,11 @@ int HP_libconfig_setting_get_int_elem(const config_setting_t *setting, int idx)
}
return retVal___;
}
-long long HP_libconfig_setting_get_int64_elem(const config_setting_t *setting, int idx) {
+long long HP_libconfig_setting_get_int64_elem(const struct config_setting_t *setting, int idx) {
int hIndex = 0;
long long retVal___ = 0;
if( HPMHooks.count.HP_libconfig_setting_get_int64_elem_pre ) {
- long long (*preHookFunc) (const config_setting_t *setting, int *idx);
+ long long (*preHookFunc) (const struct config_setting_t *setting, int *idx);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int64_elem_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_get_int64_elem_pre[hIndex].func;
@@ -8620,7 +8647,7 @@ long long HP_libconfig_setting_get_int64_elem(const config_setting_t *setting, i
retVal___ = HPMHooks.source.libconfig.setting_get_int64_elem(setting, idx);
}
if( HPMHooks.count.HP_libconfig_setting_get_int64_elem_post ) {
- long long (*postHookFunc) (long long retVal___, const config_setting_t *setting, int *idx);
+ long long (*postHookFunc) (long long retVal___, const struct config_setting_t *setting, int *idx);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int64_elem_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_get_int64_elem_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting, &idx);
@@ -8628,11 +8655,11 @@ long long HP_libconfig_setting_get_int64_elem(const config_setting_t *setting, i
}
return retVal___;
}
-double HP_libconfig_setting_get_float_elem(const config_setting_t *setting, int idx) {
+double HP_libconfig_setting_get_float_elem(const struct config_setting_t *setting, int idx) {
int hIndex = 0;
double retVal___ = 0.;
if( HPMHooks.count.HP_libconfig_setting_get_float_elem_pre ) {
- double (*preHookFunc) (const config_setting_t *setting, int *idx);
+ double (*preHookFunc) (const struct config_setting_t *setting, int *idx);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_float_elem_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_get_float_elem_pre[hIndex].func;
@@ -8647,7 +8674,7 @@ double HP_libconfig_setting_get_float_elem(const config_setting_t *setting, int
retVal___ = HPMHooks.source.libconfig.setting_get_float_elem(setting, idx);
}
if( HPMHooks.count.HP_libconfig_setting_get_float_elem_post ) {
- double (*postHookFunc) (double retVal___, const config_setting_t *setting, int *idx);
+ double (*postHookFunc) (double retVal___, const struct config_setting_t *setting, int *idx);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_float_elem_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_get_float_elem_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting, &idx);
@@ -8655,11 +8682,11 @@ double HP_libconfig_setting_get_float_elem(const config_setting_t *setting, int
}
return retVal___;
}
-int HP_libconfig_setting_get_bool_elem(const config_setting_t *setting, int idx) {
+int HP_libconfig_setting_get_bool_elem(const struct config_setting_t *setting, int idx) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_setting_get_bool_elem_pre ) {
- int (*preHookFunc) (const config_setting_t *setting, int *idx);
+ int (*preHookFunc) (const struct config_setting_t *setting, int *idx);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_bool_elem_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_get_bool_elem_pre[hIndex].func;
@@ -8674,7 +8701,7 @@ int HP_libconfig_setting_get_bool_elem(const config_setting_t *setting, int idx)
retVal___ = HPMHooks.source.libconfig.setting_get_bool_elem(setting, idx);
}
if( HPMHooks.count.HP_libconfig_setting_get_bool_elem_post ) {
- int (*postHookFunc) (int retVal___, const config_setting_t *setting, int *idx);
+ int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, int *idx);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_bool_elem_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_get_bool_elem_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting, &idx);
@@ -8682,11 +8709,11 @@ int HP_libconfig_setting_get_bool_elem(const config_setting_t *setting, int idx)
}
return retVal___;
}
-const char* HP_libconfig_setting_get_string_elem(const config_setting_t *setting, int idx) {
+const char* HP_libconfig_setting_get_string_elem(const struct config_setting_t *setting, int idx) {
int hIndex = 0;
const char* retVal___ = NULL;
if( HPMHooks.count.HP_libconfig_setting_get_string_elem_pre ) {
- const char* (*preHookFunc) (const config_setting_t *setting, int *idx);
+ const char* (*preHookFunc) (const struct config_setting_t *setting, int *idx);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_string_elem_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_get_string_elem_pre[hIndex].func;
@@ -8701,7 +8728,7 @@ const char* HP_libconfig_setting_get_string_elem(const config_setting_t *setting
retVal___ = HPMHooks.source.libconfig.setting_get_string_elem(setting, idx);
}
if( HPMHooks.count.HP_libconfig_setting_get_string_elem_post ) {
- const char* (*postHookFunc) (const char* retVal___, const config_setting_t *setting, int *idx);
+ const char* (*postHookFunc) (const char* retVal___, const struct config_setting_t *setting, int *idx);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_string_elem_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_get_string_elem_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting, &idx);
@@ -8709,11 +8736,11 @@ const char* HP_libconfig_setting_get_string_elem(const config_setting_t *setting
}
return retVal___;
}
-config_setting_t* HP_libconfig_setting_set_int_elem(config_setting_t *setting, int idx, int value) {
+struct config_setting_t* HP_libconfig_setting_set_int_elem(struct config_setting_t *setting, int idx, int value) {
int hIndex = 0;
- config_setting_t* retVal___ = NULL;
+ struct config_setting_t* retVal___ = NULL;
if( HPMHooks.count.HP_libconfig_setting_set_int_elem_pre ) {
- config_setting_t* (*preHookFunc) (config_setting_t *setting, int *idx, int *value);
+ struct config_setting_t* (*preHookFunc) (struct config_setting_t *setting, int *idx, int *value);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int_elem_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_set_int_elem_pre[hIndex].func;
@@ -8728,7 +8755,7 @@ config_setting_t* HP_libconfig_setting_set_int_elem(config_setting_t *setting, i
retVal___ = HPMHooks.source.libconfig.setting_set_int_elem(setting, idx, value);
}
if( HPMHooks.count.HP_libconfig_setting_set_int_elem_post ) {
- config_setting_t* (*postHookFunc) (config_setting_t* retVal___, config_setting_t *setting, int *idx, int *value);
+ struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int *idx, int *value);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int_elem_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_set_int_elem_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting, &idx, &value);
@@ -8736,11 +8763,11 @@ config_setting_t* HP_libconfig_setting_set_int_elem(config_setting_t *setting, i
}
return retVal___;
}
-config_setting_t* HP_libconfig_setting_set_int64_elem(config_setting_t *setting, int idx, long long value) {
+struct config_setting_t* HP_libconfig_setting_set_int64_elem(struct config_setting_t *setting, int idx, long long value) {
int hIndex = 0;
- config_setting_t* retVal___ = NULL;
+ struct config_setting_t* retVal___ = NULL;
if( HPMHooks.count.HP_libconfig_setting_set_int64_elem_pre ) {
- config_setting_t* (*preHookFunc) (config_setting_t *setting, int *idx, long long *value);
+ struct config_setting_t* (*preHookFunc) (struct config_setting_t *setting, int *idx, long long *value);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int64_elem_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_set_int64_elem_pre[hIndex].func;
@@ -8755,7 +8782,7 @@ config_setting_t* HP_libconfig_setting_set_int64_elem(config_setting_t *setting,
retVal___ = HPMHooks.source.libconfig.setting_set_int64_elem(setting, idx, value);
}
if( HPMHooks.count.HP_libconfig_setting_set_int64_elem_post ) {
- config_setting_t* (*postHookFunc) (config_setting_t* retVal___, config_setting_t *setting, int *idx, long long *value);
+ struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int *idx, long long *value);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int64_elem_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_set_int64_elem_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting, &idx, &value);
@@ -8763,11 +8790,11 @@ config_setting_t* HP_libconfig_setting_set_int64_elem(config_setting_t *setting,
}
return retVal___;
}
-config_setting_t* HP_libconfig_setting_set_float_elem(config_setting_t *setting, int idx, double value) {
+struct config_setting_t* HP_libconfig_setting_set_float_elem(struct config_setting_t *setting, int idx, double value) {
int hIndex = 0;
- config_setting_t* retVal___ = NULL;
+ struct config_setting_t* retVal___ = NULL;
if( HPMHooks.count.HP_libconfig_setting_set_float_elem_pre ) {
- config_setting_t* (*preHookFunc) (config_setting_t *setting, int *idx, double *value);
+ struct config_setting_t* (*preHookFunc) (struct config_setting_t *setting, int *idx, double *value);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_float_elem_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_set_float_elem_pre[hIndex].func;
@@ -8782,7 +8809,7 @@ config_setting_t* HP_libconfig_setting_set_float_elem(config_setting_t *setting,
retVal___ = HPMHooks.source.libconfig.setting_set_float_elem(setting, idx, value);
}
if( HPMHooks.count.HP_libconfig_setting_set_float_elem_post ) {
- config_setting_t* (*postHookFunc) (config_setting_t* retVal___, config_setting_t *setting, int *idx, double *value);
+ struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int *idx, double *value);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_float_elem_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_set_float_elem_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting, &idx, &value);
@@ -8790,11 +8817,11 @@ config_setting_t* HP_libconfig_setting_set_float_elem(config_setting_t *setting,
}
return retVal___;
}
-config_setting_t* HP_libconfig_setting_set_bool_elem(config_setting_t *setting, int idx, int value) {
+struct config_setting_t* HP_libconfig_setting_set_bool_elem(struct config_setting_t *setting, int idx, int value) {
int hIndex = 0;
- config_setting_t* retVal___ = NULL;
+ struct config_setting_t* retVal___ = NULL;
if( HPMHooks.count.HP_libconfig_setting_set_bool_elem_pre ) {
- config_setting_t* (*preHookFunc) (config_setting_t *setting, int *idx, int *value);
+ struct config_setting_t* (*preHookFunc) (struct config_setting_t *setting, int *idx, int *value);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_bool_elem_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_set_bool_elem_pre[hIndex].func;
@@ -8809,7 +8836,7 @@ config_setting_t* HP_libconfig_setting_set_bool_elem(config_setting_t *setting,
retVal___ = HPMHooks.source.libconfig.setting_set_bool_elem(setting, idx, value);
}
if( HPMHooks.count.HP_libconfig_setting_set_bool_elem_post ) {
- config_setting_t* (*postHookFunc) (config_setting_t* retVal___, config_setting_t *setting, int *idx, int *value);
+ struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int *idx, int *value);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_bool_elem_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_set_bool_elem_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting, &idx, &value);
@@ -8817,11 +8844,11 @@ config_setting_t* HP_libconfig_setting_set_bool_elem(config_setting_t *setting,
}
return retVal___;
}
-config_setting_t* HP_libconfig_setting_set_string_elem(config_setting_t *setting, int idx, const char *value) {
+struct config_setting_t* HP_libconfig_setting_set_string_elem(struct config_setting_t *setting, int idx, const char *value) {
int hIndex = 0;
- config_setting_t* retVal___ = NULL;
+ struct config_setting_t* retVal___ = NULL;
if( HPMHooks.count.HP_libconfig_setting_set_string_elem_pre ) {
- config_setting_t* (*preHookFunc) (config_setting_t *setting, int *idx, const char *value);
+ struct config_setting_t* (*preHookFunc) (struct config_setting_t *setting, int *idx, const char *value);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_string_elem_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_set_string_elem_pre[hIndex].func;
@@ -8836,7 +8863,7 @@ config_setting_t* HP_libconfig_setting_set_string_elem(config_setting_t *setting
retVal___ = HPMHooks.source.libconfig.setting_set_string_elem(setting, idx, value);
}
if( HPMHooks.count.HP_libconfig_setting_set_string_elem_post ) {
- config_setting_t* (*postHookFunc) (config_setting_t* retVal___, config_setting_t *setting, int *idx, const char *value);
+ struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int *idx, const char *value);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_string_elem_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_set_string_elem_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting, &idx, value);
@@ -8844,11 +8871,11 @@ config_setting_t* HP_libconfig_setting_set_string_elem(config_setting_t *setting
}
return retVal___;
}
-int HP_libconfig_setting_index(const config_setting_t *setting) {
+int HP_libconfig_setting_index(const struct config_setting_t *setting) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_setting_index_pre ) {
- int (*preHookFunc) (const config_setting_t *setting);
+ int (*preHookFunc) (const struct config_setting_t *setting);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_index_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_index_pre[hIndex].func;
@@ -8863,7 +8890,7 @@ int HP_libconfig_setting_index(const config_setting_t *setting) {
retVal___ = HPMHooks.source.libconfig.setting_index(setting);
}
if( HPMHooks.count.HP_libconfig_setting_index_post ) {
- int (*postHookFunc) (int retVal___, const config_setting_t *setting);
+ int (*postHookFunc) (int retVal___, const struct config_setting_t *setting);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_index_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_index_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting);
@@ -8871,11 +8898,11 @@ int HP_libconfig_setting_index(const config_setting_t *setting) {
}
return retVal___;
}
-int HP_libconfig_setting_length(const config_setting_t *setting) {
+int HP_libconfig_setting_length(const struct config_setting_t *setting) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_setting_length_pre ) {
- int (*preHookFunc) (const config_setting_t *setting);
+ int (*preHookFunc) (const struct config_setting_t *setting);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_length_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_length_pre[hIndex].func;
@@ -8890,7 +8917,7 @@ int HP_libconfig_setting_length(const config_setting_t *setting) {
retVal___ = HPMHooks.source.libconfig.setting_length(setting);
}
if( HPMHooks.count.HP_libconfig_setting_length_post ) {
- int (*postHookFunc) (int retVal___, const config_setting_t *setting);
+ int (*postHookFunc) (int retVal___, const struct config_setting_t *setting);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_length_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_length_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting);
@@ -8898,11 +8925,11 @@ int HP_libconfig_setting_length(const config_setting_t *setting) {
}
return retVal___;
}
-config_setting_t* HP_libconfig_setting_get_elem(const config_setting_t *setting, unsigned int idx) {
+struct config_setting_t* HP_libconfig_setting_get_elem(const struct config_setting_t *setting, unsigned int idx) {
int hIndex = 0;
- config_setting_t* retVal___ = NULL;
+ struct config_setting_t* retVal___ = NULL;
if( HPMHooks.count.HP_libconfig_setting_get_elem_pre ) {
- config_setting_t* (*preHookFunc) (const config_setting_t *setting, unsigned int *idx);
+ struct config_setting_t* (*preHookFunc) (const struct config_setting_t *setting, unsigned int *idx);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_elem_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_get_elem_pre[hIndex].func;
@@ -8917,7 +8944,7 @@ config_setting_t* HP_libconfig_setting_get_elem(const config_setting_t *setting,
retVal___ = HPMHooks.source.libconfig.setting_get_elem(setting, idx);
}
if( HPMHooks.count.HP_libconfig_setting_get_elem_post ) {
- config_setting_t* (*postHookFunc) (config_setting_t* retVal___, const config_setting_t *setting, unsigned int *idx);
+ struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, const struct config_setting_t *setting, unsigned int *idx);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_elem_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_get_elem_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting, &idx);
@@ -8925,11 +8952,11 @@ config_setting_t* HP_libconfig_setting_get_elem(const config_setting_t *setting,
}
return retVal___;
}
-config_setting_t* HP_libconfig_setting_get_member(const config_setting_t *setting, const char *name) {
+struct config_setting_t* HP_libconfig_setting_get_member(const struct config_setting_t *setting, const char *name) {
int hIndex = 0;
- config_setting_t* retVal___ = NULL;
+ struct config_setting_t* retVal___ = NULL;
if( HPMHooks.count.HP_libconfig_setting_get_member_pre ) {
- config_setting_t* (*preHookFunc) (const config_setting_t *setting, const char *name);
+ struct config_setting_t* (*preHookFunc) (const struct config_setting_t *setting, const char *name);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_member_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_get_member_pre[hIndex].func;
@@ -8944,7 +8971,7 @@ config_setting_t* HP_libconfig_setting_get_member(const config_setting_t *settin
retVal___ = HPMHooks.source.libconfig.setting_get_member(setting, name);
}
if( HPMHooks.count.HP_libconfig_setting_get_member_post ) {
- config_setting_t* (*postHookFunc) (config_setting_t* retVal___, const config_setting_t *setting, const char *name);
+ struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, const struct config_setting_t *setting, const char *name);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_member_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_get_member_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting, name);
@@ -8952,11 +8979,11 @@ config_setting_t* HP_libconfig_setting_get_member(const config_setting_t *settin
}
return retVal___;
}
-config_setting_t* HP_libconfig_setting_add(config_setting_t *parent, const char *name, int type) {
+struct config_setting_t* HP_libconfig_setting_add(struct config_setting_t *parent, const char *name, int type) {
int hIndex = 0;
- config_setting_t* retVal___ = NULL;
+ struct config_setting_t* retVal___ = NULL;
if( HPMHooks.count.HP_libconfig_setting_add_pre ) {
- config_setting_t* (*preHookFunc) (config_setting_t *parent, const char *name, int *type);
+ struct config_setting_t* (*preHookFunc) (struct config_setting_t *parent, const char *name, int *type);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_add_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_add_pre[hIndex].func;
@@ -8971,7 +8998,7 @@ config_setting_t* HP_libconfig_setting_add(config_setting_t *parent, const char
retVal___ = HPMHooks.source.libconfig.setting_add(parent, name, type);
}
if( HPMHooks.count.HP_libconfig_setting_add_post ) {
- config_setting_t* (*postHookFunc) (config_setting_t* retVal___, config_setting_t *parent, const char *name, int *type);
+ struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *parent, const char *name, int *type);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_add_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_add_post[hIndex].func;
retVal___ = postHookFunc(retVal___, parent, name, &type);
@@ -8979,11 +9006,11 @@ config_setting_t* HP_libconfig_setting_add(config_setting_t *parent, const char
}
return retVal___;
}
-int HP_libconfig_setting_remove(config_setting_t *parent, const char *name) {
+int HP_libconfig_setting_remove(struct config_setting_t *parent, const char *name) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_setting_remove_pre ) {
- int (*preHookFunc) (config_setting_t *parent, const char *name);
+ int (*preHookFunc) (struct config_setting_t *parent, const char *name);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_remove_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_remove_pre[hIndex].func;
@@ -8998,7 +9025,7 @@ int HP_libconfig_setting_remove(config_setting_t *parent, const char *name) {
retVal___ = HPMHooks.source.libconfig.setting_remove(parent, name);
}
if( HPMHooks.count.HP_libconfig_setting_remove_post ) {
- int (*postHookFunc) (int retVal___, config_setting_t *parent, const char *name);
+ int (*postHookFunc) (int retVal___, struct config_setting_t *parent, const char *name);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_remove_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_remove_post[hIndex].func;
retVal___ = postHookFunc(retVal___, parent, name);
@@ -9006,11 +9033,11 @@ int HP_libconfig_setting_remove(config_setting_t *parent, const char *name) {
}
return retVal___;
}
-int HP_libconfig_setting_remove_elem(config_setting_t *parent, unsigned int idx) {
+int HP_libconfig_setting_remove_elem(struct config_setting_t *parent, unsigned int idx) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_setting_remove_elem_pre ) {
- int (*preHookFunc) (config_setting_t *parent, unsigned int *idx);
+ int (*preHookFunc) (struct config_setting_t *parent, unsigned int *idx);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_remove_elem_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_remove_elem_pre[hIndex].func;
@@ -9025,7 +9052,7 @@ int HP_libconfig_setting_remove_elem(config_setting_t *parent, unsigned int idx)
retVal___ = HPMHooks.source.libconfig.setting_remove_elem(parent, idx);
}
if( HPMHooks.count.HP_libconfig_setting_remove_elem_post ) {
- int (*postHookFunc) (int retVal___, config_setting_t *parent, unsigned int *idx);
+ int (*postHookFunc) (int retVal___, struct config_setting_t *parent, unsigned int *idx);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_remove_elem_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_remove_elem_post[hIndex].func;
retVal___ = postHookFunc(retVal___, parent, &idx);
@@ -9033,10 +9060,10 @@ int HP_libconfig_setting_remove_elem(config_setting_t *parent, unsigned int idx)
}
return retVal___;
}
-void HP_libconfig_setting_set_hook(config_setting_t *setting, void *hook) {
+void HP_libconfig_setting_set_hook(struct config_setting_t *setting, void *hook) {
int hIndex = 0;
if( HPMHooks.count.HP_libconfig_setting_set_hook_pre ) {
- void (*preHookFunc) (config_setting_t *setting, void *hook);
+ void (*preHookFunc) (struct config_setting_t *setting, void *hook);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_hook_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_set_hook_pre[hIndex].func;
@@ -9051,7 +9078,7 @@ void HP_libconfig_setting_set_hook(config_setting_t *setting, void *hook) {
HPMHooks.source.libconfig.setting_set_hook(setting, hook);
}
if( HPMHooks.count.HP_libconfig_setting_set_hook_post ) {
- void (*postHookFunc) (config_setting_t *setting, void *hook);
+ void (*postHookFunc) (struct config_setting_t *setting, void *hook);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_hook_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_set_hook_post[hIndex].func;
postHookFunc(setting, hook);
@@ -9059,11 +9086,11 @@ void HP_libconfig_setting_set_hook(config_setting_t *setting, void *hook) {
}
return;
}
-config_setting_t* HP_libconfig_lookup(const config_t *config, const char *filepath) {
+struct config_setting_t* HP_libconfig_lookup(const struct config_t *config, const char *filepath) {
int hIndex = 0;
- config_setting_t* retVal___ = NULL;
+ struct config_setting_t* retVal___ = NULL;
if( HPMHooks.count.HP_libconfig_lookup_pre ) {
- config_setting_t* (*preHookFunc) (const config_t *config, const char *filepath);
+ struct config_setting_t* (*preHookFunc) (const struct config_t *config, const char *filepath);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_lookup_pre[hIndex].func;
@@ -9078,7 +9105,7 @@ config_setting_t* HP_libconfig_lookup(const config_t *config, const char *filepa
retVal___ = HPMHooks.source.libconfig.lookup(config, filepath);
}
if( HPMHooks.count.HP_libconfig_lookup_post ) {
- config_setting_t* (*postHookFunc) (config_setting_t* retVal___, const config_t *config, const char *filepath);
+ struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, const struct config_t *config, const char *filepath);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_lookup_post[hIndex].func;
retVal___ = postHookFunc(retVal___, config, filepath);
@@ -9086,38 +9113,11 @@ config_setting_t* HP_libconfig_lookup(const config_t *config, const char *filepa
}
return retVal___;
}
-config_setting_t* HP_libconfig_lookup_from(config_setting_t *setting, const char *filepath) {
- int hIndex = 0;
- config_setting_t* retVal___ = NULL;
- if( HPMHooks.count.HP_libconfig_lookup_from_pre ) {
- config_setting_t* (*preHookFunc) (config_setting_t *setting, const char *filepath);
- *HPMforce_return = false;
- for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_from_pre; hIndex++ ) {
- preHookFunc = HPMHooks.list.HP_libconfig_lookup_from_pre[hIndex].func;
- retVal___ = preHookFunc(setting, filepath);
- }
- if( *HPMforce_return ) {
- *HPMforce_return = false;
- return retVal___;
- }
- }
- {
- retVal___ = HPMHooks.source.libconfig.lookup_from(setting, filepath);
- }
- if( HPMHooks.count.HP_libconfig_lookup_from_post ) {
- config_setting_t* (*postHookFunc) (config_setting_t* retVal___, config_setting_t *setting, const char *filepath);
- for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_from_post; hIndex++ ) {
- postHookFunc = HPMHooks.list.HP_libconfig_lookup_from_post[hIndex].func;
- retVal___ = postHookFunc(retVal___, setting, filepath);
- }
- }
- return retVal___;
-}
-int HP_libconfig_lookup_int(const config_t *config, const char *filepath, int *value) {
+int HP_libconfig_lookup_int(const struct config_t *config, const char *filepath, int *value) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_lookup_int_pre ) {
- int (*preHookFunc) (const config_t *config, const char *filepath, int *value);
+ int (*preHookFunc) (const struct config_t *config, const char *filepath, int *value);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_int_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_lookup_int_pre[hIndex].func;
@@ -9132,7 +9132,7 @@ int HP_libconfig_lookup_int(const config_t *config, const char *filepath, int *v
retVal___ = HPMHooks.source.libconfig.lookup_int(config, filepath, value);
}
if( HPMHooks.count.HP_libconfig_lookup_int_post ) {
- int (*postHookFunc) (int retVal___, const config_t *config, const char *filepath, int *value);
+ int (*postHookFunc) (int retVal___, const struct config_t *config, const char *filepath, int *value);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_int_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_lookup_int_post[hIndex].func;
retVal___ = postHookFunc(retVal___, config, filepath, value);
@@ -9140,11 +9140,11 @@ int HP_libconfig_lookup_int(const config_t *config, const char *filepath, int *v
}
return retVal___;
}
-int HP_libconfig_lookup_int64(const config_t *config, const char *filepath, long long *value) {
+int HP_libconfig_lookup_int64(const struct config_t *config, const char *filepath, long long *value) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_lookup_int64_pre ) {
- int (*preHookFunc) (const config_t *config, const char *filepath, long long *value);
+ int (*preHookFunc) (const struct config_t *config, const char *filepath, long long *value);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_int64_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_lookup_int64_pre[hIndex].func;
@@ -9159,7 +9159,7 @@ int HP_libconfig_lookup_int64(const config_t *config, const char *filepath, long
retVal___ = HPMHooks.source.libconfig.lookup_int64(config, filepath, value);
}
if( HPMHooks.count.HP_libconfig_lookup_int64_post ) {
- int (*postHookFunc) (int retVal___, const config_t *config, const char *filepath, long long *value);
+ int (*postHookFunc) (int retVal___, const struct config_t *config, const char *filepath, long long *value);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_int64_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_lookup_int64_post[hIndex].func;
retVal___ = postHookFunc(retVal___, config, filepath, value);
@@ -9167,11 +9167,11 @@ int HP_libconfig_lookup_int64(const config_t *config, const char *filepath, long
}
return retVal___;
}
-int HP_libconfig_lookup_float(const config_t *config, const char *filepath, double *value) {
+int HP_libconfig_lookup_float(const struct config_t *config, const char *filepath, double *value) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_lookup_float_pre ) {
- int (*preHookFunc) (const config_t *config, const char *filepath, double *value);
+ int (*preHookFunc) (const struct config_t *config, const char *filepath, double *value);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_float_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_lookup_float_pre[hIndex].func;
@@ -9186,7 +9186,7 @@ int HP_libconfig_lookup_float(const config_t *config, const char *filepath, doub
retVal___ = HPMHooks.source.libconfig.lookup_float(config, filepath, value);
}
if( HPMHooks.count.HP_libconfig_lookup_float_post ) {
- int (*postHookFunc) (int retVal___, const config_t *config, const char *filepath, double *value);
+ int (*postHookFunc) (int retVal___, const struct config_t *config, const char *filepath, double *value);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_float_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_lookup_float_post[hIndex].func;
retVal___ = postHookFunc(retVal___, config, filepath, value);
@@ -9194,11 +9194,11 @@ int HP_libconfig_lookup_float(const config_t *config, const char *filepath, doub
}
return retVal___;
}
-int HP_libconfig_lookup_bool(const config_t *config, const char *filepath, int *value) {
+int HP_libconfig_lookup_bool(const struct config_t *config, const char *filepath, int *value) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_lookup_bool_pre ) {
- int (*preHookFunc) (const config_t *config, const char *filepath, int *value);
+ int (*preHookFunc) (const struct config_t *config, const char *filepath, int *value);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_bool_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_lookup_bool_pre[hIndex].func;
@@ -9213,7 +9213,7 @@ int HP_libconfig_lookup_bool(const config_t *config, const char *filepath, int *
retVal___ = HPMHooks.source.libconfig.lookup_bool(config, filepath, value);
}
if( HPMHooks.count.HP_libconfig_lookup_bool_post ) {
- int (*postHookFunc) (int retVal___, const config_t *config, const char *filepath, int *value);
+ int (*postHookFunc) (int retVal___, const struct config_t *config, const char *filepath, int *value);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_bool_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_lookup_bool_post[hIndex].func;
retVal___ = postHookFunc(retVal___, config, filepath, value);
@@ -9221,11 +9221,11 @@ int HP_libconfig_lookup_bool(const config_t *config, const char *filepath, int *
}
return retVal___;
}
-int HP_libconfig_lookup_string(const config_t *config, const char *filepath, const char **value) {
+int HP_libconfig_lookup_string(const struct config_t *config, const char *filepath, const char **value) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_lookup_string_pre ) {
- int (*preHookFunc) (const config_t *config, const char *filepath, const char **value);
+ int (*preHookFunc) (const struct config_t *config, const char *filepath, const char **value);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_string_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_lookup_string_pre[hIndex].func;
@@ -9240,7 +9240,7 @@ int HP_libconfig_lookup_string(const config_t *config, const char *filepath, con
retVal___ = HPMHooks.source.libconfig.lookup_string(config, filepath, value);
}
if( HPMHooks.count.HP_libconfig_lookup_string_post ) {
- int (*postHookFunc) (int retVal___, const config_t *config, const char *filepath, const char **value);
+ int (*postHookFunc) (int retVal___, const struct config_t *config, const char *filepath, const char **value);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_string_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_lookup_string_post[hIndex].func;
retVal___ = postHookFunc(retVal___, config, filepath, value);
@@ -9248,14 +9248,14 @@ int HP_libconfig_lookup_string(const config_t *config, const char *filepath, con
}
return retVal___;
}
-int HP_libconfig_read_file(config_t *config, const char *config_filename) {
+int HP_libconfig_load_file(struct config_t *config, const char *config_filename) {
int hIndex = 0;
int retVal___ = 0;
- if( HPMHooks.count.HP_libconfig_read_file_pre ) {
- int (*preHookFunc) (config_t *config, const char *config_filename);
+ if( HPMHooks.count.HP_libconfig_load_file_pre ) {
+ int (*preHookFunc) (struct config_t *config, const char *config_filename);
*HPMforce_return = false;
- for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_read_file_pre; hIndex++ ) {
- preHookFunc = HPMHooks.list.HP_libconfig_read_file_pre[hIndex].func;
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_load_file_pre; hIndex++ ) {
+ preHookFunc = HPMHooks.list.HP_libconfig_load_file_pre[hIndex].func;
retVal___ = preHookFunc(config, config_filename);
}
if( *HPMforce_return ) {
@@ -9264,21 +9264,21 @@ int HP_libconfig_read_file(config_t *config, const char *config_filename) {
}
}
{
- retVal___ = HPMHooks.source.libconfig.read_file(config, config_filename);
+ retVal___ = HPMHooks.source.libconfig.load_file(config, config_filename);
}
- if( HPMHooks.count.HP_libconfig_read_file_post ) {
- int (*postHookFunc) (int retVal___, config_t *config, const char *config_filename);
- for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_read_file_post; hIndex++ ) {
- postHookFunc = HPMHooks.list.HP_libconfig_read_file_post[hIndex].func;
+ if( HPMHooks.count.HP_libconfig_load_file_post ) {
+ int (*postHookFunc) (int retVal___, struct config_t *config, const char *config_filename);
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_load_file_post; hIndex++ ) {
+ postHookFunc = HPMHooks.list.HP_libconfig_load_file_post[hIndex].func;
retVal___ = postHookFunc(retVal___, config, config_filename);
}
}
return retVal___;
}
-void HP_libconfig_setting_copy_simple(config_setting_t *parent, const config_setting_t *src) {
+void HP_libconfig_setting_copy_simple(struct config_setting_t *parent, const struct config_setting_t *src) {
int hIndex = 0;
if( HPMHooks.count.HP_libconfig_setting_copy_simple_pre ) {
- void (*preHookFunc) (config_setting_t *parent, const config_setting_t *src);
+ void (*preHookFunc) (struct config_setting_t *parent, const struct config_setting_t *src);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_copy_simple_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_copy_simple_pre[hIndex].func;
@@ -9293,7 +9293,7 @@ void HP_libconfig_setting_copy_simple(config_setting_t *parent, const config_set
HPMHooks.source.libconfig.setting_copy_simple(parent, src);
}
if( HPMHooks.count.HP_libconfig_setting_copy_simple_post ) {
- void (*postHookFunc) (config_setting_t *parent, const config_setting_t *src);
+ void (*postHookFunc) (struct config_setting_t *parent, const struct config_setting_t *src);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_copy_simple_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_copy_simple_post[hIndex].func;
postHookFunc(parent, src);
@@ -9301,10 +9301,10 @@ void HP_libconfig_setting_copy_simple(config_setting_t *parent, const config_set
}
return;
}
-void HP_libconfig_setting_copy_elem(config_setting_t *parent, const config_setting_t *src) {
+void HP_libconfig_setting_copy_elem(struct config_setting_t *parent, const struct config_setting_t *src) {
int hIndex = 0;
if( HPMHooks.count.HP_libconfig_setting_copy_elem_pre ) {
- void (*preHookFunc) (config_setting_t *parent, const config_setting_t *src);
+ void (*preHookFunc) (struct config_setting_t *parent, const struct config_setting_t *src);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_copy_elem_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_copy_elem_pre[hIndex].func;
@@ -9319,7 +9319,7 @@ void HP_libconfig_setting_copy_elem(config_setting_t *parent, const config_setti
HPMHooks.source.libconfig.setting_copy_elem(parent, src);
}
if( HPMHooks.count.HP_libconfig_setting_copy_elem_post ) {
- void (*postHookFunc) (config_setting_t *parent, const config_setting_t *src);
+ void (*postHookFunc) (struct config_setting_t *parent, const struct config_setting_t *src);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_copy_elem_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_copy_elem_post[hIndex].func;
postHookFunc(parent, src);
@@ -9327,10 +9327,10 @@ void HP_libconfig_setting_copy_elem(config_setting_t *parent, const config_setti
}
return;
}
-void HP_libconfig_setting_copy_aggregate(config_setting_t *parent, const config_setting_t *src) {
+void HP_libconfig_setting_copy_aggregate(struct config_setting_t *parent, const struct config_setting_t *src) {
int hIndex = 0;
if( HPMHooks.count.HP_libconfig_setting_copy_aggregate_pre ) {
- void (*preHookFunc) (config_setting_t *parent, const config_setting_t *src);
+ void (*preHookFunc) (struct config_setting_t *parent, const struct config_setting_t *src);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_copy_aggregate_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_copy_aggregate_pre[hIndex].func;
@@ -9345,7 +9345,7 @@ void HP_libconfig_setting_copy_aggregate(config_setting_t *parent, const config_
HPMHooks.source.libconfig.setting_copy_aggregate(parent, src);
}
if( HPMHooks.count.HP_libconfig_setting_copy_aggregate_post ) {
- void (*postHookFunc) (config_setting_t *parent, const config_setting_t *src);
+ void (*postHookFunc) (struct config_setting_t *parent, const struct config_setting_t *src);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_copy_aggregate_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_copy_aggregate_post[hIndex].func;
postHookFunc(parent, src);
@@ -9353,11 +9353,11 @@ void HP_libconfig_setting_copy_aggregate(config_setting_t *parent, const config_
}
return;
}
-int HP_libconfig_setting_copy(config_setting_t *parent, const config_setting_t *src) {
+int HP_libconfig_setting_copy(struct config_setting_t *parent, const struct config_setting_t *src) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_setting_copy_pre ) {
- int (*preHookFunc) (config_setting_t *parent, const config_setting_t *src);
+ int (*preHookFunc) (struct config_setting_t *parent, const struct config_setting_t *src);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_copy_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_copy_pre[hIndex].func;
@@ -9372,7 +9372,7 @@ int HP_libconfig_setting_copy(config_setting_t *parent, const config_setting_t *
retVal___ = HPMHooks.source.libconfig.setting_copy(parent, src);
}
if( HPMHooks.count.HP_libconfig_setting_copy_post ) {
- int (*postHookFunc) (int retVal___, config_setting_t *parent, const config_setting_t *src);
+ int (*postHookFunc) (int retVal___, struct config_setting_t *parent, const struct config_setting_t *src);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_copy_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_copy_post[hIndex].func;
retVal___ = postHookFunc(retVal___, parent, src);
@@ -9380,6 +9380,276 @@ int HP_libconfig_setting_copy(config_setting_t *parent, const config_setting_t *
}
return retVal___;
}
+bool HP_libconfig_setting_get_bool_real(const struct config_setting_t *setting) {
+ int hIndex = 0;
+ bool retVal___ = false;
+ if( HPMHooks.count.HP_libconfig_setting_get_bool_real_pre ) {
+ bool (*preHookFunc) (const struct config_setting_t *setting);
+ *HPMforce_return = false;
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_bool_real_pre; hIndex++ ) {
+ preHookFunc = HPMHooks.list.HP_libconfig_setting_get_bool_real_pre[hIndex].func;
+ retVal___ = preHookFunc(setting);
+ }
+ if( *HPMforce_return ) {
+ *HPMforce_return = false;
+ return retVal___;
+ }
+ }
+ {
+ retVal___ = HPMHooks.source.libconfig.setting_get_bool_real(setting);
+ }
+ if( HPMHooks.count.HP_libconfig_setting_get_bool_real_post ) {
+ bool (*postHookFunc) (bool retVal___, const struct config_setting_t *setting);
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_bool_real_post; hIndex++ ) {
+ postHookFunc = HPMHooks.list.HP_libconfig_setting_get_bool_real_post[hIndex].func;
+ retVal___ = postHookFunc(retVal___, setting);
+ }
+ }
+ return retVal___;
+}
+uint32 HP_libconfig_setting_get_uint32(const struct config_setting_t *setting) {
+ int hIndex = 0;
+ uint32 retVal___ = 0;
+ if( HPMHooks.count.HP_libconfig_setting_get_uint32_pre ) {
+ uint32 (*preHookFunc) (const struct config_setting_t *setting);
+ *HPMforce_return = false;
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_uint32_pre; hIndex++ ) {
+ preHookFunc = HPMHooks.list.HP_libconfig_setting_get_uint32_pre[hIndex].func;
+ retVal___ = preHookFunc(setting);
+ }
+ if( *HPMforce_return ) {
+ *HPMforce_return = false;
+ return retVal___;
+ }
+ }
+ {
+ retVal___ = HPMHooks.source.libconfig.setting_get_uint32(setting);
+ }
+ if( HPMHooks.count.HP_libconfig_setting_get_uint32_post ) {
+ uint32 (*postHookFunc) (uint32 retVal___, const struct config_setting_t *setting);
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_uint32_post; hIndex++ ) {
+ postHookFunc = HPMHooks.list.HP_libconfig_setting_get_uint32_post[hIndex].func;
+ retVal___ = postHookFunc(retVal___, setting);
+ }
+ }
+ return retVal___;
+}
+uint16 HP_libconfig_setting_get_uint16(const struct config_setting_t *setting) {
+ int hIndex = 0;
+ uint16 retVal___ = 0;
+ if( HPMHooks.count.HP_libconfig_setting_get_uint16_pre ) {
+ uint16 (*preHookFunc) (const struct config_setting_t *setting);
+ *HPMforce_return = false;
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_uint16_pre; hIndex++ ) {
+ preHookFunc = HPMHooks.list.HP_libconfig_setting_get_uint16_pre[hIndex].func;
+ retVal___ = preHookFunc(setting);
+ }
+ if( *HPMforce_return ) {
+ *HPMforce_return = false;
+ return retVal___;
+ }
+ }
+ {
+ retVal___ = HPMHooks.source.libconfig.setting_get_uint16(setting);
+ }
+ if( HPMHooks.count.HP_libconfig_setting_get_uint16_post ) {
+ uint16 (*postHookFunc) (uint16 retVal___, const struct config_setting_t *setting);
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_uint16_post; hIndex++ ) {
+ postHookFunc = HPMHooks.list.HP_libconfig_setting_get_uint16_post[hIndex].func;
+ retVal___ = postHookFunc(retVal___, setting);
+ }
+ }
+ return retVal___;
+}
+int16 HP_libconfig_setting_get_int16(const struct config_setting_t *setting) {
+ int hIndex = 0;
+ int16 retVal___ = 0;
+ if( HPMHooks.count.HP_libconfig_setting_get_int16_pre ) {
+ int16 (*preHookFunc) (const struct config_setting_t *setting);
+ *HPMforce_return = false;
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int16_pre; hIndex++ ) {
+ preHookFunc = HPMHooks.list.HP_libconfig_setting_get_int16_pre[hIndex].func;
+ retVal___ = preHookFunc(setting);
+ }
+ if( *HPMforce_return ) {
+ *HPMforce_return = false;
+ return retVal___;
+ }
+ }
+ {
+ retVal___ = HPMHooks.source.libconfig.setting_get_int16(setting);
+ }
+ if( HPMHooks.count.HP_libconfig_setting_get_int16_post ) {
+ int16 (*postHookFunc) (int16 retVal___, const struct config_setting_t *setting);
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int16_post; hIndex++ ) {
+ postHookFunc = HPMHooks.list.HP_libconfig_setting_get_int16_post[hIndex].func;
+ retVal___ = postHookFunc(retVal___, setting);
+ }
+ }
+ return retVal___;
+}
+int HP_libconfig_setting_lookup_bool_real(const struct config_setting_t *setting, const char *name, bool *value) {
+ int hIndex = 0;
+ int retVal___ = 0;
+ if( HPMHooks.count.HP_libconfig_setting_lookup_bool_real_pre ) {
+ int (*preHookFunc) (const struct config_setting_t *setting, const char *name, bool *value);
+ *HPMforce_return = false;
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_bool_real_pre; hIndex++ ) {
+ preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_bool_real_pre[hIndex].func;
+ retVal___ = preHookFunc(setting, name, value);
+ }
+ if( *HPMforce_return ) {
+ *HPMforce_return = false;
+ return retVal___;
+ }
+ }
+ {
+ retVal___ = HPMHooks.source.libconfig.setting_lookup_bool_real(setting, name, value);
+ }
+ if( HPMHooks.count.HP_libconfig_setting_lookup_bool_real_post ) {
+ int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, bool *value);
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_bool_real_post; hIndex++ ) {
+ postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_bool_real_post[hIndex].func;
+ retVal___ = postHookFunc(retVal___, setting, name, value);
+ }
+ }
+ return retVal___;
+}
+int HP_libconfig_setting_lookup_uint32(const struct config_setting_t *setting, const char *name, uint32 *value) {
+ int hIndex = 0;
+ int retVal___ = 0;
+ if( HPMHooks.count.HP_libconfig_setting_lookup_uint32_pre ) {
+ int (*preHookFunc) (const struct config_setting_t *setting, const char *name, uint32 *value);
+ *HPMforce_return = false;
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_uint32_pre; hIndex++ ) {
+ preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_uint32_pre[hIndex].func;
+ retVal___ = preHookFunc(setting, name, value);
+ }
+ if( *HPMforce_return ) {
+ *HPMforce_return = false;
+ return retVal___;
+ }
+ }
+ {
+ retVal___ = HPMHooks.source.libconfig.setting_lookup_uint32(setting, name, value);
+ }
+ if( HPMHooks.count.HP_libconfig_setting_lookup_uint32_post ) {
+ int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, uint32 *value);
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_uint32_post; hIndex++ ) {
+ postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_uint32_post[hIndex].func;
+ retVal___ = postHookFunc(retVal___, setting, name, value);
+ }
+ }
+ return retVal___;
+}
+int HP_libconfig_setting_lookup_uint16(const struct config_setting_t *setting, const char *name, uint16 *value) {
+ int hIndex = 0;
+ int retVal___ = 0;
+ if( HPMHooks.count.HP_libconfig_setting_lookup_uint16_pre ) {
+ int (*preHookFunc) (const struct config_setting_t *setting, const char *name, uint16 *value);
+ *HPMforce_return = false;
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_uint16_pre; hIndex++ ) {
+ preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_uint16_pre[hIndex].func;
+ retVal___ = preHookFunc(setting, name, value);
+ }
+ if( *HPMforce_return ) {
+ *HPMforce_return = false;
+ return retVal___;
+ }
+ }
+ {
+ retVal___ = HPMHooks.source.libconfig.setting_lookup_uint16(setting, name, value);
+ }
+ if( HPMHooks.count.HP_libconfig_setting_lookup_uint16_post ) {
+ int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, uint16 *value);
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_uint16_post; hIndex++ ) {
+ postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_uint16_post[hIndex].func;
+ retVal___ = postHookFunc(retVal___, setting, name, value);
+ }
+ }
+ return retVal___;
+}
+int HP_libconfig_setting_lookup_int16(const struct config_setting_t *setting, const char *name, int16 *value) {
+ int hIndex = 0;
+ int retVal___ = 0;
+ if( HPMHooks.count.HP_libconfig_setting_lookup_int16_pre ) {
+ int (*preHookFunc) (const struct config_setting_t *setting, const char *name, int16 *value);
+ *HPMforce_return = false;
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_int16_pre; hIndex++ ) {
+ preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_int16_pre[hIndex].func;
+ retVal___ = preHookFunc(setting, name, value);
+ }
+ if( *HPMforce_return ) {
+ *HPMforce_return = false;
+ return retVal___;
+ }
+ }
+ {
+ retVal___ = HPMHooks.source.libconfig.setting_lookup_int16(setting, name, value);
+ }
+ if( HPMHooks.count.HP_libconfig_setting_lookup_int16_post ) {
+ int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, int16 *value);
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_int16_post; hIndex++ ) {
+ postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_int16_post[hIndex].func;
+ retVal___ = postHookFunc(retVal___, setting, name, value);
+ }
+ }
+ return retVal___;
+}
+int HP_libconfig_setting_lookup_mutable_string(const struct config_setting_t *setting, const char *name, char *out, size_t out_size) {
+ int hIndex = 0;
+ int retVal___ = 0;
+ if( HPMHooks.count.HP_libconfig_setting_lookup_mutable_string_pre ) {
+ int (*preHookFunc) (const struct config_setting_t *setting, const char *name, char *out, size_t *out_size);
+ *HPMforce_return = false;
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_mutable_string_pre; hIndex++ ) {
+ preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_mutable_string_pre[hIndex].func;
+ retVal___ = preHookFunc(setting, name, out, &out_size);
+ }
+ if( *HPMforce_return ) {
+ *HPMforce_return = false;
+ return retVal___;
+ }
+ }
+ {
+ retVal___ = HPMHooks.source.libconfig.setting_lookup_mutable_string(setting, name, out, out_size);
+ }
+ if( HPMHooks.count.HP_libconfig_setting_lookup_mutable_string_post ) {
+ int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, char *out, size_t *out_size);
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_mutable_string_post; hIndex++ ) {
+ postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_mutable_string_post[hIndex].func;
+ retVal___ = postHookFunc(retVal___, setting, name, out, &out_size);
+ }
+ }
+ return retVal___;
+}
+int HP_libconfig_lookup_mutable_string(const struct config_t *config, const char *name, char *out, size_t out_size) {
+ int hIndex = 0;
+ int retVal___ = 0;
+ if( HPMHooks.count.HP_libconfig_lookup_mutable_string_pre ) {
+ int (*preHookFunc) (const struct config_t *config, const char *name, char *out, size_t *out_size);
+ *HPMforce_return = false;
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_mutable_string_pre; hIndex++ ) {
+ preHookFunc = HPMHooks.list.HP_libconfig_lookup_mutable_string_pre[hIndex].func;
+ retVal___ = preHookFunc(config, name, out, &out_size);
+ }
+ if( *HPMforce_return ) {
+ *HPMforce_return = false;
+ return retVal___;
+ }
+ }
+ {
+ retVal___ = HPMHooks.source.libconfig.lookup_mutable_string(config, name, out, out_size);
+ }
+ if( HPMHooks.count.HP_libconfig_lookup_mutable_string_post ) {
+ int (*postHookFunc) (int retVal___, const struct config_t *config, const char *name, char *out, size_t *out_size);
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_mutable_string_post; hIndex++ ) {
+ postHookFunc = HPMHooks.list.HP_libconfig_lookup_mutable_string_post[hIndex].func;
+ retVal___ = postHookFunc(retVal___, config, name, out, &out_size);
+ }
+ }
+ return retVal___;
+}
/* loginif */
void HP_loginif_init(void) {
int hIndex = 0;
@@ -15820,11 +16090,11 @@ bool HP_sockt_trusted_ip_check(uint32 ip) {
}
return retVal___;
}
-int HP_sockt_net_config_read_sub(config_setting_t *t, struct s_subnet_vector *list, const char *filename, const char *groupname) {
+int HP_sockt_net_config_read_sub(struct config_setting_t *t, struct s_subnet_vector *list, const char *filename, const char *groupname) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_sockt_net_config_read_sub_pre ) {
- int (*preHookFunc) (config_setting_t *t, struct s_subnet_vector *list, const char *filename, const char *groupname);
+ int (*preHookFunc) (struct config_setting_t *t, struct s_subnet_vector *list, const char *filename, const char *groupname);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_net_config_read_sub_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_sockt_net_config_read_sub_pre[hIndex].func;
@@ -15839,7 +16109,7 @@ int HP_sockt_net_config_read_sub(config_setting_t *t, struct s_subnet_vector *li
retVal___ = HPMHooks.source.sockt.net_config_read_sub(t, list, filename, groupname);
}
if( HPMHooks.count.HP_sockt_net_config_read_sub_post ) {
- int (*postHookFunc) (int retVal___, config_setting_t *t, struct s_subnet_vector *list, const char *filename, const char *groupname);
+ int (*postHookFunc) (int retVal___, struct config_setting_t *t, struct s_subnet_vector *list, const char *filename, const char *groupname);
for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_net_config_read_sub_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_sockt_net_config_read_sub_post[hIndex].func;
retVal___ = postHookFunc(retVal___, t, list, filename, groupname);
diff --git a/src/plugins/HPMHooking/HPMHooking_login.HPMHooksCore.inc b/src/plugins/HPMHooking/HPMHooking_login.HPMHooksCore.inc
index a9abae542..c8d9d7e0d 100644
--- a/src/plugins/HPMHooking/HPMHooking_login.HPMHooksCore.inc
+++ b/src/plugins/HPMHooking/HPMHooking_login.HPMHooksCore.inc
@@ -94,10 +94,10 @@ struct {
struct HPMHookPoint *HP_libconfig_read_post;
struct HPMHookPoint *HP_libconfig_write_pre;
struct HPMHookPoint *HP_libconfig_write_post;
- struct HPMHookPoint *HP_libconfig_set_auto_convert_pre;
- struct HPMHookPoint *HP_libconfig_set_auto_convert_post;
- struct HPMHookPoint *HP_libconfig_get_auto_convert_pre;
- struct HPMHookPoint *HP_libconfig_get_auto_convert_post;
+ struct HPMHookPoint *HP_libconfig_set_options_pre;
+ struct HPMHookPoint *HP_libconfig_set_options_post;
+ struct HPMHookPoint *HP_libconfig_get_options_pre;
+ struct HPMHookPoint *HP_libconfig_get_options_post;
struct HPMHookPoint *HP_libconfig_read_string_pre;
struct HPMHookPoint *HP_libconfig_read_string_post;
struct HPMHookPoint *HP_libconfig_read_file_src_pre;
@@ -122,6 +122,8 @@ struct {
struct HPMHookPoint *HP_libconfig_setting_get_bool_post;
struct HPMHookPoint *HP_libconfig_setting_get_string_pre;
struct HPMHookPoint *HP_libconfig_setting_get_string_post;
+ struct HPMHookPoint *HP_libconfig_setting_lookup_pre;
+ struct HPMHookPoint *HP_libconfig_setting_lookup_post;
struct HPMHookPoint *HP_libconfig_setting_lookup_int_pre;
struct HPMHookPoint *HP_libconfig_setting_lookup_int_post;
struct HPMHookPoint *HP_libconfig_setting_lookup_int64_pre;
@@ -184,8 +186,6 @@ struct {
struct HPMHookPoint *HP_libconfig_setting_set_hook_post;
struct HPMHookPoint *HP_libconfig_lookup_pre;
struct HPMHookPoint *HP_libconfig_lookup_post;
- struct HPMHookPoint *HP_libconfig_lookup_from_pre;
- struct HPMHookPoint *HP_libconfig_lookup_from_post;
struct HPMHookPoint *HP_libconfig_lookup_int_pre;
struct HPMHookPoint *HP_libconfig_lookup_int_post;
struct HPMHookPoint *HP_libconfig_lookup_int64_pre;
@@ -196,8 +196,8 @@ struct {
struct HPMHookPoint *HP_libconfig_lookup_bool_post;
struct HPMHookPoint *HP_libconfig_lookup_string_pre;
struct HPMHookPoint *HP_libconfig_lookup_string_post;
- struct HPMHookPoint *HP_libconfig_read_file_pre;
- struct HPMHookPoint *HP_libconfig_read_file_post;
+ struct HPMHookPoint *HP_libconfig_load_file_pre;
+ struct HPMHookPoint *HP_libconfig_load_file_post;
struct HPMHookPoint *HP_libconfig_setting_copy_simple_pre;
struct HPMHookPoint *HP_libconfig_setting_copy_simple_post;
struct HPMHookPoint *HP_libconfig_setting_copy_elem_pre;
@@ -206,6 +206,26 @@ struct {
struct HPMHookPoint *HP_libconfig_setting_copy_aggregate_post;
struct HPMHookPoint *HP_libconfig_setting_copy_pre;
struct HPMHookPoint *HP_libconfig_setting_copy_post;
+ struct HPMHookPoint *HP_libconfig_setting_get_bool_real_pre;
+ struct HPMHookPoint *HP_libconfig_setting_get_bool_real_post;
+ struct HPMHookPoint *HP_libconfig_setting_get_uint32_pre;
+ struct HPMHookPoint *HP_libconfig_setting_get_uint32_post;
+ struct HPMHookPoint *HP_libconfig_setting_get_uint16_pre;
+ struct HPMHookPoint *HP_libconfig_setting_get_uint16_post;
+ struct HPMHookPoint *HP_libconfig_setting_get_int16_pre;
+ struct HPMHookPoint *HP_libconfig_setting_get_int16_post;
+ struct HPMHookPoint *HP_libconfig_setting_lookup_bool_real_pre;
+ struct HPMHookPoint *HP_libconfig_setting_lookup_bool_real_post;
+ struct HPMHookPoint *HP_libconfig_setting_lookup_uint32_pre;
+ struct HPMHookPoint *HP_libconfig_setting_lookup_uint32_post;
+ struct HPMHookPoint *HP_libconfig_setting_lookup_uint16_pre;
+ struct HPMHookPoint *HP_libconfig_setting_lookup_uint16_post;
+ struct HPMHookPoint *HP_libconfig_setting_lookup_int16_pre;
+ struct HPMHookPoint *HP_libconfig_setting_lookup_int16_post;
+ struct HPMHookPoint *HP_libconfig_setting_lookup_mutable_string_pre;
+ struct HPMHookPoint *HP_libconfig_setting_lookup_mutable_string_post;
+ struct HPMHookPoint *HP_libconfig_lookup_mutable_string_pre;
+ struct HPMHookPoint *HP_libconfig_lookup_mutable_string_post;
struct HPMHookPoint *HP_login_mmo_auth_pre;
struct HPMHookPoint *HP_login_mmo_auth_post;
struct HPMHookPoint *HP_login_mmo_auth_new_pre;
@@ -673,10 +693,10 @@ struct {
int HP_libconfig_read_post;
int HP_libconfig_write_pre;
int HP_libconfig_write_post;
- int HP_libconfig_set_auto_convert_pre;
- int HP_libconfig_set_auto_convert_post;
- int HP_libconfig_get_auto_convert_pre;
- int HP_libconfig_get_auto_convert_post;
+ int HP_libconfig_set_options_pre;
+ int HP_libconfig_set_options_post;
+ int HP_libconfig_get_options_pre;
+ int HP_libconfig_get_options_post;
int HP_libconfig_read_string_pre;
int HP_libconfig_read_string_post;
int HP_libconfig_read_file_src_pre;
@@ -701,6 +721,8 @@ struct {
int HP_libconfig_setting_get_bool_post;
int HP_libconfig_setting_get_string_pre;
int HP_libconfig_setting_get_string_post;
+ int HP_libconfig_setting_lookup_pre;
+ int HP_libconfig_setting_lookup_post;
int HP_libconfig_setting_lookup_int_pre;
int HP_libconfig_setting_lookup_int_post;
int HP_libconfig_setting_lookup_int64_pre;
@@ -763,8 +785,6 @@ struct {
int HP_libconfig_setting_set_hook_post;
int HP_libconfig_lookup_pre;
int HP_libconfig_lookup_post;
- int HP_libconfig_lookup_from_pre;
- int HP_libconfig_lookup_from_post;
int HP_libconfig_lookup_int_pre;
int HP_libconfig_lookup_int_post;
int HP_libconfig_lookup_int64_pre;
@@ -775,8 +795,8 @@ struct {
int HP_libconfig_lookup_bool_post;
int HP_libconfig_lookup_string_pre;
int HP_libconfig_lookup_string_post;
- int HP_libconfig_read_file_pre;
- int HP_libconfig_read_file_post;
+ int HP_libconfig_load_file_pre;
+ int HP_libconfig_load_file_post;
int HP_libconfig_setting_copy_simple_pre;
int HP_libconfig_setting_copy_simple_post;
int HP_libconfig_setting_copy_elem_pre;
@@ -785,6 +805,26 @@ struct {
int HP_libconfig_setting_copy_aggregate_post;
int HP_libconfig_setting_copy_pre;
int HP_libconfig_setting_copy_post;
+ int HP_libconfig_setting_get_bool_real_pre;
+ int HP_libconfig_setting_get_bool_real_post;
+ int HP_libconfig_setting_get_uint32_pre;
+ int HP_libconfig_setting_get_uint32_post;
+ int HP_libconfig_setting_get_uint16_pre;
+ int HP_libconfig_setting_get_uint16_post;
+ int HP_libconfig_setting_get_int16_pre;
+ int HP_libconfig_setting_get_int16_post;
+ int HP_libconfig_setting_lookup_bool_real_pre;
+ int HP_libconfig_setting_lookup_bool_real_post;
+ int HP_libconfig_setting_lookup_uint32_pre;
+ int HP_libconfig_setting_lookup_uint32_post;
+ int HP_libconfig_setting_lookup_uint16_pre;
+ int HP_libconfig_setting_lookup_uint16_post;
+ int HP_libconfig_setting_lookup_int16_pre;
+ int HP_libconfig_setting_lookup_int16_post;
+ int HP_libconfig_setting_lookup_mutable_string_pre;
+ int HP_libconfig_setting_lookup_mutable_string_post;
+ int HP_libconfig_lookup_mutable_string_pre;
+ int HP_libconfig_lookup_mutable_string_post;
int HP_login_mmo_auth_pre;
int HP_login_mmo_auth_post;
int HP_login_mmo_auth_new_pre;
diff --git a/src/plugins/HPMHooking/HPMHooking_login.HookingPoints.inc b/src/plugins/HPMHooking/HPMHooking_login.HookingPoints.inc
index 5e501c62c..7a02e799c 100644
--- a/src/plugins/HPMHooking/HPMHooking_login.HookingPoints.inc
+++ b/src/plugins/HPMHooking/HPMHooking_login.HookingPoints.inc
@@ -64,8 +64,8 @@ struct HookingPointData HookingPoints[] = {
/* libconfig */
{ HP_POP(libconfig->read, HP_libconfig_read) },
{ HP_POP(libconfig->write, HP_libconfig_write) },
- { HP_POP(libconfig->set_auto_convert, HP_libconfig_set_auto_convert) },
- { HP_POP(libconfig->get_auto_convert, HP_libconfig_get_auto_convert) },
+ { HP_POP(libconfig->set_options, HP_libconfig_set_options) },
+ { HP_POP(libconfig->get_options, HP_libconfig_get_options) },
{ HP_POP(libconfig->read_string, HP_libconfig_read_string) },
{ HP_POP(libconfig->read_file_src, HP_libconfig_read_file_src) },
{ HP_POP(libconfig->write_file, HP_libconfig_write_file) },
@@ -78,6 +78,7 @@ struct HookingPointData HookingPoints[] = {
{ HP_POP(libconfig->setting_get_float, HP_libconfig_setting_get_float) },
{ HP_POP(libconfig->setting_get_bool, HP_libconfig_setting_get_bool) },
{ HP_POP(libconfig->setting_get_string, HP_libconfig_setting_get_string) },
+ { HP_POP(libconfig->setting_lookup, HP_libconfig_setting_lookup) },
{ HP_POP(libconfig->setting_lookup_int, HP_libconfig_setting_lookup_int) },
{ HP_POP(libconfig->setting_lookup_int64, HP_libconfig_setting_lookup_int64) },
{ HP_POP(libconfig->setting_lookup_float, HP_libconfig_setting_lookup_float) },
@@ -109,17 +110,26 @@ struct HookingPointData HookingPoints[] = {
{ HP_POP(libconfig->setting_remove_elem, HP_libconfig_setting_remove_elem) },
{ HP_POP(libconfig->setting_set_hook, HP_libconfig_setting_set_hook) },
{ HP_POP(libconfig->lookup, HP_libconfig_lookup) },
- { HP_POP(libconfig->lookup_from, HP_libconfig_lookup_from) },
{ HP_POP(libconfig->lookup_int, HP_libconfig_lookup_int) },
{ HP_POP(libconfig->lookup_int64, HP_libconfig_lookup_int64) },
{ HP_POP(libconfig->lookup_float, HP_libconfig_lookup_float) },
{ HP_POP(libconfig->lookup_bool, HP_libconfig_lookup_bool) },
{ HP_POP(libconfig->lookup_string, HP_libconfig_lookup_string) },
- { HP_POP(libconfig->read_file, HP_libconfig_read_file) },
+ { HP_POP(libconfig->load_file, HP_libconfig_load_file) },
{ HP_POP(libconfig->setting_copy_simple, HP_libconfig_setting_copy_simple) },
{ HP_POP(libconfig->setting_copy_elem, HP_libconfig_setting_copy_elem) },
{ HP_POP(libconfig->setting_copy_aggregate, HP_libconfig_setting_copy_aggregate) },
{ HP_POP(libconfig->setting_copy, HP_libconfig_setting_copy) },
+ { HP_POP(libconfig->setting_get_bool_real, HP_libconfig_setting_get_bool_real) },
+ { HP_POP(libconfig->setting_get_uint32, HP_libconfig_setting_get_uint32) },
+ { HP_POP(libconfig->setting_get_uint16, HP_libconfig_setting_get_uint16) },
+ { HP_POP(libconfig->setting_get_int16, HP_libconfig_setting_get_int16) },
+ { HP_POP(libconfig->setting_lookup_bool_real, HP_libconfig_setting_lookup_bool_real) },
+ { HP_POP(libconfig->setting_lookup_uint32, HP_libconfig_setting_lookup_uint32) },
+ { HP_POP(libconfig->setting_lookup_uint16, HP_libconfig_setting_lookup_uint16) },
+ { HP_POP(libconfig->setting_lookup_int16, HP_libconfig_setting_lookup_int16) },
+ { HP_POP(libconfig->setting_lookup_mutable_string, HP_libconfig_setting_lookup_mutable_string) },
+ { HP_POP(libconfig->lookup_mutable_string, HP_libconfig_lookup_mutable_string) },
/* login */
{ HP_POP(login->mmo_auth, HP_login_mmo_auth) },
{ HP_POP(login->mmo_auth_new, HP_login_mmo_auth_new) },
diff --git a/src/plugins/HPMHooking/HPMHooking_login.Hooks.inc b/src/plugins/HPMHooking/HPMHooking_login.Hooks.inc
index bf0610688..5bbc8fefb 100644
--- a/src/plugins/HPMHooking/HPMHooking_login.Hooks.inc
+++ b/src/plugins/HPMHooking/HPMHooking_login.Hooks.inc
@@ -918,11 +918,11 @@ void HP_DB_final(void) {
return;
}
/* libconfig */
-int HP_libconfig_read(config_t *config, FILE *stream) {
+int HP_libconfig_read(struct config_t *config, FILE *stream) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_read_pre ) {
- int (*preHookFunc) (config_t *config, FILE *stream);
+ int (*preHookFunc) (struct config_t *config, FILE *stream);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_read_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_read_pre[hIndex].func;
@@ -937,7 +937,7 @@ int HP_libconfig_read(config_t *config, FILE *stream) {
retVal___ = HPMHooks.source.libconfig.read(config, stream);
}
if( HPMHooks.count.HP_libconfig_read_post ) {
- int (*postHookFunc) (int retVal___, config_t *config, FILE *stream);
+ int (*postHookFunc) (int retVal___, struct config_t *config, FILE *stream);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_read_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_read_post[hIndex].func;
retVal___ = postHookFunc(retVal___, config, stream);
@@ -945,10 +945,10 @@ int HP_libconfig_read(config_t *config, FILE *stream) {
}
return retVal___;
}
-void HP_libconfig_write(const config_t *config, FILE *stream) {
+void HP_libconfig_write(const struct config_t *config, FILE *stream) {
int hIndex = 0;
if( HPMHooks.count.HP_libconfig_write_pre ) {
- void (*preHookFunc) (const config_t *config, FILE *stream);
+ void (*preHookFunc) (const struct config_t *config, FILE *stream);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_write_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_write_pre[hIndex].func;
@@ -963,7 +963,7 @@ void HP_libconfig_write(const config_t *config, FILE *stream) {
HPMHooks.source.libconfig.write(config, stream);
}
if( HPMHooks.count.HP_libconfig_write_post ) {
- void (*postHookFunc) (const config_t *config, FILE *stream);
+ void (*postHookFunc) (const struct config_t *config, FILE *stream);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_write_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_write_post[hIndex].func;
postHookFunc(config, stream);
@@ -971,14 +971,14 @@ void HP_libconfig_write(const config_t *config, FILE *stream) {
}
return;
}
-void HP_libconfig_set_auto_convert(config_t *config, int flag) {
+void HP_libconfig_set_options(struct config_t *config, int options) {
int hIndex = 0;
- if( HPMHooks.count.HP_libconfig_set_auto_convert_pre ) {
- void (*preHookFunc) (config_t *config, int *flag);
+ if( HPMHooks.count.HP_libconfig_set_options_pre ) {
+ void (*preHookFunc) (struct config_t *config, int *options);
*HPMforce_return = false;
- for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_auto_convert_pre; hIndex++ ) {
- preHookFunc = HPMHooks.list.HP_libconfig_set_auto_convert_pre[hIndex].func;
- preHookFunc(config, &flag);
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_options_pre; hIndex++ ) {
+ preHookFunc = HPMHooks.list.HP_libconfig_set_options_pre[hIndex].func;
+ preHookFunc(config, &options);
}
if( *HPMforce_return ) {
*HPMforce_return = false;
@@ -986,25 +986,25 @@ void HP_libconfig_set_auto_convert(config_t *config, int flag) {
}
}
{
- HPMHooks.source.libconfig.set_auto_convert(config, flag);
+ HPMHooks.source.libconfig.set_options(config, options);
}
- if( HPMHooks.count.HP_libconfig_set_auto_convert_post ) {
- void (*postHookFunc) (config_t *config, int *flag);
- for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_auto_convert_post; hIndex++ ) {
- postHookFunc = HPMHooks.list.HP_libconfig_set_auto_convert_post[hIndex].func;
- postHookFunc(config, &flag);
+ if( HPMHooks.count.HP_libconfig_set_options_post ) {
+ void (*postHookFunc) (struct config_t *config, int *options);
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_options_post; hIndex++ ) {
+ postHookFunc = HPMHooks.list.HP_libconfig_set_options_post[hIndex].func;
+ postHookFunc(config, &options);
}
}
return;
}
-int HP_libconfig_get_auto_convert(const config_t *config) {
+int HP_libconfig_get_options(const struct config_t *config) {
int hIndex = 0;
int retVal___ = 0;
- if( HPMHooks.count.HP_libconfig_get_auto_convert_pre ) {
- int (*preHookFunc) (const config_t *config);
+ if( HPMHooks.count.HP_libconfig_get_options_pre ) {
+ int (*preHookFunc) (const struct config_t *config);
*HPMforce_return = false;
- for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_get_auto_convert_pre; hIndex++ ) {
- preHookFunc = HPMHooks.list.HP_libconfig_get_auto_convert_pre[hIndex].func;
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_get_options_pre; hIndex++ ) {
+ preHookFunc = HPMHooks.list.HP_libconfig_get_options_pre[hIndex].func;
retVal___ = preHookFunc(config);
}
if( *HPMforce_return ) {
@@ -1013,22 +1013,22 @@ int HP_libconfig_get_auto_convert(const config_t *config) {
}
}
{
- retVal___ = HPMHooks.source.libconfig.get_auto_convert(config);
+ retVal___ = HPMHooks.source.libconfig.get_options(config);
}
- if( HPMHooks.count.HP_libconfig_get_auto_convert_post ) {
- int (*postHookFunc) (int retVal___, const config_t *config);
- for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_get_auto_convert_post; hIndex++ ) {
- postHookFunc = HPMHooks.list.HP_libconfig_get_auto_convert_post[hIndex].func;
+ if( HPMHooks.count.HP_libconfig_get_options_post ) {
+ int (*postHookFunc) (int retVal___, const struct config_t *config);
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_get_options_post; hIndex++ ) {
+ postHookFunc = HPMHooks.list.HP_libconfig_get_options_post[hIndex].func;
retVal___ = postHookFunc(retVal___, config);
}
}
return retVal___;
}
-int HP_libconfig_read_string(config_t *config, const char *str) {
+int HP_libconfig_read_string(struct config_t *config, const char *str) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_read_string_pre ) {
- int (*preHookFunc) (config_t *config, const char *str);
+ int (*preHookFunc) (struct config_t *config, const char *str);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_read_string_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_read_string_pre[hIndex].func;
@@ -1043,7 +1043,7 @@ int HP_libconfig_read_string(config_t *config, const char *str) {
retVal___ = HPMHooks.source.libconfig.read_string(config, str);
}
if( HPMHooks.count.HP_libconfig_read_string_post ) {
- int (*postHookFunc) (int retVal___, config_t *config, const char *str);
+ int (*postHookFunc) (int retVal___, struct config_t *config, const char *str);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_read_string_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_read_string_post[hIndex].func;
retVal___ = postHookFunc(retVal___, config, str);
@@ -1051,11 +1051,11 @@ int HP_libconfig_read_string(config_t *config, const char *str) {
}
return retVal___;
}
-int HP_libconfig_read_file_src(config_t *config, const char *filename) {
+int HP_libconfig_read_file_src(struct config_t *config, const char *filename) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_read_file_src_pre ) {
- int (*preHookFunc) (config_t *config, const char *filename);
+ int (*preHookFunc) (struct config_t *config, const char *filename);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_read_file_src_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_read_file_src_pre[hIndex].func;
@@ -1070,7 +1070,7 @@ int HP_libconfig_read_file_src(config_t *config, const char *filename) {
retVal___ = HPMHooks.source.libconfig.read_file_src(config, filename);
}
if( HPMHooks.count.HP_libconfig_read_file_src_post ) {
- int (*postHookFunc) (int retVal___, config_t *config, const char *filename);
+ int (*postHookFunc) (int retVal___, struct config_t *config, const char *filename);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_read_file_src_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_read_file_src_post[hIndex].func;
retVal___ = postHookFunc(retVal___, config, filename);
@@ -1078,11 +1078,11 @@ int HP_libconfig_read_file_src(config_t *config, const char *filename) {
}
return retVal___;
}
-int HP_libconfig_write_file(config_t *config, const char *filename) {
+int HP_libconfig_write_file(struct config_t *config, const char *filename) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_write_file_pre ) {
- int (*preHookFunc) (config_t *config, const char *filename);
+ int (*preHookFunc) (struct config_t *config, const char *filename);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_write_file_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_write_file_pre[hIndex].func;
@@ -1097,7 +1097,7 @@ int HP_libconfig_write_file(config_t *config, const char *filename) {
retVal___ = HPMHooks.source.libconfig.write_file(config, filename);
}
if( HPMHooks.count.HP_libconfig_write_file_post ) {
- int (*postHookFunc) (int retVal___, config_t *config, const char *filename);
+ int (*postHookFunc) (int retVal___, struct config_t *config, const char *filename);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_write_file_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_write_file_post[hIndex].func;
retVal___ = postHookFunc(retVal___, config, filename);
@@ -1105,10 +1105,10 @@ int HP_libconfig_write_file(config_t *config, const char *filename) {
}
return retVal___;
}
-void HP_libconfig_set_destructor(config_t *config, void ( *destructor ) (void *)) {
+void HP_libconfig_set_destructor(struct config_t *config, void ( *destructor ) (void *)) {
int hIndex = 0;
if( HPMHooks.count.HP_libconfig_set_destructor_pre ) {
- void (*preHookFunc) (config_t *config, void ( *destructor ) (void *));
+ void (*preHookFunc) (struct config_t *config, void ( *destructor ) (void *));
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_destructor_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_set_destructor_pre[hIndex].func;
@@ -1123,7 +1123,7 @@ void HP_libconfig_set_destructor(config_t *config, void ( *destructor ) (void *)
HPMHooks.source.libconfig.set_destructor(config, destructor);
}
if( HPMHooks.count.HP_libconfig_set_destructor_post ) {
- void (*postHookFunc) (config_t *config, void ( *destructor ) (void *));
+ void (*postHookFunc) (struct config_t *config, void ( *destructor ) (void *));
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_destructor_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_set_destructor_post[hIndex].func;
postHookFunc(config, destructor);
@@ -1131,10 +1131,10 @@ void HP_libconfig_set_destructor(config_t *config, void ( *destructor ) (void *)
}
return;
}
-void HP_libconfig_set_include_dir(config_t *config, const char *include_dir) {
+void HP_libconfig_set_include_dir(struct config_t *config, const char *include_dir) {
int hIndex = 0;
if( HPMHooks.count.HP_libconfig_set_include_dir_pre ) {
- void (*preHookFunc) (config_t *config, const char *include_dir);
+ void (*preHookFunc) (struct config_t *config, const char *include_dir);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_include_dir_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_set_include_dir_pre[hIndex].func;
@@ -1149,7 +1149,7 @@ void HP_libconfig_set_include_dir(config_t *config, const char *include_dir) {
HPMHooks.source.libconfig.set_include_dir(config, include_dir);
}
if( HPMHooks.count.HP_libconfig_set_include_dir_post ) {
- void (*postHookFunc) (config_t *config, const char *include_dir);
+ void (*postHookFunc) (struct config_t *config, const char *include_dir);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_include_dir_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_set_include_dir_post[hIndex].func;
postHookFunc(config, include_dir);
@@ -1157,10 +1157,10 @@ void HP_libconfig_set_include_dir(config_t *config, const char *include_dir) {
}
return;
}
-void HP_libconfig_init(config_t *config) {
+void HP_libconfig_init(struct config_t *config) {
int hIndex = 0;
if( HPMHooks.count.HP_libconfig_init_pre ) {
- void (*preHookFunc) (config_t *config);
+ void (*preHookFunc) (struct config_t *config);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_init_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_init_pre[hIndex].func;
@@ -1175,7 +1175,7 @@ void HP_libconfig_init(config_t *config) {
HPMHooks.source.libconfig.init(config);
}
if( HPMHooks.count.HP_libconfig_init_post ) {
- void (*postHookFunc) (config_t *config);
+ void (*postHookFunc) (struct config_t *config);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_init_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_init_post[hIndex].func;
postHookFunc(config);
@@ -1183,10 +1183,10 @@ void HP_libconfig_init(config_t *config) {
}
return;
}
-void HP_libconfig_destroy(config_t *config) {
+void HP_libconfig_destroy(struct config_t *config) {
int hIndex = 0;
if( HPMHooks.count.HP_libconfig_destroy_pre ) {
- void (*preHookFunc) (config_t *config);
+ void (*preHookFunc) (struct config_t *config);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_destroy_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_destroy_pre[hIndex].func;
@@ -1201,7 +1201,7 @@ void HP_libconfig_destroy(config_t *config) {
HPMHooks.source.libconfig.destroy(config);
}
if( HPMHooks.count.HP_libconfig_destroy_post ) {
- void (*postHookFunc) (config_t *config);
+ void (*postHookFunc) (struct config_t *config);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_destroy_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_destroy_post[hIndex].func;
postHookFunc(config);
@@ -1209,11 +1209,11 @@ void HP_libconfig_destroy(config_t *config) {
}
return;
}
-int HP_libconfig_setting_get_int(const config_setting_t *setting) {
+int HP_libconfig_setting_get_int(const struct config_setting_t *setting) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_setting_get_int_pre ) {
- int (*preHookFunc) (const config_setting_t *setting);
+ int (*preHookFunc) (const struct config_setting_t *setting);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_get_int_pre[hIndex].func;
@@ -1228,7 +1228,7 @@ int HP_libconfig_setting_get_int(const config_setting_t *setting) {
retVal___ = HPMHooks.source.libconfig.setting_get_int(setting);
}
if( HPMHooks.count.HP_libconfig_setting_get_int_post ) {
- int (*postHookFunc) (int retVal___, const config_setting_t *setting);
+ int (*postHookFunc) (int retVal___, const struct config_setting_t *setting);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_get_int_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting);
@@ -1236,11 +1236,11 @@ int HP_libconfig_setting_get_int(const config_setting_t *setting) {
}
return retVal___;
}
-long long HP_libconfig_setting_get_int64(const config_setting_t *setting) {
+long long HP_libconfig_setting_get_int64(const struct config_setting_t *setting) {
int hIndex = 0;
long long retVal___ = 0;
if( HPMHooks.count.HP_libconfig_setting_get_int64_pre ) {
- long long (*preHookFunc) (const config_setting_t *setting);
+ long long (*preHookFunc) (const struct config_setting_t *setting);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int64_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_get_int64_pre[hIndex].func;
@@ -1255,7 +1255,7 @@ long long HP_libconfig_setting_get_int64(const config_setting_t *setting) {
retVal___ = HPMHooks.source.libconfig.setting_get_int64(setting);
}
if( HPMHooks.count.HP_libconfig_setting_get_int64_post ) {
- long long (*postHookFunc) (long long retVal___, const config_setting_t *setting);
+ long long (*postHookFunc) (long long retVal___, const struct config_setting_t *setting);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int64_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_get_int64_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting);
@@ -1263,11 +1263,11 @@ long long HP_libconfig_setting_get_int64(const config_setting_t *setting) {
}
return retVal___;
}
-double HP_libconfig_setting_get_float(const config_setting_t *setting) {
+double HP_libconfig_setting_get_float(const struct config_setting_t *setting) {
int hIndex = 0;
double retVal___ = 0.;
if( HPMHooks.count.HP_libconfig_setting_get_float_pre ) {
- double (*preHookFunc) (const config_setting_t *setting);
+ double (*preHookFunc) (const struct config_setting_t *setting);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_float_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_get_float_pre[hIndex].func;
@@ -1282,7 +1282,7 @@ double HP_libconfig_setting_get_float(const config_setting_t *setting) {
retVal___ = HPMHooks.source.libconfig.setting_get_float(setting);
}
if( HPMHooks.count.HP_libconfig_setting_get_float_post ) {
- double (*postHookFunc) (double retVal___, const config_setting_t *setting);
+ double (*postHookFunc) (double retVal___, const struct config_setting_t *setting);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_float_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_get_float_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting);
@@ -1290,11 +1290,11 @@ double HP_libconfig_setting_get_float(const config_setting_t *setting) {
}
return retVal___;
}
-int HP_libconfig_setting_get_bool(const config_setting_t *setting) {
+int HP_libconfig_setting_get_bool(const struct config_setting_t *setting) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_setting_get_bool_pre ) {
- int (*preHookFunc) (const config_setting_t *setting);
+ int (*preHookFunc) (const struct config_setting_t *setting);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_bool_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_get_bool_pre[hIndex].func;
@@ -1309,7 +1309,7 @@ int HP_libconfig_setting_get_bool(const config_setting_t *setting) {
retVal___ = HPMHooks.source.libconfig.setting_get_bool(setting);
}
if( HPMHooks.count.HP_libconfig_setting_get_bool_post ) {
- int (*postHookFunc) (int retVal___, const config_setting_t *setting);
+ int (*postHookFunc) (int retVal___, const struct config_setting_t *setting);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_bool_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_get_bool_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting);
@@ -1317,11 +1317,11 @@ int HP_libconfig_setting_get_bool(const config_setting_t *setting) {
}
return retVal___;
}
-const char* HP_libconfig_setting_get_string(const config_setting_t *setting) {
+const char* HP_libconfig_setting_get_string(const struct config_setting_t *setting) {
int hIndex = 0;
const char* retVal___ = NULL;
if( HPMHooks.count.HP_libconfig_setting_get_string_pre ) {
- const char* (*preHookFunc) (const config_setting_t *setting);
+ const char* (*preHookFunc) (const struct config_setting_t *setting);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_string_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_get_string_pre[hIndex].func;
@@ -1336,7 +1336,7 @@ const char* HP_libconfig_setting_get_string(const config_setting_t *setting) {
retVal___ = HPMHooks.source.libconfig.setting_get_string(setting);
}
if( HPMHooks.count.HP_libconfig_setting_get_string_post ) {
- const char* (*postHookFunc) (const char* retVal___, const config_setting_t *setting);
+ const char* (*postHookFunc) (const char* retVal___, const struct config_setting_t *setting);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_string_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_get_string_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting);
@@ -1344,11 +1344,38 @@ const char* HP_libconfig_setting_get_string(const config_setting_t *setting) {
}
return retVal___;
}
-int HP_libconfig_setting_lookup_int(const config_setting_t *setting, const char *name, int *value) {
+struct config_setting_t* HP_libconfig_setting_lookup(struct config_setting_t *setting, const char *name) {
+ int hIndex = 0;
+ struct config_setting_t* retVal___ = NULL;
+ if( HPMHooks.count.HP_libconfig_setting_lookup_pre ) {
+ struct config_setting_t* (*preHookFunc) (struct config_setting_t *setting, const char *name);
+ *HPMforce_return = false;
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_pre; hIndex++ ) {
+ preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_pre[hIndex].func;
+ retVal___ = preHookFunc(setting, name);
+ }
+ if( *HPMforce_return ) {
+ *HPMforce_return = false;
+ return retVal___;
+ }
+ }
+ {
+ retVal___ = HPMHooks.source.libconfig.setting_lookup(setting, name);
+ }
+ if( HPMHooks.count.HP_libconfig_setting_lookup_post ) {
+ struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, const char *name);
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_post; hIndex++ ) {
+ postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_post[hIndex].func;
+ retVal___ = postHookFunc(retVal___, setting, name);
+ }
+ }
+ return retVal___;
+}
+int HP_libconfig_setting_lookup_int(const struct config_setting_t *setting, const char *name, int *value) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_setting_lookup_int_pre ) {
- int (*preHookFunc) (const config_setting_t *setting, const char *name, int *value);
+ int (*preHookFunc) (const struct config_setting_t *setting, const char *name, int *value);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_int_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_int_pre[hIndex].func;
@@ -1363,7 +1390,7 @@ int HP_libconfig_setting_lookup_int(const config_setting_t *setting, const char
retVal___ = HPMHooks.source.libconfig.setting_lookup_int(setting, name, value);
}
if( HPMHooks.count.HP_libconfig_setting_lookup_int_post ) {
- int (*postHookFunc) (int retVal___, const config_setting_t *setting, const char *name, int *value);
+ int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, int *value);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_int_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_int_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting, name, value);
@@ -1371,11 +1398,11 @@ int HP_libconfig_setting_lookup_int(const config_setting_t *setting, const char
}
return retVal___;
}
-int HP_libconfig_setting_lookup_int64(const config_setting_t *setting, const char *name, long long *value) {
+int HP_libconfig_setting_lookup_int64(const struct config_setting_t *setting, const char *name, long long *value) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_setting_lookup_int64_pre ) {
- int (*preHookFunc) (const config_setting_t *setting, const char *name, long long *value);
+ int (*preHookFunc) (const struct config_setting_t *setting, const char *name, long long *value);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_int64_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_int64_pre[hIndex].func;
@@ -1390,7 +1417,7 @@ int HP_libconfig_setting_lookup_int64(const config_setting_t *setting, const cha
retVal___ = HPMHooks.source.libconfig.setting_lookup_int64(setting, name, value);
}
if( HPMHooks.count.HP_libconfig_setting_lookup_int64_post ) {
- int (*postHookFunc) (int retVal___, const config_setting_t *setting, const char *name, long long *value);
+ int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, long long *value);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_int64_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_int64_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting, name, value);
@@ -1398,11 +1425,11 @@ int HP_libconfig_setting_lookup_int64(const config_setting_t *setting, const cha
}
return retVal___;
}
-int HP_libconfig_setting_lookup_float(const config_setting_t *setting, const char *name, double *value) {
+int HP_libconfig_setting_lookup_float(const struct config_setting_t *setting, const char *name, double *value) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_setting_lookup_float_pre ) {
- int (*preHookFunc) (const config_setting_t *setting, const char *name, double *value);
+ int (*preHookFunc) (const struct config_setting_t *setting, const char *name, double *value);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_float_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_float_pre[hIndex].func;
@@ -1417,7 +1444,7 @@ int HP_libconfig_setting_lookup_float(const config_setting_t *setting, const cha
retVal___ = HPMHooks.source.libconfig.setting_lookup_float(setting, name, value);
}
if( HPMHooks.count.HP_libconfig_setting_lookup_float_post ) {
- int (*postHookFunc) (int retVal___, const config_setting_t *setting, const char *name, double *value);
+ int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, double *value);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_float_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_float_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting, name, value);
@@ -1425,11 +1452,11 @@ int HP_libconfig_setting_lookup_float(const config_setting_t *setting, const cha
}
return retVal___;
}
-int HP_libconfig_setting_lookup_bool(const config_setting_t *setting, const char *name, int *value) {
+int HP_libconfig_setting_lookup_bool(const struct config_setting_t *setting, const char *name, int *value) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_setting_lookup_bool_pre ) {
- int (*preHookFunc) (const config_setting_t *setting, const char *name, int *value);
+ int (*preHookFunc) (const struct config_setting_t *setting, const char *name, int *value);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_bool_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_bool_pre[hIndex].func;
@@ -1444,7 +1471,7 @@ int HP_libconfig_setting_lookup_bool(const config_setting_t *setting, const char
retVal___ = HPMHooks.source.libconfig.setting_lookup_bool(setting, name, value);
}
if( HPMHooks.count.HP_libconfig_setting_lookup_bool_post ) {
- int (*postHookFunc) (int retVal___, const config_setting_t *setting, const char *name, int *value);
+ int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, int *value);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_bool_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_bool_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting, name, value);
@@ -1452,11 +1479,11 @@ int HP_libconfig_setting_lookup_bool(const config_setting_t *setting, const char
}
return retVal___;
}
-int HP_libconfig_setting_lookup_string(const config_setting_t *setting, const char *name, const char **value) {
+int HP_libconfig_setting_lookup_string(const struct config_setting_t *setting, const char *name, const char **value) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_setting_lookup_string_pre ) {
- int (*preHookFunc) (const config_setting_t *setting, const char *name, const char **value);
+ int (*preHookFunc) (const struct config_setting_t *setting, const char *name, const char **value);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_string_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_string_pre[hIndex].func;
@@ -1471,7 +1498,7 @@ int HP_libconfig_setting_lookup_string(const config_setting_t *setting, const ch
retVal___ = HPMHooks.source.libconfig.setting_lookup_string(setting, name, value);
}
if( HPMHooks.count.HP_libconfig_setting_lookup_string_post ) {
- int (*postHookFunc) (int retVal___, const config_setting_t *setting, const char *name, const char **value);
+ int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, const char **value);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_string_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_string_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting, name, value);
@@ -1479,11 +1506,11 @@ int HP_libconfig_setting_lookup_string(const config_setting_t *setting, const ch
}
return retVal___;
}
-int HP_libconfig_setting_set_int(config_setting_t *setting, int value) {
+int HP_libconfig_setting_set_int(struct config_setting_t *setting, int value) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_setting_set_int_pre ) {
- int (*preHookFunc) (config_setting_t *setting, int *value);
+ int (*preHookFunc) (struct config_setting_t *setting, int *value);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_set_int_pre[hIndex].func;
@@ -1498,7 +1525,7 @@ int HP_libconfig_setting_set_int(config_setting_t *setting, int value) {
retVal___ = HPMHooks.source.libconfig.setting_set_int(setting, value);
}
if( HPMHooks.count.HP_libconfig_setting_set_int_post ) {
- int (*postHookFunc) (int retVal___, config_setting_t *setting, int *value);
+ int (*postHookFunc) (int retVal___, struct config_setting_t *setting, int *value);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_set_int_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting, &value);
@@ -1506,11 +1533,11 @@ int HP_libconfig_setting_set_int(config_setting_t *setting, int value) {
}
return retVal___;
}
-int HP_libconfig_setting_set_int64(config_setting_t *setting, long long value) {
+int HP_libconfig_setting_set_int64(struct config_setting_t *setting, long long value) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_setting_set_int64_pre ) {
- int (*preHookFunc) (config_setting_t *setting, long long *value);
+ int (*preHookFunc) (struct config_setting_t *setting, long long *value);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int64_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_set_int64_pre[hIndex].func;
@@ -1525,7 +1552,7 @@ int HP_libconfig_setting_set_int64(config_setting_t *setting, long long value) {
retVal___ = HPMHooks.source.libconfig.setting_set_int64(setting, value);
}
if( HPMHooks.count.HP_libconfig_setting_set_int64_post ) {
- int (*postHookFunc) (int retVal___, config_setting_t *setting, long long *value);
+ int (*postHookFunc) (int retVal___, struct config_setting_t *setting, long long *value);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int64_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_set_int64_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting, &value);
@@ -1533,11 +1560,11 @@ int HP_libconfig_setting_set_int64(config_setting_t *setting, long long value) {
}
return retVal___;
}
-int HP_libconfig_setting_set_float(config_setting_t *setting, double value) {
+int HP_libconfig_setting_set_float(struct config_setting_t *setting, double value) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_setting_set_float_pre ) {
- int (*preHookFunc) (config_setting_t *setting, double *value);
+ int (*preHookFunc) (struct config_setting_t *setting, double *value);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_float_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_set_float_pre[hIndex].func;
@@ -1552,7 +1579,7 @@ int HP_libconfig_setting_set_float(config_setting_t *setting, double value) {
retVal___ = HPMHooks.source.libconfig.setting_set_float(setting, value);
}
if( HPMHooks.count.HP_libconfig_setting_set_float_post ) {
- int (*postHookFunc) (int retVal___, config_setting_t *setting, double *value);
+ int (*postHookFunc) (int retVal___, struct config_setting_t *setting, double *value);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_float_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_set_float_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting, &value);
@@ -1560,11 +1587,11 @@ int HP_libconfig_setting_set_float(config_setting_t *setting, double value) {
}
return retVal___;
}
-int HP_libconfig_setting_set_bool(config_setting_t *setting, int value) {
+int HP_libconfig_setting_set_bool(struct config_setting_t *setting, int value) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_setting_set_bool_pre ) {
- int (*preHookFunc) (config_setting_t *setting, int *value);
+ int (*preHookFunc) (struct config_setting_t *setting, int *value);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_bool_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_set_bool_pre[hIndex].func;
@@ -1579,7 +1606,7 @@ int HP_libconfig_setting_set_bool(config_setting_t *setting, int value) {
retVal___ = HPMHooks.source.libconfig.setting_set_bool(setting, value);
}
if( HPMHooks.count.HP_libconfig_setting_set_bool_post ) {
- int (*postHookFunc) (int retVal___, config_setting_t *setting, int *value);
+ int (*postHookFunc) (int retVal___, struct config_setting_t *setting, int *value);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_bool_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_set_bool_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting, &value);
@@ -1587,11 +1614,11 @@ int HP_libconfig_setting_set_bool(config_setting_t *setting, int value) {
}
return retVal___;
}
-int HP_libconfig_setting_set_string(config_setting_t *setting, const char *value) {
+int HP_libconfig_setting_set_string(struct config_setting_t *setting, const char *value) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_setting_set_string_pre ) {
- int (*preHookFunc) (config_setting_t *setting, const char *value);
+ int (*preHookFunc) (struct config_setting_t *setting, const char *value);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_string_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_set_string_pre[hIndex].func;
@@ -1606,7 +1633,7 @@ int HP_libconfig_setting_set_string(config_setting_t *setting, const char *value
retVal___ = HPMHooks.source.libconfig.setting_set_string(setting, value);
}
if( HPMHooks.count.HP_libconfig_setting_set_string_post ) {
- int (*postHookFunc) (int retVal___, config_setting_t *setting, const char *value);
+ int (*postHookFunc) (int retVal___, struct config_setting_t *setting, const char *value);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_string_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_set_string_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting, value);
@@ -1614,11 +1641,11 @@ int HP_libconfig_setting_set_string(config_setting_t *setting, const char *value
}
return retVal___;
}
-int HP_libconfig_setting_set_format(config_setting_t *setting, short format) {
+int HP_libconfig_setting_set_format(struct config_setting_t *setting, short format) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_setting_set_format_pre ) {
- int (*preHookFunc) (config_setting_t *setting, short *format);
+ int (*preHookFunc) (struct config_setting_t *setting, short *format);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_format_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_set_format_pre[hIndex].func;
@@ -1633,7 +1660,7 @@ int HP_libconfig_setting_set_format(config_setting_t *setting, short format) {
retVal___ = HPMHooks.source.libconfig.setting_set_format(setting, format);
}
if( HPMHooks.count.HP_libconfig_setting_set_format_post ) {
- int (*postHookFunc) (int retVal___, config_setting_t *setting, short *format);
+ int (*postHookFunc) (int retVal___, struct config_setting_t *setting, short *format);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_format_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_set_format_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting, &format);
@@ -1641,11 +1668,11 @@ int HP_libconfig_setting_set_format(config_setting_t *setting, short format) {
}
return retVal___;
}
-short HP_libconfig_setting_get_format(const config_setting_t *setting) {
+short HP_libconfig_setting_get_format(const struct config_setting_t *setting) {
int hIndex = 0;
short retVal___ = 0;
if( HPMHooks.count.HP_libconfig_setting_get_format_pre ) {
- short (*preHookFunc) (const config_setting_t *setting);
+ short (*preHookFunc) (const struct config_setting_t *setting);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_format_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_get_format_pre[hIndex].func;
@@ -1660,7 +1687,7 @@ short HP_libconfig_setting_get_format(const config_setting_t *setting) {
retVal___ = HPMHooks.source.libconfig.setting_get_format(setting);
}
if( HPMHooks.count.HP_libconfig_setting_get_format_post ) {
- short (*postHookFunc) (short retVal___, const config_setting_t *setting);
+ short (*postHookFunc) (short retVal___, const struct config_setting_t *setting);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_format_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_get_format_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting);
@@ -1668,11 +1695,11 @@ short HP_libconfig_setting_get_format(const config_setting_t *setting) {
}
return retVal___;
}
-int HP_libconfig_setting_get_int_elem(const config_setting_t *setting, int idx) {
+int HP_libconfig_setting_get_int_elem(const struct config_setting_t *setting, int idx) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_setting_get_int_elem_pre ) {
- int (*preHookFunc) (const config_setting_t *setting, int *idx);
+ int (*preHookFunc) (const struct config_setting_t *setting, int *idx);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int_elem_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_get_int_elem_pre[hIndex].func;
@@ -1687,7 +1714,7 @@ int HP_libconfig_setting_get_int_elem(const config_setting_t *setting, int idx)
retVal___ = HPMHooks.source.libconfig.setting_get_int_elem(setting, idx);
}
if( HPMHooks.count.HP_libconfig_setting_get_int_elem_post ) {
- int (*postHookFunc) (int retVal___, const config_setting_t *setting, int *idx);
+ int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, int *idx);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int_elem_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_get_int_elem_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting, &idx);
@@ -1695,11 +1722,11 @@ int HP_libconfig_setting_get_int_elem(const config_setting_t *setting, int idx)
}
return retVal___;
}
-long long HP_libconfig_setting_get_int64_elem(const config_setting_t *setting, int idx) {
+long long HP_libconfig_setting_get_int64_elem(const struct config_setting_t *setting, int idx) {
int hIndex = 0;
long long retVal___ = 0;
if( HPMHooks.count.HP_libconfig_setting_get_int64_elem_pre ) {
- long long (*preHookFunc) (const config_setting_t *setting, int *idx);
+ long long (*preHookFunc) (const struct config_setting_t *setting, int *idx);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int64_elem_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_get_int64_elem_pre[hIndex].func;
@@ -1714,7 +1741,7 @@ long long HP_libconfig_setting_get_int64_elem(const config_setting_t *setting, i
retVal___ = HPMHooks.source.libconfig.setting_get_int64_elem(setting, idx);
}
if( HPMHooks.count.HP_libconfig_setting_get_int64_elem_post ) {
- long long (*postHookFunc) (long long retVal___, const config_setting_t *setting, int *idx);
+ long long (*postHookFunc) (long long retVal___, const struct config_setting_t *setting, int *idx);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int64_elem_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_get_int64_elem_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting, &idx);
@@ -1722,11 +1749,11 @@ long long HP_libconfig_setting_get_int64_elem(const config_setting_t *setting, i
}
return retVal___;
}
-double HP_libconfig_setting_get_float_elem(const config_setting_t *setting, int idx) {
+double HP_libconfig_setting_get_float_elem(const struct config_setting_t *setting, int idx) {
int hIndex = 0;
double retVal___ = 0.;
if( HPMHooks.count.HP_libconfig_setting_get_float_elem_pre ) {
- double (*preHookFunc) (const config_setting_t *setting, int *idx);
+ double (*preHookFunc) (const struct config_setting_t *setting, int *idx);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_float_elem_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_get_float_elem_pre[hIndex].func;
@@ -1741,7 +1768,7 @@ double HP_libconfig_setting_get_float_elem(const config_setting_t *setting, int
retVal___ = HPMHooks.source.libconfig.setting_get_float_elem(setting, idx);
}
if( HPMHooks.count.HP_libconfig_setting_get_float_elem_post ) {
- double (*postHookFunc) (double retVal___, const config_setting_t *setting, int *idx);
+ double (*postHookFunc) (double retVal___, const struct config_setting_t *setting, int *idx);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_float_elem_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_get_float_elem_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting, &idx);
@@ -1749,11 +1776,11 @@ double HP_libconfig_setting_get_float_elem(const config_setting_t *setting, int
}
return retVal___;
}
-int HP_libconfig_setting_get_bool_elem(const config_setting_t *setting, int idx) {
+int HP_libconfig_setting_get_bool_elem(const struct config_setting_t *setting, int idx) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_setting_get_bool_elem_pre ) {
- int (*preHookFunc) (const config_setting_t *setting, int *idx);
+ int (*preHookFunc) (const struct config_setting_t *setting, int *idx);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_bool_elem_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_get_bool_elem_pre[hIndex].func;
@@ -1768,7 +1795,7 @@ int HP_libconfig_setting_get_bool_elem(const config_setting_t *setting, int idx)
retVal___ = HPMHooks.source.libconfig.setting_get_bool_elem(setting, idx);
}
if( HPMHooks.count.HP_libconfig_setting_get_bool_elem_post ) {
- int (*postHookFunc) (int retVal___, const config_setting_t *setting, int *idx);
+ int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, int *idx);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_bool_elem_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_get_bool_elem_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting, &idx);
@@ -1776,11 +1803,11 @@ int HP_libconfig_setting_get_bool_elem(const config_setting_t *setting, int idx)
}
return retVal___;
}
-const char* HP_libconfig_setting_get_string_elem(const config_setting_t *setting, int idx) {
+const char* HP_libconfig_setting_get_string_elem(const struct config_setting_t *setting, int idx) {
int hIndex = 0;
const char* retVal___ = NULL;
if( HPMHooks.count.HP_libconfig_setting_get_string_elem_pre ) {
- const char* (*preHookFunc) (const config_setting_t *setting, int *idx);
+ const char* (*preHookFunc) (const struct config_setting_t *setting, int *idx);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_string_elem_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_get_string_elem_pre[hIndex].func;
@@ -1795,7 +1822,7 @@ const char* HP_libconfig_setting_get_string_elem(const config_setting_t *setting
retVal___ = HPMHooks.source.libconfig.setting_get_string_elem(setting, idx);
}
if( HPMHooks.count.HP_libconfig_setting_get_string_elem_post ) {
- const char* (*postHookFunc) (const char* retVal___, const config_setting_t *setting, int *idx);
+ const char* (*postHookFunc) (const char* retVal___, const struct config_setting_t *setting, int *idx);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_string_elem_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_get_string_elem_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting, &idx);
@@ -1803,11 +1830,11 @@ const char* HP_libconfig_setting_get_string_elem(const config_setting_t *setting
}
return retVal___;
}
-config_setting_t* HP_libconfig_setting_set_int_elem(config_setting_t *setting, int idx, int value) {
+struct config_setting_t* HP_libconfig_setting_set_int_elem(struct config_setting_t *setting, int idx, int value) {
int hIndex = 0;
- config_setting_t* retVal___ = NULL;
+ struct config_setting_t* retVal___ = NULL;
if( HPMHooks.count.HP_libconfig_setting_set_int_elem_pre ) {
- config_setting_t* (*preHookFunc) (config_setting_t *setting, int *idx, int *value);
+ struct config_setting_t* (*preHookFunc) (struct config_setting_t *setting, int *idx, int *value);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int_elem_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_set_int_elem_pre[hIndex].func;
@@ -1822,7 +1849,7 @@ config_setting_t* HP_libconfig_setting_set_int_elem(config_setting_t *setting, i
retVal___ = HPMHooks.source.libconfig.setting_set_int_elem(setting, idx, value);
}
if( HPMHooks.count.HP_libconfig_setting_set_int_elem_post ) {
- config_setting_t* (*postHookFunc) (config_setting_t* retVal___, config_setting_t *setting, int *idx, int *value);
+ struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int *idx, int *value);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int_elem_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_set_int_elem_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting, &idx, &value);
@@ -1830,11 +1857,11 @@ config_setting_t* HP_libconfig_setting_set_int_elem(config_setting_t *setting, i
}
return retVal___;
}
-config_setting_t* HP_libconfig_setting_set_int64_elem(config_setting_t *setting, int idx, long long value) {
+struct config_setting_t* HP_libconfig_setting_set_int64_elem(struct config_setting_t *setting, int idx, long long value) {
int hIndex = 0;
- config_setting_t* retVal___ = NULL;
+ struct config_setting_t* retVal___ = NULL;
if( HPMHooks.count.HP_libconfig_setting_set_int64_elem_pre ) {
- config_setting_t* (*preHookFunc) (config_setting_t *setting, int *idx, long long *value);
+ struct config_setting_t* (*preHookFunc) (struct config_setting_t *setting, int *idx, long long *value);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int64_elem_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_set_int64_elem_pre[hIndex].func;
@@ -1849,7 +1876,7 @@ config_setting_t* HP_libconfig_setting_set_int64_elem(config_setting_t *setting,
retVal___ = HPMHooks.source.libconfig.setting_set_int64_elem(setting, idx, value);
}
if( HPMHooks.count.HP_libconfig_setting_set_int64_elem_post ) {
- config_setting_t* (*postHookFunc) (config_setting_t* retVal___, config_setting_t *setting, int *idx, long long *value);
+ struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int *idx, long long *value);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int64_elem_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_set_int64_elem_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting, &idx, &value);
@@ -1857,11 +1884,11 @@ config_setting_t* HP_libconfig_setting_set_int64_elem(config_setting_t *setting,
}
return retVal___;
}
-config_setting_t* HP_libconfig_setting_set_float_elem(config_setting_t *setting, int idx, double value) {
+struct config_setting_t* HP_libconfig_setting_set_float_elem(struct config_setting_t *setting, int idx, double value) {
int hIndex = 0;
- config_setting_t* retVal___ = NULL;
+ struct config_setting_t* retVal___ = NULL;
if( HPMHooks.count.HP_libconfig_setting_set_float_elem_pre ) {
- config_setting_t* (*preHookFunc) (config_setting_t *setting, int *idx, double *value);
+ struct config_setting_t* (*preHookFunc) (struct config_setting_t *setting, int *idx, double *value);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_float_elem_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_set_float_elem_pre[hIndex].func;
@@ -1876,7 +1903,7 @@ config_setting_t* HP_libconfig_setting_set_float_elem(config_setting_t *setting,
retVal___ = HPMHooks.source.libconfig.setting_set_float_elem(setting, idx, value);
}
if( HPMHooks.count.HP_libconfig_setting_set_float_elem_post ) {
- config_setting_t* (*postHookFunc) (config_setting_t* retVal___, config_setting_t *setting, int *idx, double *value);
+ struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int *idx, double *value);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_float_elem_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_set_float_elem_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting, &idx, &value);
@@ -1884,11 +1911,11 @@ config_setting_t* HP_libconfig_setting_set_float_elem(config_setting_t *setting,
}
return retVal___;
}
-config_setting_t* HP_libconfig_setting_set_bool_elem(config_setting_t *setting, int idx, int value) {
+struct config_setting_t* HP_libconfig_setting_set_bool_elem(struct config_setting_t *setting, int idx, int value) {
int hIndex = 0;
- config_setting_t* retVal___ = NULL;
+ struct config_setting_t* retVal___ = NULL;
if( HPMHooks.count.HP_libconfig_setting_set_bool_elem_pre ) {
- config_setting_t* (*preHookFunc) (config_setting_t *setting, int *idx, int *value);
+ struct config_setting_t* (*preHookFunc) (struct config_setting_t *setting, int *idx, int *value);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_bool_elem_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_set_bool_elem_pre[hIndex].func;
@@ -1903,7 +1930,7 @@ config_setting_t* HP_libconfig_setting_set_bool_elem(config_setting_t *setting,
retVal___ = HPMHooks.source.libconfig.setting_set_bool_elem(setting, idx, value);
}
if( HPMHooks.count.HP_libconfig_setting_set_bool_elem_post ) {
- config_setting_t* (*postHookFunc) (config_setting_t* retVal___, config_setting_t *setting, int *idx, int *value);
+ struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int *idx, int *value);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_bool_elem_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_set_bool_elem_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting, &idx, &value);
@@ -1911,11 +1938,11 @@ config_setting_t* HP_libconfig_setting_set_bool_elem(config_setting_t *setting,
}
return retVal___;
}
-config_setting_t* HP_libconfig_setting_set_string_elem(config_setting_t *setting, int idx, const char *value) {
+struct config_setting_t* HP_libconfig_setting_set_string_elem(struct config_setting_t *setting, int idx, const char *value) {
int hIndex = 0;
- config_setting_t* retVal___ = NULL;
+ struct config_setting_t* retVal___ = NULL;
if( HPMHooks.count.HP_libconfig_setting_set_string_elem_pre ) {
- config_setting_t* (*preHookFunc) (config_setting_t *setting, int *idx, const char *value);
+ struct config_setting_t* (*preHookFunc) (struct config_setting_t *setting, int *idx, const char *value);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_string_elem_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_set_string_elem_pre[hIndex].func;
@@ -1930,7 +1957,7 @@ config_setting_t* HP_libconfig_setting_set_string_elem(config_setting_t *setting
retVal___ = HPMHooks.source.libconfig.setting_set_string_elem(setting, idx, value);
}
if( HPMHooks.count.HP_libconfig_setting_set_string_elem_post ) {
- config_setting_t* (*postHookFunc) (config_setting_t* retVal___, config_setting_t *setting, int *idx, const char *value);
+ struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int *idx, const char *value);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_string_elem_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_set_string_elem_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting, &idx, value);
@@ -1938,11 +1965,11 @@ config_setting_t* HP_libconfig_setting_set_string_elem(config_setting_t *setting
}
return retVal___;
}
-int HP_libconfig_setting_index(const config_setting_t *setting) {
+int HP_libconfig_setting_index(const struct config_setting_t *setting) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_setting_index_pre ) {
- int (*preHookFunc) (const config_setting_t *setting);
+ int (*preHookFunc) (const struct config_setting_t *setting);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_index_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_index_pre[hIndex].func;
@@ -1957,7 +1984,7 @@ int HP_libconfig_setting_index(const config_setting_t *setting) {
retVal___ = HPMHooks.source.libconfig.setting_index(setting);
}
if( HPMHooks.count.HP_libconfig_setting_index_post ) {
- int (*postHookFunc) (int retVal___, const config_setting_t *setting);
+ int (*postHookFunc) (int retVal___, const struct config_setting_t *setting);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_index_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_index_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting);
@@ -1965,11 +1992,11 @@ int HP_libconfig_setting_index(const config_setting_t *setting) {
}
return retVal___;
}
-int HP_libconfig_setting_length(const config_setting_t *setting) {
+int HP_libconfig_setting_length(const struct config_setting_t *setting) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_setting_length_pre ) {
- int (*preHookFunc) (const config_setting_t *setting);
+ int (*preHookFunc) (const struct config_setting_t *setting);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_length_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_length_pre[hIndex].func;
@@ -1984,7 +2011,7 @@ int HP_libconfig_setting_length(const config_setting_t *setting) {
retVal___ = HPMHooks.source.libconfig.setting_length(setting);
}
if( HPMHooks.count.HP_libconfig_setting_length_post ) {
- int (*postHookFunc) (int retVal___, const config_setting_t *setting);
+ int (*postHookFunc) (int retVal___, const struct config_setting_t *setting);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_length_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_length_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting);
@@ -1992,11 +2019,11 @@ int HP_libconfig_setting_length(const config_setting_t *setting) {
}
return retVal___;
}
-config_setting_t* HP_libconfig_setting_get_elem(const config_setting_t *setting, unsigned int idx) {
+struct config_setting_t* HP_libconfig_setting_get_elem(const struct config_setting_t *setting, unsigned int idx) {
int hIndex = 0;
- config_setting_t* retVal___ = NULL;
+ struct config_setting_t* retVal___ = NULL;
if( HPMHooks.count.HP_libconfig_setting_get_elem_pre ) {
- config_setting_t* (*preHookFunc) (const config_setting_t *setting, unsigned int *idx);
+ struct config_setting_t* (*preHookFunc) (const struct config_setting_t *setting, unsigned int *idx);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_elem_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_get_elem_pre[hIndex].func;
@@ -2011,7 +2038,7 @@ config_setting_t* HP_libconfig_setting_get_elem(const config_setting_t *setting,
retVal___ = HPMHooks.source.libconfig.setting_get_elem(setting, idx);
}
if( HPMHooks.count.HP_libconfig_setting_get_elem_post ) {
- config_setting_t* (*postHookFunc) (config_setting_t* retVal___, const config_setting_t *setting, unsigned int *idx);
+ struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, const struct config_setting_t *setting, unsigned int *idx);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_elem_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_get_elem_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting, &idx);
@@ -2019,11 +2046,11 @@ config_setting_t* HP_libconfig_setting_get_elem(const config_setting_t *setting,
}
return retVal___;
}
-config_setting_t* HP_libconfig_setting_get_member(const config_setting_t *setting, const char *name) {
+struct config_setting_t* HP_libconfig_setting_get_member(const struct config_setting_t *setting, const char *name) {
int hIndex = 0;
- config_setting_t* retVal___ = NULL;
+ struct config_setting_t* retVal___ = NULL;
if( HPMHooks.count.HP_libconfig_setting_get_member_pre ) {
- config_setting_t* (*preHookFunc) (const config_setting_t *setting, const char *name);
+ struct config_setting_t* (*preHookFunc) (const struct config_setting_t *setting, const char *name);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_member_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_get_member_pre[hIndex].func;
@@ -2038,7 +2065,7 @@ config_setting_t* HP_libconfig_setting_get_member(const config_setting_t *settin
retVal___ = HPMHooks.source.libconfig.setting_get_member(setting, name);
}
if( HPMHooks.count.HP_libconfig_setting_get_member_post ) {
- config_setting_t* (*postHookFunc) (config_setting_t* retVal___, const config_setting_t *setting, const char *name);
+ struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, const struct config_setting_t *setting, const char *name);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_member_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_get_member_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting, name);
@@ -2046,11 +2073,11 @@ config_setting_t* HP_libconfig_setting_get_member(const config_setting_t *settin
}
return retVal___;
}
-config_setting_t* HP_libconfig_setting_add(config_setting_t *parent, const char *name, int type) {
+struct config_setting_t* HP_libconfig_setting_add(struct config_setting_t *parent, const char *name, int type) {
int hIndex = 0;
- config_setting_t* retVal___ = NULL;
+ struct config_setting_t* retVal___ = NULL;
if( HPMHooks.count.HP_libconfig_setting_add_pre ) {
- config_setting_t* (*preHookFunc) (config_setting_t *parent, const char *name, int *type);
+ struct config_setting_t* (*preHookFunc) (struct config_setting_t *parent, const char *name, int *type);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_add_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_add_pre[hIndex].func;
@@ -2065,7 +2092,7 @@ config_setting_t* HP_libconfig_setting_add(config_setting_t *parent, const char
retVal___ = HPMHooks.source.libconfig.setting_add(parent, name, type);
}
if( HPMHooks.count.HP_libconfig_setting_add_post ) {
- config_setting_t* (*postHookFunc) (config_setting_t* retVal___, config_setting_t *parent, const char *name, int *type);
+ struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *parent, const char *name, int *type);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_add_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_add_post[hIndex].func;
retVal___ = postHookFunc(retVal___, parent, name, &type);
@@ -2073,11 +2100,11 @@ config_setting_t* HP_libconfig_setting_add(config_setting_t *parent, const char
}
return retVal___;
}
-int HP_libconfig_setting_remove(config_setting_t *parent, const char *name) {
+int HP_libconfig_setting_remove(struct config_setting_t *parent, const char *name) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_setting_remove_pre ) {
- int (*preHookFunc) (config_setting_t *parent, const char *name);
+ int (*preHookFunc) (struct config_setting_t *parent, const char *name);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_remove_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_remove_pre[hIndex].func;
@@ -2092,7 +2119,7 @@ int HP_libconfig_setting_remove(config_setting_t *parent, const char *name) {
retVal___ = HPMHooks.source.libconfig.setting_remove(parent, name);
}
if( HPMHooks.count.HP_libconfig_setting_remove_post ) {
- int (*postHookFunc) (int retVal___, config_setting_t *parent, const char *name);
+ int (*postHookFunc) (int retVal___, struct config_setting_t *parent, const char *name);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_remove_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_remove_post[hIndex].func;
retVal___ = postHookFunc(retVal___, parent, name);
@@ -2100,11 +2127,11 @@ int HP_libconfig_setting_remove(config_setting_t *parent, const char *name) {
}
return retVal___;
}
-int HP_libconfig_setting_remove_elem(config_setting_t *parent, unsigned int idx) {
+int HP_libconfig_setting_remove_elem(struct config_setting_t *parent, unsigned int idx) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_setting_remove_elem_pre ) {
- int (*preHookFunc) (config_setting_t *parent, unsigned int *idx);
+ int (*preHookFunc) (struct config_setting_t *parent, unsigned int *idx);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_remove_elem_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_remove_elem_pre[hIndex].func;
@@ -2119,7 +2146,7 @@ int HP_libconfig_setting_remove_elem(config_setting_t *parent, unsigned int idx)
retVal___ = HPMHooks.source.libconfig.setting_remove_elem(parent, idx);
}
if( HPMHooks.count.HP_libconfig_setting_remove_elem_post ) {
- int (*postHookFunc) (int retVal___, config_setting_t *parent, unsigned int *idx);
+ int (*postHookFunc) (int retVal___, struct config_setting_t *parent, unsigned int *idx);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_remove_elem_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_remove_elem_post[hIndex].func;
retVal___ = postHookFunc(retVal___, parent, &idx);
@@ -2127,10 +2154,10 @@ int HP_libconfig_setting_remove_elem(config_setting_t *parent, unsigned int idx)
}
return retVal___;
}
-void HP_libconfig_setting_set_hook(config_setting_t *setting, void *hook) {
+void HP_libconfig_setting_set_hook(struct config_setting_t *setting, void *hook) {
int hIndex = 0;
if( HPMHooks.count.HP_libconfig_setting_set_hook_pre ) {
- void (*preHookFunc) (config_setting_t *setting, void *hook);
+ void (*preHookFunc) (struct config_setting_t *setting, void *hook);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_hook_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_set_hook_pre[hIndex].func;
@@ -2145,7 +2172,7 @@ void HP_libconfig_setting_set_hook(config_setting_t *setting, void *hook) {
HPMHooks.source.libconfig.setting_set_hook(setting, hook);
}
if( HPMHooks.count.HP_libconfig_setting_set_hook_post ) {
- void (*postHookFunc) (config_setting_t *setting, void *hook);
+ void (*postHookFunc) (struct config_setting_t *setting, void *hook);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_hook_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_set_hook_post[hIndex].func;
postHookFunc(setting, hook);
@@ -2153,11 +2180,11 @@ void HP_libconfig_setting_set_hook(config_setting_t *setting, void *hook) {
}
return;
}
-config_setting_t* HP_libconfig_lookup(const config_t *config, const char *filepath) {
+struct config_setting_t* HP_libconfig_lookup(const struct config_t *config, const char *filepath) {
int hIndex = 0;
- config_setting_t* retVal___ = NULL;
+ struct config_setting_t* retVal___ = NULL;
if( HPMHooks.count.HP_libconfig_lookup_pre ) {
- config_setting_t* (*preHookFunc) (const config_t *config, const char *filepath);
+ struct config_setting_t* (*preHookFunc) (const struct config_t *config, const char *filepath);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_lookup_pre[hIndex].func;
@@ -2172,7 +2199,7 @@ config_setting_t* HP_libconfig_lookup(const config_t *config, const char *filepa
retVal___ = HPMHooks.source.libconfig.lookup(config, filepath);
}
if( HPMHooks.count.HP_libconfig_lookup_post ) {
- config_setting_t* (*postHookFunc) (config_setting_t* retVal___, const config_t *config, const char *filepath);
+ struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, const struct config_t *config, const char *filepath);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_lookup_post[hIndex].func;
retVal___ = postHookFunc(retVal___, config, filepath);
@@ -2180,38 +2207,11 @@ config_setting_t* HP_libconfig_lookup(const config_t *config, const char *filepa
}
return retVal___;
}
-config_setting_t* HP_libconfig_lookup_from(config_setting_t *setting, const char *filepath) {
- int hIndex = 0;
- config_setting_t* retVal___ = NULL;
- if( HPMHooks.count.HP_libconfig_lookup_from_pre ) {
- config_setting_t* (*preHookFunc) (config_setting_t *setting, const char *filepath);
- *HPMforce_return = false;
- for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_from_pre; hIndex++ ) {
- preHookFunc = HPMHooks.list.HP_libconfig_lookup_from_pre[hIndex].func;
- retVal___ = preHookFunc(setting, filepath);
- }
- if( *HPMforce_return ) {
- *HPMforce_return = false;
- return retVal___;
- }
- }
- {
- retVal___ = HPMHooks.source.libconfig.lookup_from(setting, filepath);
- }
- if( HPMHooks.count.HP_libconfig_lookup_from_post ) {
- config_setting_t* (*postHookFunc) (config_setting_t* retVal___, config_setting_t *setting, const char *filepath);
- for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_from_post; hIndex++ ) {
- postHookFunc = HPMHooks.list.HP_libconfig_lookup_from_post[hIndex].func;
- retVal___ = postHookFunc(retVal___, setting, filepath);
- }
- }
- return retVal___;
-}
-int HP_libconfig_lookup_int(const config_t *config, const char *filepath, int *value) {
+int HP_libconfig_lookup_int(const struct config_t *config, const char *filepath, int *value) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_lookup_int_pre ) {
- int (*preHookFunc) (const config_t *config, const char *filepath, int *value);
+ int (*preHookFunc) (const struct config_t *config, const char *filepath, int *value);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_int_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_lookup_int_pre[hIndex].func;
@@ -2226,7 +2226,7 @@ int HP_libconfig_lookup_int(const config_t *config, const char *filepath, int *v
retVal___ = HPMHooks.source.libconfig.lookup_int(config, filepath, value);
}
if( HPMHooks.count.HP_libconfig_lookup_int_post ) {
- int (*postHookFunc) (int retVal___, const config_t *config, const char *filepath, int *value);
+ int (*postHookFunc) (int retVal___, const struct config_t *config, const char *filepath, int *value);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_int_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_lookup_int_post[hIndex].func;
retVal___ = postHookFunc(retVal___, config, filepath, value);
@@ -2234,11 +2234,11 @@ int HP_libconfig_lookup_int(const config_t *config, const char *filepath, int *v
}
return retVal___;
}
-int HP_libconfig_lookup_int64(const config_t *config, const char *filepath, long long *value) {
+int HP_libconfig_lookup_int64(const struct config_t *config, const char *filepath, long long *value) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_lookup_int64_pre ) {
- int (*preHookFunc) (const config_t *config, const char *filepath, long long *value);
+ int (*preHookFunc) (const struct config_t *config, const char *filepath, long long *value);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_int64_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_lookup_int64_pre[hIndex].func;
@@ -2253,7 +2253,7 @@ int HP_libconfig_lookup_int64(const config_t *config, const char *filepath, long
retVal___ = HPMHooks.source.libconfig.lookup_int64(config, filepath, value);
}
if( HPMHooks.count.HP_libconfig_lookup_int64_post ) {
- int (*postHookFunc) (int retVal___, const config_t *config, const char *filepath, long long *value);
+ int (*postHookFunc) (int retVal___, const struct config_t *config, const char *filepath, long long *value);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_int64_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_lookup_int64_post[hIndex].func;
retVal___ = postHookFunc(retVal___, config, filepath, value);
@@ -2261,11 +2261,11 @@ int HP_libconfig_lookup_int64(const config_t *config, const char *filepath, long
}
return retVal___;
}
-int HP_libconfig_lookup_float(const config_t *config, const char *filepath, double *value) {
+int HP_libconfig_lookup_float(const struct config_t *config, const char *filepath, double *value) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_lookup_float_pre ) {
- int (*preHookFunc) (const config_t *config, const char *filepath, double *value);
+ int (*preHookFunc) (const struct config_t *config, const char *filepath, double *value);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_float_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_lookup_float_pre[hIndex].func;
@@ -2280,7 +2280,7 @@ int HP_libconfig_lookup_float(const config_t *config, const char *filepath, doub
retVal___ = HPMHooks.source.libconfig.lookup_float(config, filepath, value);
}
if( HPMHooks.count.HP_libconfig_lookup_float_post ) {
- int (*postHookFunc) (int retVal___, const config_t *config, const char *filepath, double *value);
+ int (*postHookFunc) (int retVal___, const struct config_t *config, const char *filepath, double *value);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_float_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_lookup_float_post[hIndex].func;
retVal___ = postHookFunc(retVal___, config, filepath, value);
@@ -2288,11 +2288,11 @@ int HP_libconfig_lookup_float(const config_t *config, const char *filepath, doub
}
return retVal___;
}
-int HP_libconfig_lookup_bool(const config_t *config, const char *filepath, int *value) {
+int HP_libconfig_lookup_bool(const struct config_t *config, const char *filepath, int *value) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_lookup_bool_pre ) {
- int (*preHookFunc) (const config_t *config, const char *filepath, int *value);
+ int (*preHookFunc) (const struct config_t *config, const char *filepath, int *value);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_bool_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_lookup_bool_pre[hIndex].func;
@@ -2307,7 +2307,7 @@ int HP_libconfig_lookup_bool(const config_t *config, const char *filepath, int *
retVal___ = HPMHooks.source.libconfig.lookup_bool(config, filepath, value);
}
if( HPMHooks.count.HP_libconfig_lookup_bool_post ) {
- int (*postHookFunc) (int retVal___, const config_t *config, const char *filepath, int *value);
+ int (*postHookFunc) (int retVal___, const struct config_t *config, const char *filepath, int *value);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_bool_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_lookup_bool_post[hIndex].func;
retVal___ = postHookFunc(retVal___, config, filepath, value);
@@ -2315,11 +2315,11 @@ int HP_libconfig_lookup_bool(const config_t *config, const char *filepath, int *
}
return retVal___;
}
-int HP_libconfig_lookup_string(const config_t *config, const char *filepath, const char **value) {
+int HP_libconfig_lookup_string(const struct config_t *config, const char *filepath, const char **value) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_lookup_string_pre ) {
- int (*preHookFunc) (const config_t *config, const char *filepath, const char **value);
+ int (*preHookFunc) (const struct config_t *config, const char *filepath, const char **value);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_string_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_lookup_string_pre[hIndex].func;
@@ -2334,7 +2334,7 @@ int HP_libconfig_lookup_string(const config_t *config, const char *filepath, con
retVal___ = HPMHooks.source.libconfig.lookup_string(config, filepath, value);
}
if( HPMHooks.count.HP_libconfig_lookup_string_post ) {
- int (*postHookFunc) (int retVal___, const config_t *config, const char *filepath, const char **value);
+ int (*postHookFunc) (int retVal___, const struct config_t *config, const char *filepath, const char **value);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_string_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_lookup_string_post[hIndex].func;
retVal___ = postHookFunc(retVal___, config, filepath, value);
@@ -2342,14 +2342,14 @@ int HP_libconfig_lookup_string(const config_t *config, const char *filepath, con
}
return retVal___;
}
-int HP_libconfig_read_file(config_t *config, const char *config_filename) {
+int HP_libconfig_load_file(struct config_t *config, const char *config_filename) {
int hIndex = 0;
int retVal___ = 0;
- if( HPMHooks.count.HP_libconfig_read_file_pre ) {
- int (*preHookFunc) (config_t *config, const char *config_filename);
+ if( HPMHooks.count.HP_libconfig_load_file_pre ) {
+ int (*preHookFunc) (struct config_t *config, const char *config_filename);
*HPMforce_return = false;
- for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_read_file_pre; hIndex++ ) {
- preHookFunc = HPMHooks.list.HP_libconfig_read_file_pre[hIndex].func;
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_load_file_pre; hIndex++ ) {
+ preHookFunc = HPMHooks.list.HP_libconfig_load_file_pre[hIndex].func;
retVal___ = preHookFunc(config, config_filename);
}
if( *HPMforce_return ) {
@@ -2358,21 +2358,21 @@ int HP_libconfig_read_file(config_t *config, const char *config_filename) {
}
}
{
- retVal___ = HPMHooks.source.libconfig.read_file(config, config_filename);
+ retVal___ = HPMHooks.source.libconfig.load_file(config, config_filename);
}
- if( HPMHooks.count.HP_libconfig_read_file_post ) {
- int (*postHookFunc) (int retVal___, config_t *config, const char *config_filename);
- for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_read_file_post; hIndex++ ) {
- postHookFunc = HPMHooks.list.HP_libconfig_read_file_post[hIndex].func;
+ if( HPMHooks.count.HP_libconfig_load_file_post ) {
+ int (*postHookFunc) (int retVal___, struct config_t *config, const char *config_filename);
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_load_file_post; hIndex++ ) {
+ postHookFunc = HPMHooks.list.HP_libconfig_load_file_post[hIndex].func;
retVal___ = postHookFunc(retVal___, config, config_filename);
}
}
return retVal___;
}
-void HP_libconfig_setting_copy_simple(config_setting_t *parent, const config_setting_t *src) {
+void HP_libconfig_setting_copy_simple(struct config_setting_t *parent, const struct config_setting_t *src) {
int hIndex = 0;
if( HPMHooks.count.HP_libconfig_setting_copy_simple_pre ) {
- void (*preHookFunc) (config_setting_t *parent, const config_setting_t *src);
+ void (*preHookFunc) (struct config_setting_t *parent, const struct config_setting_t *src);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_copy_simple_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_copy_simple_pre[hIndex].func;
@@ -2387,7 +2387,7 @@ void HP_libconfig_setting_copy_simple(config_setting_t *parent, const config_set
HPMHooks.source.libconfig.setting_copy_simple(parent, src);
}
if( HPMHooks.count.HP_libconfig_setting_copy_simple_post ) {
- void (*postHookFunc) (config_setting_t *parent, const config_setting_t *src);
+ void (*postHookFunc) (struct config_setting_t *parent, const struct config_setting_t *src);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_copy_simple_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_copy_simple_post[hIndex].func;
postHookFunc(parent, src);
@@ -2395,10 +2395,10 @@ void HP_libconfig_setting_copy_simple(config_setting_t *parent, const config_set
}
return;
}
-void HP_libconfig_setting_copy_elem(config_setting_t *parent, const config_setting_t *src) {
+void HP_libconfig_setting_copy_elem(struct config_setting_t *parent, const struct config_setting_t *src) {
int hIndex = 0;
if( HPMHooks.count.HP_libconfig_setting_copy_elem_pre ) {
- void (*preHookFunc) (config_setting_t *parent, const config_setting_t *src);
+ void (*preHookFunc) (struct config_setting_t *parent, const struct config_setting_t *src);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_copy_elem_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_copy_elem_pre[hIndex].func;
@@ -2413,7 +2413,7 @@ void HP_libconfig_setting_copy_elem(config_setting_t *parent, const config_setti
HPMHooks.source.libconfig.setting_copy_elem(parent, src);
}
if( HPMHooks.count.HP_libconfig_setting_copy_elem_post ) {
- void (*postHookFunc) (config_setting_t *parent, const config_setting_t *src);
+ void (*postHookFunc) (struct config_setting_t *parent, const struct config_setting_t *src);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_copy_elem_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_copy_elem_post[hIndex].func;
postHookFunc(parent, src);
@@ -2421,10 +2421,10 @@ void HP_libconfig_setting_copy_elem(config_setting_t *parent, const config_setti
}
return;
}
-void HP_libconfig_setting_copy_aggregate(config_setting_t *parent, const config_setting_t *src) {
+void HP_libconfig_setting_copy_aggregate(struct config_setting_t *parent, const struct config_setting_t *src) {
int hIndex = 0;
if( HPMHooks.count.HP_libconfig_setting_copy_aggregate_pre ) {
- void (*preHookFunc) (config_setting_t *parent, const config_setting_t *src);
+ void (*preHookFunc) (struct config_setting_t *parent, const struct config_setting_t *src);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_copy_aggregate_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_copy_aggregate_pre[hIndex].func;
@@ -2439,7 +2439,7 @@ void HP_libconfig_setting_copy_aggregate(config_setting_t *parent, const config_
HPMHooks.source.libconfig.setting_copy_aggregate(parent, src);
}
if( HPMHooks.count.HP_libconfig_setting_copy_aggregate_post ) {
- void (*postHookFunc) (config_setting_t *parent, const config_setting_t *src);
+ void (*postHookFunc) (struct config_setting_t *parent, const struct config_setting_t *src);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_copy_aggregate_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_copy_aggregate_post[hIndex].func;
postHookFunc(parent, src);
@@ -2447,11 +2447,11 @@ void HP_libconfig_setting_copy_aggregate(config_setting_t *parent, const config_
}
return;
}
-int HP_libconfig_setting_copy(config_setting_t *parent, const config_setting_t *src) {
+int HP_libconfig_setting_copy(struct config_setting_t *parent, const struct config_setting_t *src) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_setting_copy_pre ) {
- int (*preHookFunc) (config_setting_t *parent, const config_setting_t *src);
+ int (*preHookFunc) (struct config_setting_t *parent, const struct config_setting_t *src);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_copy_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_copy_pre[hIndex].func;
@@ -2466,7 +2466,7 @@ int HP_libconfig_setting_copy(config_setting_t *parent, const config_setting_t *
retVal___ = HPMHooks.source.libconfig.setting_copy(parent, src);
}
if( HPMHooks.count.HP_libconfig_setting_copy_post ) {
- int (*postHookFunc) (int retVal___, config_setting_t *parent, const config_setting_t *src);
+ int (*postHookFunc) (int retVal___, struct config_setting_t *parent, const struct config_setting_t *src);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_copy_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_copy_post[hIndex].func;
retVal___ = postHookFunc(retVal___, parent, src);
@@ -2474,6 +2474,276 @@ int HP_libconfig_setting_copy(config_setting_t *parent, const config_setting_t *
}
return retVal___;
}
+bool HP_libconfig_setting_get_bool_real(const struct config_setting_t *setting) {
+ int hIndex = 0;
+ bool retVal___ = false;
+ if( HPMHooks.count.HP_libconfig_setting_get_bool_real_pre ) {
+ bool (*preHookFunc) (const struct config_setting_t *setting);
+ *HPMforce_return = false;
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_bool_real_pre; hIndex++ ) {
+ preHookFunc = HPMHooks.list.HP_libconfig_setting_get_bool_real_pre[hIndex].func;
+ retVal___ = preHookFunc(setting);
+ }
+ if( *HPMforce_return ) {
+ *HPMforce_return = false;
+ return retVal___;
+ }
+ }
+ {
+ retVal___ = HPMHooks.source.libconfig.setting_get_bool_real(setting);
+ }
+ if( HPMHooks.count.HP_libconfig_setting_get_bool_real_post ) {
+ bool (*postHookFunc) (bool retVal___, const struct config_setting_t *setting);
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_bool_real_post; hIndex++ ) {
+ postHookFunc = HPMHooks.list.HP_libconfig_setting_get_bool_real_post[hIndex].func;
+ retVal___ = postHookFunc(retVal___, setting);
+ }
+ }
+ return retVal___;
+}
+uint32 HP_libconfig_setting_get_uint32(const struct config_setting_t *setting) {
+ int hIndex = 0;
+ uint32 retVal___ = 0;
+ if( HPMHooks.count.HP_libconfig_setting_get_uint32_pre ) {
+ uint32 (*preHookFunc) (const struct config_setting_t *setting);
+ *HPMforce_return = false;
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_uint32_pre; hIndex++ ) {
+ preHookFunc = HPMHooks.list.HP_libconfig_setting_get_uint32_pre[hIndex].func;
+ retVal___ = preHookFunc(setting);
+ }
+ if( *HPMforce_return ) {
+ *HPMforce_return = false;
+ return retVal___;
+ }
+ }
+ {
+ retVal___ = HPMHooks.source.libconfig.setting_get_uint32(setting);
+ }
+ if( HPMHooks.count.HP_libconfig_setting_get_uint32_post ) {
+ uint32 (*postHookFunc) (uint32 retVal___, const struct config_setting_t *setting);
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_uint32_post; hIndex++ ) {
+ postHookFunc = HPMHooks.list.HP_libconfig_setting_get_uint32_post[hIndex].func;
+ retVal___ = postHookFunc(retVal___, setting);
+ }
+ }
+ return retVal___;
+}
+uint16 HP_libconfig_setting_get_uint16(const struct config_setting_t *setting) {
+ int hIndex = 0;
+ uint16 retVal___ = 0;
+ if( HPMHooks.count.HP_libconfig_setting_get_uint16_pre ) {
+ uint16 (*preHookFunc) (const struct config_setting_t *setting);
+ *HPMforce_return = false;
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_uint16_pre; hIndex++ ) {
+ preHookFunc = HPMHooks.list.HP_libconfig_setting_get_uint16_pre[hIndex].func;
+ retVal___ = preHookFunc(setting);
+ }
+ if( *HPMforce_return ) {
+ *HPMforce_return = false;
+ return retVal___;
+ }
+ }
+ {
+ retVal___ = HPMHooks.source.libconfig.setting_get_uint16(setting);
+ }
+ if( HPMHooks.count.HP_libconfig_setting_get_uint16_post ) {
+ uint16 (*postHookFunc) (uint16 retVal___, const struct config_setting_t *setting);
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_uint16_post; hIndex++ ) {
+ postHookFunc = HPMHooks.list.HP_libconfig_setting_get_uint16_post[hIndex].func;
+ retVal___ = postHookFunc(retVal___, setting);
+ }
+ }
+ return retVal___;
+}
+int16 HP_libconfig_setting_get_int16(const struct config_setting_t *setting) {
+ int hIndex = 0;
+ int16 retVal___ = 0;
+ if( HPMHooks.count.HP_libconfig_setting_get_int16_pre ) {
+ int16 (*preHookFunc) (const struct config_setting_t *setting);
+ *HPMforce_return = false;
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int16_pre; hIndex++ ) {
+ preHookFunc = HPMHooks.list.HP_libconfig_setting_get_int16_pre[hIndex].func;
+ retVal___ = preHookFunc(setting);
+ }
+ if( *HPMforce_return ) {
+ *HPMforce_return = false;
+ return retVal___;
+ }
+ }
+ {
+ retVal___ = HPMHooks.source.libconfig.setting_get_int16(setting);
+ }
+ if( HPMHooks.count.HP_libconfig_setting_get_int16_post ) {
+ int16 (*postHookFunc) (int16 retVal___, const struct config_setting_t *setting);
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int16_post; hIndex++ ) {
+ postHookFunc = HPMHooks.list.HP_libconfig_setting_get_int16_post[hIndex].func;
+ retVal___ = postHookFunc(retVal___, setting);
+ }
+ }
+ return retVal___;
+}
+int HP_libconfig_setting_lookup_bool_real(const struct config_setting_t *setting, const char *name, bool *value) {
+ int hIndex = 0;
+ int retVal___ = 0;
+ if( HPMHooks.count.HP_libconfig_setting_lookup_bool_real_pre ) {
+ int (*preHookFunc) (const struct config_setting_t *setting, const char *name, bool *value);
+ *HPMforce_return = false;
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_bool_real_pre; hIndex++ ) {
+ preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_bool_real_pre[hIndex].func;
+ retVal___ = preHookFunc(setting, name, value);
+ }
+ if( *HPMforce_return ) {
+ *HPMforce_return = false;
+ return retVal___;
+ }
+ }
+ {
+ retVal___ = HPMHooks.source.libconfig.setting_lookup_bool_real(setting, name, value);
+ }
+ if( HPMHooks.count.HP_libconfig_setting_lookup_bool_real_post ) {
+ int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, bool *value);
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_bool_real_post; hIndex++ ) {
+ postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_bool_real_post[hIndex].func;
+ retVal___ = postHookFunc(retVal___, setting, name, value);
+ }
+ }
+ return retVal___;
+}
+int HP_libconfig_setting_lookup_uint32(const struct config_setting_t *setting, const char *name, uint32 *value) {
+ int hIndex = 0;
+ int retVal___ = 0;
+ if( HPMHooks.count.HP_libconfig_setting_lookup_uint32_pre ) {
+ int (*preHookFunc) (const struct config_setting_t *setting, const char *name, uint32 *value);
+ *HPMforce_return = false;
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_uint32_pre; hIndex++ ) {
+ preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_uint32_pre[hIndex].func;
+ retVal___ = preHookFunc(setting, name, value);
+ }
+ if( *HPMforce_return ) {
+ *HPMforce_return = false;
+ return retVal___;
+ }
+ }
+ {
+ retVal___ = HPMHooks.source.libconfig.setting_lookup_uint32(setting, name, value);
+ }
+ if( HPMHooks.count.HP_libconfig_setting_lookup_uint32_post ) {
+ int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, uint32 *value);
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_uint32_post; hIndex++ ) {
+ postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_uint32_post[hIndex].func;
+ retVal___ = postHookFunc(retVal___, setting, name, value);
+ }
+ }
+ return retVal___;
+}
+int HP_libconfig_setting_lookup_uint16(const struct config_setting_t *setting, const char *name, uint16 *value) {
+ int hIndex = 0;
+ int retVal___ = 0;
+ if( HPMHooks.count.HP_libconfig_setting_lookup_uint16_pre ) {
+ int (*preHookFunc) (const struct config_setting_t *setting, const char *name, uint16 *value);
+ *HPMforce_return = false;
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_uint16_pre; hIndex++ ) {
+ preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_uint16_pre[hIndex].func;
+ retVal___ = preHookFunc(setting, name, value);
+ }
+ if( *HPMforce_return ) {
+ *HPMforce_return = false;
+ return retVal___;
+ }
+ }
+ {
+ retVal___ = HPMHooks.source.libconfig.setting_lookup_uint16(setting, name, value);
+ }
+ if( HPMHooks.count.HP_libconfig_setting_lookup_uint16_post ) {
+ int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, uint16 *value);
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_uint16_post; hIndex++ ) {
+ postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_uint16_post[hIndex].func;
+ retVal___ = postHookFunc(retVal___, setting, name, value);
+ }
+ }
+ return retVal___;
+}
+int HP_libconfig_setting_lookup_int16(const struct config_setting_t *setting, const char *name, int16 *value) {
+ int hIndex = 0;
+ int retVal___ = 0;
+ if( HPMHooks.count.HP_libconfig_setting_lookup_int16_pre ) {
+ int (*preHookFunc) (const struct config_setting_t *setting, const char *name, int16 *value);
+ *HPMforce_return = false;
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_int16_pre; hIndex++ ) {
+ preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_int16_pre[hIndex].func;
+ retVal___ = preHookFunc(setting, name, value);
+ }
+ if( *HPMforce_return ) {
+ *HPMforce_return = false;
+ return retVal___;
+ }
+ }
+ {
+ retVal___ = HPMHooks.source.libconfig.setting_lookup_int16(setting, name, value);
+ }
+ if( HPMHooks.count.HP_libconfig_setting_lookup_int16_post ) {
+ int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, int16 *value);
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_int16_post; hIndex++ ) {
+ postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_int16_post[hIndex].func;
+ retVal___ = postHookFunc(retVal___, setting, name, value);
+ }
+ }
+ return retVal___;
+}
+int HP_libconfig_setting_lookup_mutable_string(const struct config_setting_t *setting, const char *name, char *out, size_t out_size) {
+ int hIndex = 0;
+ int retVal___ = 0;
+ if( HPMHooks.count.HP_libconfig_setting_lookup_mutable_string_pre ) {
+ int (*preHookFunc) (const struct config_setting_t *setting, const char *name, char *out, size_t *out_size);
+ *HPMforce_return = false;
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_mutable_string_pre; hIndex++ ) {
+ preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_mutable_string_pre[hIndex].func;
+ retVal___ = preHookFunc(setting, name, out, &out_size);
+ }
+ if( *HPMforce_return ) {
+ *HPMforce_return = false;
+ return retVal___;
+ }
+ }
+ {
+ retVal___ = HPMHooks.source.libconfig.setting_lookup_mutable_string(setting, name, out, out_size);
+ }
+ if( HPMHooks.count.HP_libconfig_setting_lookup_mutable_string_post ) {
+ int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, char *out, size_t *out_size);
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_mutable_string_post; hIndex++ ) {
+ postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_mutable_string_post[hIndex].func;
+ retVal___ = postHookFunc(retVal___, setting, name, out, &out_size);
+ }
+ }
+ return retVal___;
+}
+int HP_libconfig_lookup_mutable_string(const struct config_t *config, const char *name, char *out, size_t out_size) {
+ int hIndex = 0;
+ int retVal___ = 0;
+ if( HPMHooks.count.HP_libconfig_lookup_mutable_string_pre ) {
+ int (*preHookFunc) (const struct config_t *config, const char *name, char *out, size_t *out_size);
+ *HPMforce_return = false;
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_mutable_string_pre; hIndex++ ) {
+ preHookFunc = HPMHooks.list.HP_libconfig_lookup_mutable_string_pre[hIndex].func;
+ retVal___ = preHookFunc(config, name, out, &out_size);
+ }
+ if( *HPMforce_return ) {
+ *HPMforce_return = false;
+ return retVal___;
+ }
+ }
+ {
+ retVal___ = HPMHooks.source.libconfig.lookup_mutable_string(config, name, out, out_size);
+ }
+ if( HPMHooks.count.HP_libconfig_lookup_mutable_string_post ) {
+ int (*postHookFunc) (int retVal___, const struct config_t *config, const char *name, char *out, size_t *out_size);
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_mutable_string_post; hIndex++ ) {
+ postHookFunc = HPMHooks.list.HP_libconfig_lookup_mutable_string_post[hIndex].func;
+ retVal___ = postHookFunc(retVal___, config, name, out, &out_size);
+ }
+ }
+ return retVal___;
+}
/* login */
int HP_login_mmo_auth(struct login_session_data *sd, bool isServer) {
int hIndex = 0;
@@ -5146,11 +5416,11 @@ bool HP_sockt_trusted_ip_check(uint32 ip) {
}
return retVal___;
}
-int HP_sockt_net_config_read_sub(config_setting_t *t, struct s_subnet_vector *list, const char *filename, const char *groupname) {
+int HP_sockt_net_config_read_sub(struct config_setting_t *t, struct s_subnet_vector *list, const char *filename, const char *groupname) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_sockt_net_config_read_sub_pre ) {
- int (*preHookFunc) (config_setting_t *t, struct s_subnet_vector *list, const char *filename, const char *groupname);
+ int (*preHookFunc) (struct config_setting_t *t, struct s_subnet_vector *list, const char *filename, const char *groupname);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_net_config_read_sub_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_sockt_net_config_read_sub_pre[hIndex].func;
@@ -5165,7 +5435,7 @@ int HP_sockt_net_config_read_sub(config_setting_t *t, struct s_subnet_vector *li
retVal___ = HPMHooks.source.sockt.net_config_read_sub(t, list, filename, groupname);
}
if( HPMHooks.count.HP_sockt_net_config_read_sub_post ) {
- int (*postHookFunc) (int retVal___, config_setting_t *t, struct s_subnet_vector *list, const char *filename, const char *groupname);
+ int (*postHookFunc) (int retVal___, struct config_setting_t *t, struct s_subnet_vector *list, const char *filename, const char *groupname);
for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_net_config_read_sub_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_sockt_net_config_read_sub_post[hIndex].func;
retVal___ = postHookFunc(retVal___, t, list, filename, groupname);
diff --git a/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc b/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc
index 911e84586..d3210cbe7 100644
--- a/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc
@@ -2742,10 +2742,10 @@ struct {
struct HPMHookPoint *HP_libconfig_read_post;
struct HPMHookPoint *HP_libconfig_write_pre;
struct HPMHookPoint *HP_libconfig_write_post;
- struct HPMHookPoint *HP_libconfig_set_auto_convert_pre;
- struct HPMHookPoint *HP_libconfig_set_auto_convert_post;
- struct HPMHookPoint *HP_libconfig_get_auto_convert_pre;
- struct HPMHookPoint *HP_libconfig_get_auto_convert_post;
+ struct HPMHookPoint *HP_libconfig_set_options_pre;
+ struct HPMHookPoint *HP_libconfig_set_options_post;
+ struct HPMHookPoint *HP_libconfig_get_options_pre;
+ struct HPMHookPoint *HP_libconfig_get_options_post;
struct HPMHookPoint *HP_libconfig_read_string_pre;
struct HPMHookPoint *HP_libconfig_read_string_post;
struct HPMHookPoint *HP_libconfig_read_file_src_pre;
@@ -2770,6 +2770,8 @@ struct {
struct HPMHookPoint *HP_libconfig_setting_get_bool_post;
struct HPMHookPoint *HP_libconfig_setting_get_string_pre;
struct HPMHookPoint *HP_libconfig_setting_get_string_post;
+ struct HPMHookPoint *HP_libconfig_setting_lookup_pre;
+ struct HPMHookPoint *HP_libconfig_setting_lookup_post;
struct HPMHookPoint *HP_libconfig_setting_lookup_int_pre;
struct HPMHookPoint *HP_libconfig_setting_lookup_int_post;
struct HPMHookPoint *HP_libconfig_setting_lookup_int64_pre;
@@ -2832,8 +2834,6 @@ struct {
struct HPMHookPoint *HP_libconfig_setting_set_hook_post;
struct HPMHookPoint *HP_libconfig_lookup_pre;
struct HPMHookPoint *HP_libconfig_lookup_post;
- struct HPMHookPoint *HP_libconfig_lookup_from_pre;
- struct HPMHookPoint *HP_libconfig_lookup_from_post;
struct HPMHookPoint *HP_libconfig_lookup_int_pre;
struct HPMHookPoint *HP_libconfig_lookup_int_post;
struct HPMHookPoint *HP_libconfig_lookup_int64_pre;
@@ -2844,8 +2844,8 @@ struct {
struct HPMHookPoint *HP_libconfig_lookup_bool_post;
struct HPMHookPoint *HP_libconfig_lookup_string_pre;
struct HPMHookPoint *HP_libconfig_lookup_string_post;
- struct HPMHookPoint *HP_libconfig_read_file_pre;
- struct HPMHookPoint *HP_libconfig_read_file_post;
+ struct HPMHookPoint *HP_libconfig_load_file_pre;
+ struct HPMHookPoint *HP_libconfig_load_file_post;
struct HPMHookPoint *HP_libconfig_setting_copy_simple_pre;
struct HPMHookPoint *HP_libconfig_setting_copy_simple_post;
struct HPMHookPoint *HP_libconfig_setting_copy_elem_pre;
@@ -2854,6 +2854,26 @@ struct {
struct HPMHookPoint *HP_libconfig_setting_copy_aggregate_post;
struct HPMHookPoint *HP_libconfig_setting_copy_pre;
struct HPMHookPoint *HP_libconfig_setting_copy_post;
+ struct HPMHookPoint *HP_libconfig_setting_get_bool_real_pre;
+ struct HPMHookPoint *HP_libconfig_setting_get_bool_real_post;
+ struct HPMHookPoint *HP_libconfig_setting_get_uint32_pre;
+ struct HPMHookPoint *HP_libconfig_setting_get_uint32_post;
+ struct HPMHookPoint *HP_libconfig_setting_get_uint16_pre;
+ struct HPMHookPoint *HP_libconfig_setting_get_uint16_post;
+ struct HPMHookPoint *HP_libconfig_setting_get_int16_pre;
+ struct HPMHookPoint *HP_libconfig_setting_get_int16_post;
+ struct HPMHookPoint *HP_libconfig_setting_lookup_bool_real_pre;
+ struct HPMHookPoint *HP_libconfig_setting_lookup_bool_real_post;
+ struct HPMHookPoint *HP_libconfig_setting_lookup_uint32_pre;
+ struct HPMHookPoint *HP_libconfig_setting_lookup_uint32_post;
+ struct HPMHookPoint *HP_libconfig_setting_lookup_uint16_pre;
+ struct HPMHookPoint *HP_libconfig_setting_lookup_uint16_post;
+ struct HPMHookPoint *HP_libconfig_setting_lookup_int16_pre;
+ struct HPMHookPoint *HP_libconfig_setting_lookup_int16_post;
+ struct HPMHookPoint *HP_libconfig_setting_lookup_mutable_string_pre;
+ struct HPMHookPoint *HP_libconfig_setting_lookup_mutable_string_post;
+ struct HPMHookPoint *HP_libconfig_lookup_mutable_string_pre;
+ struct HPMHookPoint *HP_libconfig_lookup_mutable_string_post;
struct HPMHookPoint *HP_logs_pick_pc_pre;
struct HPMHookPoint *HP_logs_pick_pc_post;
struct HPMHookPoint *HP_logs_pick_mob_pre;
@@ -8593,10 +8613,10 @@ struct {
int HP_libconfig_read_post;
int HP_libconfig_write_pre;
int HP_libconfig_write_post;
- int HP_libconfig_set_auto_convert_pre;
- int HP_libconfig_set_auto_convert_post;
- int HP_libconfig_get_auto_convert_pre;
- int HP_libconfig_get_auto_convert_post;
+ int HP_libconfig_set_options_pre;
+ int HP_libconfig_set_options_post;
+ int HP_libconfig_get_options_pre;
+ int HP_libconfig_get_options_post;
int HP_libconfig_read_string_pre;
int HP_libconfig_read_string_post;
int HP_libconfig_read_file_src_pre;
@@ -8621,6 +8641,8 @@ struct {
int HP_libconfig_setting_get_bool_post;
int HP_libconfig_setting_get_string_pre;
int HP_libconfig_setting_get_string_post;
+ int HP_libconfig_setting_lookup_pre;
+ int HP_libconfig_setting_lookup_post;
int HP_libconfig_setting_lookup_int_pre;
int HP_libconfig_setting_lookup_int_post;
int HP_libconfig_setting_lookup_int64_pre;
@@ -8683,8 +8705,6 @@ struct {
int HP_libconfig_setting_set_hook_post;
int HP_libconfig_lookup_pre;
int HP_libconfig_lookup_post;
- int HP_libconfig_lookup_from_pre;
- int HP_libconfig_lookup_from_post;
int HP_libconfig_lookup_int_pre;
int HP_libconfig_lookup_int_post;
int HP_libconfig_lookup_int64_pre;
@@ -8695,8 +8715,8 @@ struct {
int HP_libconfig_lookup_bool_post;
int HP_libconfig_lookup_string_pre;
int HP_libconfig_lookup_string_post;
- int HP_libconfig_read_file_pre;
- int HP_libconfig_read_file_post;
+ int HP_libconfig_load_file_pre;
+ int HP_libconfig_load_file_post;
int HP_libconfig_setting_copy_simple_pre;
int HP_libconfig_setting_copy_simple_post;
int HP_libconfig_setting_copy_elem_pre;
@@ -8705,6 +8725,26 @@ struct {
int HP_libconfig_setting_copy_aggregate_post;
int HP_libconfig_setting_copy_pre;
int HP_libconfig_setting_copy_post;
+ int HP_libconfig_setting_get_bool_real_pre;
+ int HP_libconfig_setting_get_bool_real_post;
+ int HP_libconfig_setting_get_uint32_pre;
+ int HP_libconfig_setting_get_uint32_post;
+ int HP_libconfig_setting_get_uint16_pre;
+ int HP_libconfig_setting_get_uint16_post;
+ int HP_libconfig_setting_get_int16_pre;
+ int HP_libconfig_setting_get_int16_post;
+ int HP_libconfig_setting_lookup_bool_real_pre;
+ int HP_libconfig_setting_lookup_bool_real_post;
+ int HP_libconfig_setting_lookup_uint32_pre;
+ int HP_libconfig_setting_lookup_uint32_post;
+ int HP_libconfig_setting_lookup_uint16_pre;
+ int HP_libconfig_setting_lookup_uint16_post;
+ int HP_libconfig_setting_lookup_int16_pre;
+ int HP_libconfig_setting_lookup_int16_post;
+ int HP_libconfig_setting_lookup_mutable_string_pre;
+ int HP_libconfig_setting_lookup_mutable_string_post;
+ int HP_libconfig_lookup_mutable_string_pre;
+ int HP_libconfig_lookup_mutable_string_post;
int HP_logs_pick_pc_pre;
int HP_logs_pick_pc_post;
int HP_logs_pick_mob_pre;
diff --git a/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc b/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc
index 303f5ed7e..4ccb217a1 100644
--- a/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc
@@ -1405,8 +1405,8 @@ struct HookingPointData HookingPoints[] = {
/* libconfig */
{ HP_POP(libconfig->read, HP_libconfig_read) },
{ HP_POP(libconfig->write, HP_libconfig_write) },
- { HP_POP(libconfig->set_auto_convert, HP_libconfig_set_auto_convert) },
- { HP_POP(libconfig->get_auto_convert, HP_libconfig_get_auto_convert) },
+ { HP_POP(libconfig->set_options, HP_libconfig_set_options) },
+ { HP_POP(libconfig->get_options, HP_libconfig_get_options) },
{ HP_POP(libconfig->read_string, HP_libconfig_read_string) },
{ HP_POP(libconfig->read_file_src, HP_libconfig_read_file_src) },
{ HP_POP(libconfig->write_file, HP_libconfig_write_file) },
@@ -1419,6 +1419,7 @@ struct HookingPointData HookingPoints[] = {
{ HP_POP(libconfig->setting_get_float, HP_libconfig_setting_get_float) },
{ HP_POP(libconfig->setting_get_bool, HP_libconfig_setting_get_bool) },
{ HP_POP(libconfig->setting_get_string, HP_libconfig_setting_get_string) },
+ { HP_POP(libconfig->setting_lookup, HP_libconfig_setting_lookup) },
{ HP_POP(libconfig->setting_lookup_int, HP_libconfig_setting_lookup_int) },
{ HP_POP(libconfig->setting_lookup_int64, HP_libconfig_setting_lookup_int64) },
{ HP_POP(libconfig->setting_lookup_float, HP_libconfig_setting_lookup_float) },
@@ -1450,17 +1451,26 @@ struct HookingPointData HookingPoints[] = {
{ HP_POP(libconfig->setting_remove_elem, HP_libconfig_setting_remove_elem) },
{ HP_POP(libconfig->setting_set_hook, HP_libconfig_setting_set_hook) },
{ HP_POP(libconfig->lookup, HP_libconfig_lookup) },
- { HP_POP(libconfig->lookup_from, HP_libconfig_lookup_from) },
{ HP_POP(libconfig->lookup_int, HP_libconfig_lookup_int) },
{ HP_POP(libconfig->lookup_int64, HP_libconfig_lookup_int64) },
{ HP_POP(libconfig->lookup_float, HP_libconfig_lookup_float) },
{ HP_POP(libconfig->lookup_bool, HP_libconfig_lookup_bool) },
{ HP_POP(libconfig->lookup_string, HP_libconfig_lookup_string) },
- { HP_POP(libconfig->read_file, HP_libconfig_read_file) },
+ { HP_POP(libconfig->load_file, HP_libconfig_load_file) },
{ HP_POP(libconfig->setting_copy_simple, HP_libconfig_setting_copy_simple) },
{ HP_POP(libconfig->setting_copy_elem, HP_libconfig_setting_copy_elem) },
{ HP_POP(libconfig->setting_copy_aggregate, HP_libconfig_setting_copy_aggregate) },
{ HP_POP(libconfig->setting_copy, HP_libconfig_setting_copy) },
+ { HP_POP(libconfig->setting_get_bool_real, HP_libconfig_setting_get_bool_real) },
+ { HP_POP(libconfig->setting_get_uint32, HP_libconfig_setting_get_uint32) },
+ { HP_POP(libconfig->setting_get_uint16, HP_libconfig_setting_get_uint16) },
+ { HP_POP(libconfig->setting_get_int16, HP_libconfig_setting_get_int16) },
+ { HP_POP(libconfig->setting_lookup_bool_real, HP_libconfig_setting_lookup_bool_real) },
+ { HP_POP(libconfig->setting_lookup_uint32, HP_libconfig_setting_lookup_uint32) },
+ { HP_POP(libconfig->setting_lookup_uint16, HP_libconfig_setting_lookup_uint16) },
+ { HP_POP(libconfig->setting_lookup_int16, HP_libconfig_setting_lookup_int16) },
+ { HP_POP(libconfig->setting_lookup_mutable_string, HP_libconfig_setting_lookup_mutable_string) },
+ { HP_POP(libconfig->lookup_mutable_string, HP_libconfig_lookup_mutable_string) },
/* logs */
{ HP_POP(logs->pick_pc, HP_logs_pick_pc) },
{ HP_POP(logs->pick_mob, HP_logs_pick_mob) },
diff --git a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
index ee07b99cb..bc26e2f37 100644
--- a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
@@ -265,10 +265,10 @@ bool HP_atcommand_can_use2(struct map_session_data *sd, const char *command, AtC
}
return retVal___;
}
-void HP_atcommand_load_groups(GroupSettings **groups, config_setting_t **commands_, size_t sz) {
+void HP_atcommand_load_groups(GroupSettings **groups, struct config_setting_t **commands_, size_t sz) {
int hIndex = 0;
if( HPMHooks.count.HP_atcommand_load_groups_pre ) {
- void (*preHookFunc) (GroupSettings **groups, config_setting_t **commands_, size_t *sz);
+ void (*preHookFunc) (GroupSettings **groups, struct config_setting_t **commands_, size_t *sz);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_atcommand_load_groups_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_atcommand_load_groups_pre[hIndex].func;
@@ -283,7 +283,7 @@ void HP_atcommand_load_groups(GroupSettings **groups, config_setting_t **command
HPMHooks.source.atcommand.load_groups(groups, commands_, sz);
}
if( HPMHooks.count.HP_atcommand_load_groups_post ) {
- void (*postHookFunc) (GroupSettings **groups, config_setting_t **commands_, size_t *sz);
+ void (*postHookFunc) (GroupSettings **groups, struct config_setting_t **commands_, size_t *sz);
for(hIndex = 0; hIndex < HPMHooks.count.HP_atcommand_load_groups_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_atcommand_load_groups_post[hIndex].func;
postHookFunc(groups, commands_, &sz);
@@ -35754,10 +35754,10 @@ int HP_itemdb_validate_entry(struct item_data *entry, int n, const char *source)
}
return retVal___;
}
-void HP_itemdb_readdb_additional_fields(int itemid, config_setting_t *it, int n, const char *source) {
+void HP_itemdb_readdb_additional_fields(int itemid, struct config_setting_t *it, int n, const char *source) {
int hIndex = 0;
if( HPMHooks.count.HP_itemdb_readdb_additional_fields_pre ) {
- void (*preHookFunc) (int *itemid, config_setting_t *it, int *n, const char *source);
+ void (*preHookFunc) (int *itemid, struct config_setting_t *it, int *n, const char *source);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_readdb_additional_fields_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_itemdb_readdb_additional_fields_pre[hIndex].func;
@@ -35772,7 +35772,7 @@ void HP_itemdb_readdb_additional_fields(int itemid, config_setting_t *it, int n,
HPMHooks.source.itemdb.readdb_additional_fields(itemid, it, n, source);
}
if( HPMHooks.count.HP_itemdb_readdb_additional_fields_post ) {
- void (*postHookFunc) (int *itemid, config_setting_t *it, int *n, const char *source);
+ void (*postHookFunc) (int *itemid, struct config_setting_t *it, int *n, const char *source);
for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_readdb_additional_fields_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_itemdb_readdb_additional_fields_post[hIndex].func;
postHookFunc(&itemid, it, &n, source);
@@ -35780,11 +35780,11 @@ void HP_itemdb_readdb_additional_fields(int itemid, config_setting_t *it, int n,
}
return;
}
-int HP_itemdb_readdb_libconfig_sub(config_setting_t *it, int n, const char *source) {
+int HP_itemdb_readdb_libconfig_sub(struct config_setting_t *it, int n, const char *source) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_itemdb_readdb_libconfig_sub_pre ) {
- int (*preHookFunc) (config_setting_t *it, int *n, const char *source);
+ int (*preHookFunc) (struct config_setting_t *it, int *n, const char *source);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_readdb_libconfig_sub_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_itemdb_readdb_libconfig_sub_pre[hIndex].func;
@@ -35799,7 +35799,7 @@ int HP_itemdb_readdb_libconfig_sub(config_setting_t *it, int n, const char *sour
retVal___ = HPMHooks.source.itemdb.readdb_libconfig_sub(it, n, source);
}
if( HPMHooks.count.HP_itemdb_readdb_libconfig_sub_post ) {
- int (*postHookFunc) (int retVal___, config_setting_t *it, int *n, const char *source);
+ int (*postHookFunc) (int retVal___, struct config_setting_t *it, int *n, const char *source);
for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_readdb_libconfig_sub_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_itemdb_readdb_libconfig_sub_post[hIndex].func;
retVal___ = postHookFunc(retVal___, it, &n, source);
@@ -36026,11 +36026,11 @@ bool HP_itemdb_is_item_usable(struct item_data *item) {
}
return retVal___;
}
-bool HP_itemdb_lookup_const(const config_setting_t *it, const char *name, int *value) {
+bool HP_itemdb_lookup_const(const struct config_setting_t *it, const char *name, int *value) {
int hIndex = 0;
bool retVal___ = false;
if( HPMHooks.count.HP_itemdb_lookup_const_pre ) {
- bool (*preHookFunc) (const config_setting_t *it, const char *name, int *value);
+ bool (*preHookFunc) (const struct config_setting_t *it, const char *name, int *value);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_lookup_const_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_itemdb_lookup_const_pre[hIndex].func;
@@ -36045,7 +36045,7 @@ bool HP_itemdb_lookup_const(const config_setting_t *it, const char *name, int *v
retVal___ = HPMHooks.source.itemdb.lookup_const(it, name, value);
}
if( HPMHooks.count.HP_itemdb_lookup_const_post ) {
- bool (*postHookFunc) (bool retVal___, const config_setting_t *it, const char *name, int *value);
+ bool (*postHookFunc) (bool retVal___, const struct config_setting_t *it, const char *name, int *value);
for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_lookup_const_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_itemdb_lookup_const_post[hIndex].func;
retVal___ = postHookFunc(retVal___, it, name, value);
@@ -36054,11 +36054,11 @@ bool HP_itemdb_lookup_const(const config_setting_t *it, const char *name, int *v
return retVal___;
}
/* libconfig */
-int HP_libconfig_read(config_t *config, FILE *stream) {
+int HP_libconfig_read(struct config_t *config, FILE *stream) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_read_pre ) {
- int (*preHookFunc) (config_t *config, FILE *stream);
+ int (*preHookFunc) (struct config_t *config, FILE *stream);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_read_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_read_pre[hIndex].func;
@@ -36073,7 +36073,7 @@ int HP_libconfig_read(config_t *config, FILE *stream) {
retVal___ = HPMHooks.source.libconfig.read(config, stream);
}
if( HPMHooks.count.HP_libconfig_read_post ) {
- int (*postHookFunc) (int retVal___, config_t *config, FILE *stream);
+ int (*postHookFunc) (int retVal___, struct config_t *config, FILE *stream);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_read_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_read_post[hIndex].func;
retVal___ = postHookFunc(retVal___, config, stream);
@@ -36081,10 +36081,10 @@ int HP_libconfig_read(config_t *config, FILE *stream) {
}
return retVal___;
}
-void HP_libconfig_write(const config_t *config, FILE *stream) {
+void HP_libconfig_write(const struct config_t *config, FILE *stream) {
int hIndex = 0;
if( HPMHooks.count.HP_libconfig_write_pre ) {
- void (*preHookFunc) (const config_t *config, FILE *stream);
+ void (*preHookFunc) (const struct config_t *config, FILE *stream);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_write_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_write_pre[hIndex].func;
@@ -36099,7 +36099,7 @@ void HP_libconfig_write(const config_t *config, FILE *stream) {
HPMHooks.source.libconfig.write(config, stream);
}
if( HPMHooks.count.HP_libconfig_write_post ) {
- void (*postHookFunc) (const config_t *config, FILE *stream);
+ void (*postHookFunc) (const struct config_t *config, FILE *stream);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_write_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_write_post[hIndex].func;
postHookFunc(config, stream);
@@ -36107,14 +36107,14 @@ void HP_libconfig_write(const config_t *config, FILE *stream) {
}
return;
}
-void HP_libconfig_set_auto_convert(config_t *config, int flag) {
+void HP_libconfig_set_options(struct config_t *config, int options) {
int hIndex = 0;
- if( HPMHooks.count.HP_libconfig_set_auto_convert_pre ) {
- void (*preHookFunc) (config_t *config, int *flag);
+ if( HPMHooks.count.HP_libconfig_set_options_pre ) {
+ void (*preHookFunc) (struct config_t *config, int *options);
*HPMforce_return = false;
- for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_auto_convert_pre; hIndex++ ) {
- preHookFunc = HPMHooks.list.HP_libconfig_set_auto_convert_pre[hIndex].func;
- preHookFunc(config, &flag);
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_options_pre; hIndex++ ) {
+ preHookFunc = HPMHooks.list.HP_libconfig_set_options_pre[hIndex].func;
+ preHookFunc(config, &options);
}
if( *HPMforce_return ) {
*HPMforce_return = false;
@@ -36122,25 +36122,25 @@ void HP_libconfig_set_auto_convert(config_t *config, int flag) {
}
}
{
- HPMHooks.source.libconfig.set_auto_convert(config, flag);
+ HPMHooks.source.libconfig.set_options(config, options);
}
- if( HPMHooks.count.HP_libconfig_set_auto_convert_post ) {
- void (*postHookFunc) (config_t *config, int *flag);
- for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_auto_convert_post; hIndex++ ) {
- postHookFunc = HPMHooks.list.HP_libconfig_set_auto_convert_post[hIndex].func;
- postHookFunc(config, &flag);
+ if( HPMHooks.count.HP_libconfig_set_options_post ) {
+ void (*postHookFunc) (struct config_t *config, int *options);
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_options_post; hIndex++ ) {
+ postHookFunc = HPMHooks.list.HP_libconfig_set_options_post[hIndex].func;
+ postHookFunc(config, &options);
}
}
return;
}
-int HP_libconfig_get_auto_convert(const config_t *config) {
+int HP_libconfig_get_options(const struct config_t *config) {
int hIndex = 0;
int retVal___ = 0;
- if( HPMHooks.count.HP_libconfig_get_auto_convert_pre ) {
- int (*preHookFunc) (const config_t *config);
+ if( HPMHooks.count.HP_libconfig_get_options_pre ) {
+ int (*preHookFunc) (const struct config_t *config);
*HPMforce_return = false;
- for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_get_auto_convert_pre; hIndex++ ) {
- preHookFunc = HPMHooks.list.HP_libconfig_get_auto_convert_pre[hIndex].func;
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_get_options_pre; hIndex++ ) {
+ preHookFunc = HPMHooks.list.HP_libconfig_get_options_pre[hIndex].func;
retVal___ = preHookFunc(config);
}
if( *HPMforce_return ) {
@@ -36149,22 +36149,22 @@ int HP_libconfig_get_auto_convert(const config_t *config) {
}
}
{
- retVal___ = HPMHooks.source.libconfig.get_auto_convert(config);
+ retVal___ = HPMHooks.source.libconfig.get_options(config);
}
- if( HPMHooks.count.HP_libconfig_get_auto_convert_post ) {
- int (*postHookFunc) (int retVal___, const config_t *config);
- for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_get_auto_convert_post; hIndex++ ) {
- postHookFunc = HPMHooks.list.HP_libconfig_get_auto_convert_post[hIndex].func;
+ if( HPMHooks.count.HP_libconfig_get_options_post ) {
+ int (*postHookFunc) (int retVal___, const struct config_t *config);
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_get_options_post; hIndex++ ) {
+ postHookFunc = HPMHooks.list.HP_libconfig_get_options_post[hIndex].func;
retVal___ = postHookFunc(retVal___, config);
}
}
return retVal___;
}
-int HP_libconfig_read_string(config_t *config, const char *str) {
+int HP_libconfig_read_string(struct config_t *config, const char *str) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_read_string_pre ) {
- int (*preHookFunc) (config_t *config, const char *str);
+ int (*preHookFunc) (struct config_t *config, const char *str);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_read_string_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_read_string_pre[hIndex].func;
@@ -36179,7 +36179,7 @@ int HP_libconfig_read_string(config_t *config, const char *str) {
retVal___ = HPMHooks.source.libconfig.read_string(config, str);
}
if( HPMHooks.count.HP_libconfig_read_string_post ) {
- int (*postHookFunc) (int retVal___, config_t *config, const char *str);
+ int (*postHookFunc) (int retVal___, struct config_t *config, const char *str);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_read_string_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_read_string_post[hIndex].func;
retVal___ = postHookFunc(retVal___, config, str);
@@ -36187,11 +36187,11 @@ int HP_libconfig_read_string(config_t *config, const char *str) {
}
return retVal___;
}
-int HP_libconfig_read_file_src(config_t *config, const char *filename) {
+int HP_libconfig_read_file_src(struct config_t *config, const char *filename) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_read_file_src_pre ) {
- int (*preHookFunc) (config_t *config, const char *filename);
+ int (*preHookFunc) (struct config_t *config, const char *filename);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_read_file_src_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_read_file_src_pre[hIndex].func;
@@ -36206,7 +36206,7 @@ int HP_libconfig_read_file_src(config_t *config, const char *filename) {
retVal___ = HPMHooks.source.libconfig.read_file_src(config, filename);
}
if( HPMHooks.count.HP_libconfig_read_file_src_post ) {
- int (*postHookFunc) (int retVal___, config_t *config, const char *filename);
+ int (*postHookFunc) (int retVal___, struct config_t *config, const char *filename);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_read_file_src_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_read_file_src_post[hIndex].func;
retVal___ = postHookFunc(retVal___, config, filename);
@@ -36214,11 +36214,11 @@ int HP_libconfig_read_file_src(config_t *config, const char *filename) {
}
return retVal___;
}
-int HP_libconfig_write_file(config_t *config, const char *filename) {
+int HP_libconfig_write_file(struct config_t *config, const char *filename) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_write_file_pre ) {
- int (*preHookFunc) (config_t *config, const char *filename);
+ int (*preHookFunc) (struct config_t *config, const char *filename);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_write_file_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_write_file_pre[hIndex].func;
@@ -36233,7 +36233,7 @@ int HP_libconfig_write_file(config_t *config, const char *filename) {
retVal___ = HPMHooks.source.libconfig.write_file(config, filename);
}
if( HPMHooks.count.HP_libconfig_write_file_post ) {
- int (*postHookFunc) (int retVal___, config_t *config, const char *filename);
+ int (*postHookFunc) (int retVal___, struct config_t *config, const char *filename);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_write_file_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_write_file_post[hIndex].func;
retVal___ = postHookFunc(retVal___, config, filename);
@@ -36241,10 +36241,10 @@ int HP_libconfig_write_file(config_t *config, const char *filename) {
}
return retVal___;
}
-void HP_libconfig_set_destructor(config_t *config, void ( *destructor ) (void *)) {
+void HP_libconfig_set_destructor(struct config_t *config, void ( *destructor ) (void *)) {
int hIndex = 0;
if( HPMHooks.count.HP_libconfig_set_destructor_pre ) {
- void (*preHookFunc) (config_t *config, void ( *destructor ) (void *));
+ void (*preHookFunc) (struct config_t *config, void ( *destructor ) (void *));
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_destructor_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_set_destructor_pre[hIndex].func;
@@ -36259,7 +36259,7 @@ void HP_libconfig_set_destructor(config_t *config, void ( *destructor ) (void *)
HPMHooks.source.libconfig.set_destructor(config, destructor);
}
if( HPMHooks.count.HP_libconfig_set_destructor_post ) {
- void (*postHookFunc) (config_t *config, void ( *destructor ) (void *));
+ void (*postHookFunc) (struct config_t *config, void ( *destructor ) (void *));
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_destructor_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_set_destructor_post[hIndex].func;
postHookFunc(config, destructor);
@@ -36267,10 +36267,10 @@ void HP_libconfig_set_destructor(config_t *config, void ( *destructor ) (void *)
}
return;
}
-void HP_libconfig_set_include_dir(config_t *config, const char *include_dir) {
+void HP_libconfig_set_include_dir(struct config_t *config, const char *include_dir) {
int hIndex = 0;
if( HPMHooks.count.HP_libconfig_set_include_dir_pre ) {
- void (*preHookFunc) (config_t *config, const char *include_dir);
+ void (*preHookFunc) (struct config_t *config, const char *include_dir);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_include_dir_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_set_include_dir_pre[hIndex].func;
@@ -36285,7 +36285,7 @@ void HP_libconfig_set_include_dir(config_t *config, const char *include_dir) {
HPMHooks.source.libconfig.set_include_dir(config, include_dir);
}
if( HPMHooks.count.HP_libconfig_set_include_dir_post ) {
- void (*postHookFunc) (config_t *config, const char *include_dir);
+ void (*postHookFunc) (struct config_t *config, const char *include_dir);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_include_dir_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_set_include_dir_post[hIndex].func;
postHookFunc(config, include_dir);
@@ -36293,10 +36293,10 @@ void HP_libconfig_set_include_dir(config_t *config, const char *include_dir) {
}
return;
}
-void HP_libconfig_init(config_t *config) {
+void HP_libconfig_init(struct config_t *config) {
int hIndex = 0;
if( HPMHooks.count.HP_libconfig_init_pre ) {
- void (*preHookFunc) (config_t *config);
+ void (*preHookFunc) (struct config_t *config);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_init_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_init_pre[hIndex].func;
@@ -36311,7 +36311,7 @@ void HP_libconfig_init(config_t *config) {
HPMHooks.source.libconfig.init(config);
}
if( HPMHooks.count.HP_libconfig_init_post ) {
- void (*postHookFunc) (config_t *config);
+ void (*postHookFunc) (struct config_t *config);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_init_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_init_post[hIndex].func;
postHookFunc(config);
@@ -36319,10 +36319,10 @@ void HP_libconfig_init(config_t *config) {
}
return;
}
-void HP_libconfig_destroy(config_t *config) {
+void HP_libconfig_destroy(struct config_t *config) {
int hIndex = 0;
if( HPMHooks.count.HP_libconfig_destroy_pre ) {
- void (*preHookFunc) (config_t *config);
+ void (*preHookFunc) (struct config_t *config);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_destroy_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_destroy_pre[hIndex].func;
@@ -36337,7 +36337,7 @@ void HP_libconfig_destroy(config_t *config) {
HPMHooks.source.libconfig.destroy(config);
}
if( HPMHooks.count.HP_libconfig_destroy_post ) {
- void (*postHookFunc) (config_t *config);
+ void (*postHookFunc) (struct config_t *config);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_destroy_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_destroy_post[hIndex].func;
postHookFunc(config);
@@ -36345,11 +36345,11 @@ void HP_libconfig_destroy(config_t *config) {
}
return;
}
-int HP_libconfig_setting_get_int(const config_setting_t *setting) {
+int HP_libconfig_setting_get_int(const struct config_setting_t *setting) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_setting_get_int_pre ) {
- int (*preHookFunc) (const config_setting_t *setting);
+ int (*preHookFunc) (const struct config_setting_t *setting);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_get_int_pre[hIndex].func;
@@ -36364,7 +36364,7 @@ int HP_libconfig_setting_get_int(const config_setting_t *setting) {
retVal___ = HPMHooks.source.libconfig.setting_get_int(setting);
}
if( HPMHooks.count.HP_libconfig_setting_get_int_post ) {
- int (*postHookFunc) (int retVal___, const config_setting_t *setting);
+ int (*postHookFunc) (int retVal___, const struct config_setting_t *setting);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_get_int_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting);
@@ -36372,11 +36372,11 @@ int HP_libconfig_setting_get_int(const config_setting_t *setting) {
}
return retVal___;
}
-long long HP_libconfig_setting_get_int64(const config_setting_t *setting) {
+long long HP_libconfig_setting_get_int64(const struct config_setting_t *setting) {
int hIndex = 0;
long long retVal___ = 0;
if( HPMHooks.count.HP_libconfig_setting_get_int64_pre ) {
- long long (*preHookFunc) (const config_setting_t *setting);
+ long long (*preHookFunc) (const struct config_setting_t *setting);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int64_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_get_int64_pre[hIndex].func;
@@ -36391,7 +36391,7 @@ long long HP_libconfig_setting_get_int64(const config_setting_t *setting) {
retVal___ = HPMHooks.source.libconfig.setting_get_int64(setting);
}
if( HPMHooks.count.HP_libconfig_setting_get_int64_post ) {
- long long (*postHookFunc) (long long retVal___, const config_setting_t *setting);
+ long long (*postHookFunc) (long long retVal___, const struct config_setting_t *setting);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int64_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_get_int64_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting);
@@ -36399,11 +36399,11 @@ long long HP_libconfig_setting_get_int64(const config_setting_t *setting) {
}
return retVal___;
}
-double HP_libconfig_setting_get_float(const config_setting_t *setting) {
+double HP_libconfig_setting_get_float(const struct config_setting_t *setting) {
int hIndex = 0;
double retVal___ = 0.;
if( HPMHooks.count.HP_libconfig_setting_get_float_pre ) {
- double (*preHookFunc) (const config_setting_t *setting);
+ double (*preHookFunc) (const struct config_setting_t *setting);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_float_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_get_float_pre[hIndex].func;
@@ -36418,7 +36418,7 @@ double HP_libconfig_setting_get_float(const config_setting_t *setting) {
retVal___ = HPMHooks.source.libconfig.setting_get_float(setting);
}
if( HPMHooks.count.HP_libconfig_setting_get_float_post ) {
- double (*postHookFunc) (double retVal___, const config_setting_t *setting);
+ double (*postHookFunc) (double retVal___, const struct config_setting_t *setting);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_float_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_get_float_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting);
@@ -36426,11 +36426,11 @@ double HP_libconfig_setting_get_float(const config_setting_t *setting) {
}
return retVal___;
}
-int HP_libconfig_setting_get_bool(const config_setting_t *setting) {
+int HP_libconfig_setting_get_bool(const struct config_setting_t *setting) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_setting_get_bool_pre ) {
- int (*preHookFunc) (const config_setting_t *setting);
+ int (*preHookFunc) (const struct config_setting_t *setting);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_bool_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_get_bool_pre[hIndex].func;
@@ -36445,7 +36445,7 @@ int HP_libconfig_setting_get_bool(const config_setting_t *setting) {
retVal___ = HPMHooks.source.libconfig.setting_get_bool(setting);
}
if( HPMHooks.count.HP_libconfig_setting_get_bool_post ) {
- int (*postHookFunc) (int retVal___, const config_setting_t *setting);
+ int (*postHookFunc) (int retVal___, const struct config_setting_t *setting);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_bool_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_get_bool_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting);
@@ -36453,11 +36453,11 @@ int HP_libconfig_setting_get_bool(const config_setting_t *setting) {
}
return retVal___;
}
-const char* HP_libconfig_setting_get_string(const config_setting_t *setting) {
+const char* HP_libconfig_setting_get_string(const struct config_setting_t *setting) {
int hIndex = 0;
const char* retVal___ = NULL;
if( HPMHooks.count.HP_libconfig_setting_get_string_pre ) {
- const char* (*preHookFunc) (const config_setting_t *setting);
+ const char* (*preHookFunc) (const struct config_setting_t *setting);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_string_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_get_string_pre[hIndex].func;
@@ -36472,7 +36472,7 @@ const char* HP_libconfig_setting_get_string(const config_setting_t *setting) {
retVal___ = HPMHooks.source.libconfig.setting_get_string(setting);
}
if( HPMHooks.count.HP_libconfig_setting_get_string_post ) {
- const char* (*postHookFunc) (const char* retVal___, const config_setting_t *setting);
+ const char* (*postHookFunc) (const char* retVal___, const struct config_setting_t *setting);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_string_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_get_string_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting);
@@ -36480,11 +36480,38 @@ const char* HP_libconfig_setting_get_string(const config_setting_t *setting) {
}
return retVal___;
}
-int HP_libconfig_setting_lookup_int(const config_setting_t *setting, const char *name, int *value) {
+struct config_setting_t* HP_libconfig_setting_lookup(struct config_setting_t *setting, const char *name) {
+ int hIndex = 0;
+ struct config_setting_t* retVal___ = NULL;
+ if( HPMHooks.count.HP_libconfig_setting_lookup_pre ) {
+ struct config_setting_t* (*preHookFunc) (struct config_setting_t *setting, const char *name);
+ *HPMforce_return = false;
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_pre; hIndex++ ) {
+ preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_pre[hIndex].func;
+ retVal___ = preHookFunc(setting, name);
+ }
+ if( *HPMforce_return ) {
+ *HPMforce_return = false;
+ return retVal___;
+ }
+ }
+ {
+ retVal___ = HPMHooks.source.libconfig.setting_lookup(setting, name);
+ }
+ if( HPMHooks.count.HP_libconfig_setting_lookup_post ) {
+ struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, const char *name);
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_post; hIndex++ ) {
+ postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_post[hIndex].func;
+ retVal___ = postHookFunc(retVal___, setting, name);
+ }
+ }
+ return retVal___;
+}
+int HP_libconfig_setting_lookup_int(const struct config_setting_t *setting, const char *name, int *value) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_setting_lookup_int_pre ) {
- int (*preHookFunc) (const config_setting_t *setting, const char *name, int *value);
+ int (*preHookFunc) (const struct config_setting_t *setting, const char *name, int *value);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_int_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_int_pre[hIndex].func;
@@ -36499,7 +36526,7 @@ int HP_libconfig_setting_lookup_int(const config_setting_t *setting, const char
retVal___ = HPMHooks.source.libconfig.setting_lookup_int(setting, name, value);
}
if( HPMHooks.count.HP_libconfig_setting_lookup_int_post ) {
- int (*postHookFunc) (int retVal___, const config_setting_t *setting, const char *name, int *value);
+ int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, int *value);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_int_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_int_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting, name, value);
@@ -36507,11 +36534,11 @@ int HP_libconfig_setting_lookup_int(const config_setting_t *setting, const char
}
return retVal___;
}
-int HP_libconfig_setting_lookup_int64(const config_setting_t *setting, const char *name, long long *value) {
+int HP_libconfig_setting_lookup_int64(const struct config_setting_t *setting, const char *name, long long *value) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_setting_lookup_int64_pre ) {
- int (*preHookFunc) (const config_setting_t *setting, const char *name, long long *value);
+ int (*preHookFunc) (const struct config_setting_t *setting, const char *name, long long *value);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_int64_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_int64_pre[hIndex].func;
@@ -36526,7 +36553,7 @@ int HP_libconfig_setting_lookup_int64(const config_setting_t *setting, const cha
retVal___ = HPMHooks.source.libconfig.setting_lookup_int64(setting, name, value);
}
if( HPMHooks.count.HP_libconfig_setting_lookup_int64_post ) {
- int (*postHookFunc) (int retVal___, const config_setting_t *setting, const char *name, long long *value);
+ int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, long long *value);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_int64_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_int64_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting, name, value);
@@ -36534,11 +36561,11 @@ int HP_libconfig_setting_lookup_int64(const config_setting_t *setting, const cha
}
return retVal___;
}
-int HP_libconfig_setting_lookup_float(const config_setting_t *setting, const char *name, double *value) {
+int HP_libconfig_setting_lookup_float(const struct config_setting_t *setting, const char *name, double *value) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_setting_lookup_float_pre ) {
- int (*preHookFunc) (const config_setting_t *setting, const char *name, double *value);
+ int (*preHookFunc) (const struct config_setting_t *setting, const char *name, double *value);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_float_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_float_pre[hIndex].func;
@@ -36553,7 +36580,7 @@ int HP_libconfig_setting_lookup_float(const config_setting_t *setting, const cha
retVal___ = HPMHooks.source.libconfig.setting_lookup_float(setting, name, value);
}
if( HPMHooks.count.HP_libconfig_setting_lookup_float_post ) {
- int (*postHookFunc) (int retVal___, const config_setting_t *setting, const char *name, double *value);
+ int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, double *value);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_float_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_float_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting, name, value);
@@ -36561,11 +36588,11 @@ int HP_libconfig_setting_lookup_float(const config_setting_t *setting, const cha
}
return retVal___;
}
-int HP_libconfig_setting_lookup_bool(const config_setting_t *setting, const char *name, int *value) {
+int HP_libconfig_setting_lookup_bool(const struct config_setting_t *setting, const char *name, int *value) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_setting_lookup_bool_pre ) {
- int (*preHookFunc) (const config_setting_t *setting, const char *name, int *value);
+ int (*preHookFunc) (const struct config_setting_t *setting, const char *name, int *value);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_bool_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_bool_pre[hIndex].func;
@@ -36580,7 +36607,7 @@ int HP_libconfig_setting_lookup_bool(const config_setting_t *setting, const char
retVal___ = HPMHooks.source.libconfig.setting_lookup_bool(setting, name, value);
}
if( HPMHooks.count.HP_libconfig_setting_lookup_bool_post ) {
- int (*postHookFunc) (int retVal___, const config_setting_t *setting, const char *name, int *value);
+ int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, int *value);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_bool_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_bool_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting, name, value);
@@ -36588,11 +36615,11 @@ int HP_libconfig_setting_lookup_bool(const config_setting_t *setting, const char
}
return retVal___;
}
-int HP_libconfig_setting_lookup_string(const config_setting_t *setting, const char *name, const char **value) {
+int HP_libconfig_setting_lookup_string(const struct config_setting_t *setting, const char *name, const char **value) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_setting_lookup_string_pre ) {
- int (*preHookFunc) (const config_setting_t *setting, const char *name, const char **value);
+ int (*preHookFunc) (const struct config_setting_t *setting, const char *name, const char **value);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_string_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_string_pre[hIndex].func;
@@ -36607,7 +36634,7 @@ int HP_libconfig_setting_lookup_string(const config_setting_t *setting, const ch
retVal___ = HPMHooks.source.libconfig.setting_lookup_string(setting, name, value);
}
if( HPMHooks.count.HP_libconfig_setting_lookup_string_post ) {
- int (*postHookFunc) (int retVal___, const config_setting_t *setting, const char *name, const char **value);
+ int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, const char **value);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_string_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_string_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting, name, value);
@@ -36615,11 +36642,11 @@ int HP_libconfig_setting_lookup_string(const config_setting_t *setting, const ch
}
return retVal___;
}
-int HP_libconfig_setting_set_int(config_setting_t *setting, int value) {
+int HP_libconfig_setting_set_int(struct config_setting_t *setting, int value) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_setting_set_int_pre ) {
- int (*preHookFunc) (config_setting_t *setting, int *value);
+ int (*preHookFunc) (struct config_setting_t *setting, int *value);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_set_int_pre[hIndex].func;
@@ -36634,7 +36661,7 @@ int HP_libconfig_setting_set_int(config_setting_t *setting, int value) {
retVal___ = HPMHooks.source.libconfig.setting_set_int(setting, value);
}
if( HPMHooks.count.HP_libconfig_setting_set_int_post ) {
- int (*postHookFunc) (int retVal___, config_setting_t *setting, int *value);
+ int (*postHookFunc) (int retVal___, struct config_setting_t *setting, int *value);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_set_int_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting, &value);
@@ -36642,11 +36669,11 @@ int HP_libconfig_setting_set_int(config_setting_t *setting, int value) {
}
return retVal___;
}
-int HP_libconfig_setting_set_int64(config_setting_t *setting, long long value) {
+int HP_libconfig_setting_set_int64(struct config_setting_t *setting, long long value) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_setting_set_int64_pre ) {
- int (*preHookFunc) (config_setting_t *setting, long long *value);
+ int (*preHookFunc) (struct config_setting_t *setting, long long *value);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int64_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_set_int64_pre[hIndex].func;
@@ -36661,7 +36688,7 @@ int HP_libconfig_setting_set_int64(config_setting_t *setting, long long value) {
retVal___ = HPMHooks.source.libconfig.setting_set_int64(setting, value);
}
if( HPMHooks.count.HP_libconfig_setting_set_int64_post ) {
- int (*postHookFunc) (int retVal___, config_setting_t *setting, long long *value);
+ int (*postHookFunc) (int retVal___, struct config_setting_t *setting, long long *value);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int64_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_set_int64_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting, &value);
@@ -36669,11 +36696,11 @@ int HP_libconfig_setting_set_int64(config_setting_t *setting, long long value) {
}
return retVal___;
}
-int HP_libconfig_setting_set_float(config_setting_t *setting, double value) {
+int HP_libconfig_setting_set_float(struct config_setting_t *setting, double value) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_setting_set_float_pre ) {
- int (*preHookFunc) (config_setting_t *setting, double *value);
+ int (*preHookFunc) (struct config_setting_t *setting, double *value);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_float_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_set_float_pre[hIndex].func;
@@ -36688,7 +36715,7 @@ int HP_libconfig_setting_set_float(config_setting_t *setting, double value) {
retVal___ = HPMHooks.source.libconfig.setting_set_float(setting, value);
}
if( HPMHooks.count.HP_libconfig_setting_set_float_post ) {
- int (*postHookFunc) (int retVal___, config_setting_t *setting, double *value);
+ int (*postHookFunc) (int retVal___, struct config_setting_t *setting, double *value);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_float_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_set_float_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting, &value);
@@ -36696,11 +36723,11 @@ int HP_libconfig_setting_set_float(config_setting_t *setting, double value) {
}
return retVal___;
}
-int HP_libconfig_setting_set_bool(config_setting_t *setting, int value) {
+int HP_libconfig_setting_set_bool(struct config_setting_t *setting, int value) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_setting_set_bool_pre ) {
- int (*preHookFunc) (config_setting_t *setting, int *value);
+ int (*preHookFunc) (struct config_setting_t *setting, int *value);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_bool_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_set_bool_pre[hIndex].func;
@@ -36715,7 +36742,7 @@ int HP_libconfig_setting_set_bool(config_setting_t *setting, int value) {
retVal___ = HPMHooks.source.libconfig.setting_set_bool(setting, value);
}
if( HPMHooks.count.HP_libconfig_setting_set_bool_post ) {
- int (*postHookFunc) (int retVal___, config_setting_t *setting, int *value);
+ int (*postHookFunc) (int retVal___, struct config_setting_t *setting, int *value);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_bool_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_set_bool_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting, &value);
@@ -36723,11 +36750,11 @@ int HP_libconfig_setting_set_bool(config_setting_t *setting, int value) {
}
return retVal___;
}
-int HP_libconfig_setting_set_string(config_setting_t *setting, const char *value) {
+int HP_libconfig_setting_set_string(struct config_setting_t *setting, const char *value) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_setting_set_string_pre ) {
- int (*preHookFunc) (config_setting_t *setting, const char *value);
+ int (*preHookFunc) (struct config_setting_t *setting, const char *value);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_string_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_set_string_pre[hIndex].func;
@@ -36742,7 +36769,7 @@ int HP_libconfig_setting_set_string(config_setting_t *setting, const char *value
retVal___ = HPMHooks.source.libconfig.setting_set_string(setting, value);
}
if( HPMHooks.count.HP_libconfig_setting_set_string_post ) {
- int (*postHookFunc) (int retVal___, config_setting_t *setting, const char *value);
+ int (*postHookFunc) (int retVal___, struct config_setting_t *setting, const char *value);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_string_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_set_string_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting, value);
@@ -36750,11 +36777,11 @@ int HP_libconfig_setting_set_string(config_setting_t *setting, const char *value
}
return retVal___;
}
-int HP_libconfig_setting_set_format(config_setting_t *setting, short format) {
+int HP_libconfig_setting_set_format(struct config_setting_t *setting, short format) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_setting_set_format_pre ) {
- int (*preHookFunc) (config_setting_t *setting, short *format);
+ int (*preHookFunc) (struct config_setting_t *setting, short *format);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_format_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_set_format_pre[hIndex].func;
@@ -36769,7 +36796,7 @@ int HP_libconfig_setting_set_format(config_setting_t *setting, short format) {
retVal___ = HPMHooks.source.libconfig.setting_set_format(setting, format);
}
if( HPMHooks.count.HP_libconfig_setting_set_format_post ) {
- int (*postHookFunc) (int retVal___, config_setting_t *setting, short *format);
+ int (*postHookFunc) (int retVal___, struct config_setting_t *setting, short *format);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_format_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_set_format_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting, &format);
@@ -36777,11 +36804,11 @@ int HP_libconfig_setting_set_format(config_setting_t *setting, short format) {
}
return retVal___;
}
-short HP_libconfig_setting_get_format(const config_setting_t *setting) {
+short HP_libconfig_setting_get_format(const struct config_setting_t *setting) {
int hIndex = 0;
short retVal___ = 0;
if( HPMHooks.count.HP_libconfig_setting_get_format_pre ) {
- short (*preHookFunc) (const config_setting_t *setting);
+ short (*preHookFunc) (const struct config_setting_t *setting);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_format_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_get_format_pre[hIndex].func;
@@ -36796,7 +36823,7 @@ short HP_libconfig_setting_get_format(const config_setting_t *setting) {
retVal___ = HPMHooks.source.libconfig.setting_get_format(setting);
}
if( HPMHooks.count.HP_libconfig_setting_get_format_post ) {
- short (*postHookFunc) (short retVal___, const config_setting_t *setting);
+ short (*postHookFunc) (short retVal___, const struct config_setting_t *setting);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_format_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_get_format_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting);
@@ -36804,11 +36831,11 @@ short HP_libconfig_setting_get_format(const config_setting_t *setting) {
}
return retVal___;
}
-int HP_libconfig_setting_get_int_elem(const config_setting_t *setting, int idx) {
+int HP_libconfig_setting_get_int_elem(const struct config_setting_t *setting, int idx) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_setting_get_int_elem_pre ) {
- int (*preHookFunc) (const config_setting_t *setting, int *idx);
+ int (*preHookFunc) (const struct config_setting_t *setting, int *idx);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int_elem_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_get_int_elem_pre[hIndex].func;
@@ -36823,7 +36850,7 @@ int HP_libconfig_setting_get_int_elem(const config_setting_t *setting, int idx)
retVal___ = HPMHooks.source.libconfig.setting_get_int_elem(setting, idx);
}
if( HPMHooks.count.HP_libconfig_setting_get_int_elem_post ) {
- int (*postHookFunc) (int retVal___, const config_setting_t *setting, int *idx);
+ int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, int *idx);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int_elem_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_get_int_elem_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting, &idx);
@@ -36831,11 +36858,11 @@ int HP_libconfig_setting_get_int_elem(const config_setting_t *setting, int idx)
}
return retVal___;
}
-long long HP_libconfig_setting_get_int64_elem(const config_setting_t *setting, int idx) {
+long long HP_libconfig_setting_get_int64_elem(const struct config_setting_t *setting, int idx) {
int hIndex = 0;
long long retVal___ = 0;
if( HPMHooks.count.HP_libconfig_setting_get_int64_elem_pre ) {
- long long (*preHookFunc) (const config_setting_t *setting, int *idx);
+ long long (*preHookFunc) (const struct config_setting_t *setting, int *idx);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int64_elem_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_get_int64_elem_pre[hIndex].func;
@@ -36850,7 +36877,7 @@ long long HP_libconfig_setting_get_int64_elem(const config_setting_t *setting, i
retVal___ = HPMHooks.source.libconfig.setting_get_int64_elem(setting, idx);
}
if( HPMHooks.count.HP_libconfig_setting_get_int64_elem_post ) {
- long long (*postHookFunc) (long long retVal___, const config_setting_t *setting, int *idx);
+ long long (*postHookFunc) (long long retVal___, const struct config_setting_t *setting, int *idx);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int64_elem_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_get_int64_elem_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting, &idx);
@@ -36858,11 +36885,11 @@ long long HP_libconfig_setting_get_int64_elem(const config_setting_t *setting, i
}
return retVal___;
}
-double HP_libconfig_setting_get_float_elem(const config_setting_t *setting, int idx) {
+double HP_libconfig_setting_get_float_elem(const struct config_setting_t *setting, int idx) {
int hIndex = 0;
double retVal___ = 0.;
if( HPMHooks.count.HP_libconfig_setting_get_float_elem_pre ) {
- double (*preHookFunc) (const config_setting_t *setting, int *idx);
+ double (*preHookFunc) (const struct config_setting_t *setting, int *idx);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_float_elem_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_get_float_elem_pre[hIndex].func;
@@ -36877,7 +36904,7 @@ double HP_libconfig_setting_get_float_elem(const config_setting_t *setting, int
retVal___ = HPMHooks.source.libconfig.setting_get_float_elem(setting, idx);
}
if( HPMHooks.count.HP_libconfig_setting_get_float_elem_post ) {
- double (*postHookFunc) (double retVal___, const config_setting_t *setting, int *idx);
+ double (*postHookFunc) (double retVal___, const struct config_setting_t *setting, int *idx);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_float_elem_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_get_float_elem_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting, &idx);
@@ -36885,11 +36912,11 @@ double HP_libconfig_setting_get_float_elem(const config_setting_t *setting, int
}
return retVal___;
}
-int HP_libconfig_setting_get_bool_elem(const config_setting_t *setting, int idx) {
+int HP_libconfig_setting_get_bool_elem(const struct config_setting_t *setting, int idx) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_setting_get_bool_elem_pre ) {
- int (*preHookFunc) (const config_setting_t *setting, int *idx);
+ int (*preHookFunc) (const struct config_setting_t *setting, int *idx);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_bool_elem_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_get_bool_elem_pre[hIndex].func;
@@ -36904,7 +36931,7 @@ int HP_libconfig_setting_get_bool_elem(const config_setting_t *setting, int idx)
retVal___ = HPMHooks.source.libconfig.setting_get_bool_elem(setting, idx);
}
if( HPMHooks.count.HP_libconfig_setting_get_bool_elem_post ) {
- int (*postHookFunc) (int retVal___, const config_setting_t *setting, int *idx);
+ int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, int *idx);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_bool_elem_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_get_bool_elem_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting, &idx);
@@ -36912,11 +36939,11 @@ int HP_libconfig_setting_get_bool_elem(const config_setting_t *setting, int idx)
}
return retVal___;
}
-const char* HP_libconfig_setting_get_string_elem(const config_setting_t *setting, int idx) {
+const char* HP_libconfig_setting_get_string_elem(const struct config_setting_t *setting, int idx) {
int hIndex = 0;
const char* retVal___ = NULL;
if( HPMHooks.count.HP_libconfig_setting_get_string_elem_pre ) {
- const char* (*preHookFunc) (const config_setting_t *setting, int *idx);
+ const char* (*preHookFunc) (const struct config_setting_t *setting, int *idx);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_string_elem_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_get_string_elem_pre[hIndex].func;
@@ -36931,7 +36958,7 @@ const char* HP_libconfig_setting_get_string_elem(const config_setting_t *setting
retVal___ = HPMHooks.source.libconfig.setting_get_string_elem(setting, idx);
}
if( HPMHooks.count.HP_libconfig_setting_get_string_elem_post ) {
- const char* (*postHookFunc) (const char* retVal___, const config_setting_t *setting, int *idx);
+ const char* (*postHookFunc) (const char* retVal___, const struct config_setting_t *setting, int *idx);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_string_elem_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_get_string_elem_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting, &idx);
@@ -36939,11 +36966,11 @@ const char* HP_libconfig_setting_get_string_elem(const config_setting_t *setting
}
return retVal___;
}
-config_setting_t* HP_libconfig_setting_set_int_elem(config_setting_t *setting, int idx, int value) {
+struct config_setting_t* HP_libconfig_setting_set_int_elem(struct config_setting_t *setting, int idx, int value) {
int hIndex = 0;
- config_setting_t* retVal___ = NULL;
+ struct config_setting_t* retVal___ = NULL;
if( HPMHooks.count.HP_libconfig_setting_set_int_elem_pre ) {
- config_setting_t* (*preHookFunc) (config_setting_t *setting, int *idx, int *value);
+ struct config_setting_t* (*preHookFunc) (struct config_setting_t *setting, int *idx, int *value);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int_elem_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_set_int_elem_pre[hIndex].func;
@@ -36958,7 +36985,7 @@ config_setting_t* HP_libconfig_setting_set_int_elem(config_setting_t *setting, i
retVal___ = HPMHooks.source.libconfig.setting_set_int_elem(setting, idx, value);
}
if( HPMHooks.count.HP_libconfig_setting_set_int_elem_post ) {
- config_setting_t* (*postHookFunc) (config_setting_t* retVal___, config_setting_t *setting, int *idx, int *value);
+ struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int *idx, int *value);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int_elem_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_set_int_elem_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting, &idx, &value);
@@ -36966,11 +36993,11 @@ config_setting_t* HP_libconfig_setting_set_int_elem(config_setting_t *setting, i
}
return retVal___;
}
-config_setting_t* HP_libconfig_setting_set_int64_elem(config_setting_t *setting, int idx, long long value) {
+struct config_setting_t* HP_libconfig_setting_set_int64_elem(struct config_setting_t *setting, int idx, long long value) {
int hIndex = 0;
- config_setting_t* retVal___ = NULL;
+ struct config_setting_t* retVal___ = NULL;
if( HPMHooks.count.HP_libconfig_setting_set_int64_elem_pre ) {
- config_setting_t* (*preHookFunc) (config_setting_t *setting, int *idx, long long *value);
+ struct config_setting_t* (*preHookFunc) (struct config_setting_t *setting, int *idx, long long *value);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int64_elem_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_set_int64_elem_pre[hIndex].func;
@@ -36985,7 +37012,7 @@ config_setting_t* HP_libconfig_setting_set_int64_elem(config_setting_t *setting,
retVal___ = HPMHooks.source.libconfig.setting_set_int64_elem(setting, idx, value);
}
if( HPMHooks.count.HP_libconfig_setting_set_int64_elem_post ) {
- config_setting_t* (*postHookFunc) (config_setting_t* retVal___, config_setting_t *setting, int *idx, long long *value);
+ struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int *idx, long long *value);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int64_elem_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_set_int64_elem_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting, &idx, &value);
@@ -36993,11 +37020,11 @@ config_setting_t* HP_libconfig_setting_set_int64_elem(config_setting_t *setting,
}
return retVal___;
}
-config_setting_t* HP_libconfig_setting_set_float_elem(config_setting_t *setting, int idx, double value) {
+struct config_setting_t* HP_libconfig_setting_set_float_elem(struct config_setting_t *setting, int idx, double value) {
int hIndex = 0;
- config_setting_t* retVal___ = NULL;
+ struct config_setting_t* retVal___ = NULL;
if( HPMHooks.count.HP_libconfig_setting_set_float_elem_pre ) {
- config_setting_t* (*preHookFunc) (config_setting_t *setting, int *idx, double *value);
+ struct config_setting_t* (*preHookFunc) (struct config_setting_t *setting, int *idx, double *value);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_float_elem_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_set_float_elem_pre[hIndex].func;
@@ -37012,7 +37039,7 @@ config_setting_t* HP_libconfig_setting_set_float_elem(config_setting_t *setting,
retVal___ = HPMHooks.source.libconfig.setting_set_float_elem(setting, idx, value);
}
if( HPMHooks.count.HP_libconfig_setting_set_float_elem_post ) {
- config_setting_t* (*postHookFunc) (config_setting_t* retVal___, config_setting_t *setting, int *idx, double *value);
+ struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int *idx, double *value);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_float_elem_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_set_float_elem_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting, &idx, &value);
@@ -37020,11 +37047,11 @@ config_setting_t* HP_libconfig_setting_set_float_elem(config_setting_t *setting,
}
return retVal___;
}
-config_setting_t* HP_libconfig_setting_set_bool_elem(config_setting_t *setting, int idx, int value) {
+struct config_setting_t* HP_libconfig_setting_set_bool_elem(struct config_setting_t *setting, int idx, int value) {
int hIndex = 0;
- config_setting_t* retVal___ = NULL;
+ struct config_setting_t* retVal___ = NULL;
if( HPMHooks.count.HP_libconfig_setting_set_bool_elem_pre ) {
- config_setting_t* (*preHookFunc) (config_setting_t *setting, int *idx, int *value);
+ struct config_setting_t* (*preHookFunc) (struct config_setting_t *setting, int *idx, int *value);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_bool_elem_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_set_bool_elem_pre[hIndex].func;
@@ -37039,7 +37066,7 @@ config_setting_t* HP_libconfig_setting_set_bool_elem(config_setting_t *setting,
retVal___ = HPMHooks.source.libconfig.setting_set_bool_elem(setting, idx, value);
}
if( HPMHooks.count.HP_libconfig_setting_set_bool_elem_post ) {
- config_setting_t* (*postHookFunc) (config_setting_t* retVal___, config_setting_t *setting, int *idx, int *value);
+ struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int *idx, int *value);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_bool_elem_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_set_bool_elem_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting, &idx, &value);
@@ -37047,11 +37074,11 @@ config_setting_t* HP_libconfig_setting_set_bool_elem(config_setting_t *setting,
}
return retVal___;
}
-config_setting_t* HP_libconfig_setting_set_string_elem(config_setting_t *setting, int idx, const char *value) {
+struct config_setting_t* HP_libconfig_setting_set_string_elem(struct config_setting_t *setting, int idx, const char *value) {
int hIndex = 0;
- config_setting_t* retVal___ = NULL;
+ struct config_setting_t* retVal___ = NULL;
if( HPMHooks.count.HP_libconfig_setting_set_string_elem_pre ) {
- config_setting_t* (*preHookFunc) (config_setting_t *setting, int *idx, const char *value);
+ struct config_setting_t* (*preHookFunc) (struct config_setting_t *setting, int *idx, const char *value);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_string_elem_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_set_string_elem_pre[hIndex].func;
@@ -37066,7 +37093,7 @@ config_setting_t* HP_libconfig_setting_set_string_elem(config_setting_t *setting
retVal___ = HPMHooks.source.libconfig.setting_set_string_elem(setting, idx, value);
}
if( HPMHooks.count.HP_libconfig_setting_set_string_elem_post ) {
- config_setting_t* (*postHookFunc) (config_setting_t* retVal___, config_setting_t *setting, int *idx, const char *value);
+ struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int *idx, const char *value);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_string_elem_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_set_string_elem_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting, &idx, value);
@@ -37074,11 +37101,11 @@ config_setting_t* HP_libconfig_setting_set_string_elem(config_setting_t *setting
}
return retVal___;
}
-int HP_libconfig_setting_index(const config_setting_t *setting) {
+int HP_libconfig_setting_index(const struct config_setting_t *setting) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_setting_index_pre ) {
- int (*preHookFunc) (const config_setting_t *setting);
+ int (*preHookFunc) (const struct config_setting_t *setting);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_index_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_index_pre[hIndex].func;
@@ -37093,7 +37120,7 @@ int HP_libconfig_setting_index(const config_setting_t *setting) {
retVal___ = HPMHooks.source.libconfig.setting_index(setting);
}
if( HPMHooks.count.HP_libconfig_setting_index_post ) {
- int (*postHookFunc) (int retVal___, const config_setting_t *setting);
+ int (*postHookFunc) (int retVal___, const struct config_setting_t *setting);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_index_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_index_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting);
@@ -37101,11 +37128,11 @@ int HP_libconfig_setting_index(const config_setting_t *setting) {
}
return retVal___;
}
-int HP_libconfig_setting_length(const config_setting_t *setting) {
+int HP_libconfig_setting_length(const struct config_setting_t *setting) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_setting_length_pre ) {
- int (*preHookFunc) (const config_setting_t *setting);
+ int (*preHookFunc) (const struct config_setting_t *setting);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_length_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_length_pre[hIndex].func;
@@ -37120,7 +37147,7 @@ int HP_libconfig_setting_length(const config_setting_t *setting) {
retVal___ = HPMHooks.source.libconfig.setting_length(setting);
}
if( HPMHooks.count.HP_libconfig_setting_length_post ) {
- int (*postHookFunc) (int retVal___, const config_setting_t *setting);
+ int (*postHookFunc) (int retVal___, const struct config_setting_t *setting);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_length_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_length_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting);
@@ -37128,11 +37155,11 @@ int HP_libconfig_setting_length(const config_setting_t *setting) {
}
return retVal___;
}
-config_setting_t* HP_libconfig_setting_get_elem(const config_setting_t *setting, unsigned int idx) {
+struct config_setting_t* HP_libconfig_setting_get_elem(const struct config_setting_t *setting, unsigned int idx) {
int hIndex = 0;
- config_setting_t* retVal___ = NULL;
+ struct config_setting_t* retVal___ = NULL;
if( HPMHooks.count.HP_libconfig_setting_get_elem_pre ) {
- config_setting_t* (*preHookFunc) (const config_setting_t *setting, unsigned int *idx);
+ struct config_setting_t* (*preHookFunc) (const struct config_setting_t *setting, unsigned int *idx);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_elem_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_get_elem_pre[hIndex].func;
@@ -37147,7 +37174,7 @@ config_setting_t* HP_libconfig_setting_get_elem(const config_setting_t *setting,
retVal___ = HPMHooks.source.libconfig.setting_get_elem(setting, idx);
}
if( HPMHooks.count.HP_libconfig_setting_get_elem_post ) {
- config_setting_t* (*postHookFunc) (config_setting_t* retVal___, const config_setting_t *setting, unsigned int *idx);
+ struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, const struct config_setting_t *setting, unsigned int *idx);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_elem_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_get_elem_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting, &idx);
@@ -37155,11 +37182,11 @@ config_setting_t* HP_libconfig_setting_get_elem(const config_setting_t *setting,
}
return retVal___;
}
-config_setting_t* HP_libconfig_setting_get_member(const config_setting_t *setting, const char *name) {
+struct config_setting_t* HP_libconfig_setting_get_member(const struct config_setting_t *setting, const char *name) {
int hIndex = 0;
- config_setting_t* retVal___ = NULL;
+ struct config_setting_t* retVal___ = NULL;
if( HPMHooks.count.HP_libconfig_setting_get_member_pre ) {
- config_setting_t* (*preHookFunc) (const config_setting_t *setting, const char *name);
+ struct config_setting_t* (*preHookFunc) (const struct config_setting_t *setting, const char *name);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_member_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_get_member_pre[hIndex].func;
@@ -37174,7 +37201,7 @@ config_setting_t* HP_libconfig_setting_get_member(const config_setting_t *settin
retVal___ = HPMHooks.source.libconfig.setting_get_member(setting, name);
}
if( HPMHooks.count.HP_libconfig_setting_get_member_post ) {
- config_setting_t* (*postHookFunc) (config_setting_t* retVal___, const config_setting_t *setting, const char *name);
+ struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, const struct config_setting_t *setting, const char *name);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_member_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_get_member_post[hIndex].func;
retVal___ = postHookFunc(retVal___, setting, name);
@@ -37182,11 +37209,11 @@ config_setting_t* HP_libconfig_setting_get_member(const config_setting_t *settin
}
return retVal___;
}
-config_setting_t* HP_libconfig_setting_add(config_setting_t *parent, const char *name, int type) {
+struct config_setting_t* HP_libconfig_setting_add(struct config_setting_t *parent, const char *name, int type) {
int hIndex = 0;
- config_setting_t* retVal___ = NULL;
+ struct config_setting_t* retVal___ = NULL;
if( HPMHooks.count.HP_libconfig_setting_add_pre ) {
- config_setting_t* (*preHookFunc) (config_setting_t *parent, const char *name, int *type);
+ struct config_setting_t* (*preHookFunc) (struct config_setting_t *parent, const char *name, int *type);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_add_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_add_pre[hIndex].func;
@@ -37201,7 +37228,7 @@ config_setting_t* HP_libconfig_setting_add(config_setting_t *parent, const char
retVal___ = HPMHooks.source.libconfig.setting_add(parent, name, type);
}
if( HPMHooks.count.HP_libconfig_setting_add_post ) {
- config_setting_t* (*postHookFunc) (config_setting_t* retVal___, config_setting_t *parent, const char *name, int *type);
+ struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *parent, const char *name, int *type);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_add_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_add_post[hIndex].func;
retVal___ = postHookFunc(retVal___, parent, name, &type);
@@ -37209,11 +37236,11 @@ config_setting_t* HP_libconfig_setting_add(config_setting_t *parent, const char
}
return retVal___;
}
-int HP_libconfig_setting_remove(config_setting_t *parent, const char *name) {
+int HP_libconfig_setting_remove(struct config_setting_t *parent, const char *name) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_setting_remove_pre ) {
- int (*preHookFunc) (config_setting_t *parent, const char *name);
+ int (*preHookFunc) (struct config_setting_t *parent, const char *name);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_remove_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_remove_pre[hIndex].func;
@@ -37228,7 +37255,7 @@ int HP_libconfig_setting_remove(config_setting_t *parent, const char *name) {
retVal___ = HPMHooks.source.libconfig.setting_remove(parent, name);
}
if( HPMHooks.count.HP_libconfig_setting_remove_post ) {
- int (*postHookFunc) (int retVal___, config_setting_t *parent, const char *name);
+ int (*postHookFunc) (int retVal___, struct config_setting_t *parent, const char *name);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_remove_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_remove_post[hIndex].func;
retVal___ = postHookFunc(retVal___, parent, name);
@@ -37236,11 +37263,11 @@ int HP_libconfig_setting_remove(config_setting_t *parent, const char *name) {
}
return retVal___;
}
-int HP_libconfig_setting_remove_elem(config_setting_t *parent, unsigned int idx) {
+int HP_libconfig_setting_remove_elem(struct config_setting_t *parent, unsigned int idx) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_setting_remove_elem_pre ) {
- int (*preHookFunc) (config_setting_t *parent, unsigned int *idx);
+ int (*preHookFunc) (struct config_setting_t *parent, unsigned int *idx);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_remove_elem_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_remove_elem_pre[hIndex].func;
@@ -37255,7 +37282,7 @@ int HP_libconfig_setting_remove_elem(config_setting_t *parent, unsigned int idx)
retVal___ = HPMHooks.source.libconfig.setting_remove_elem(parent, idx);
}
if( HPMHooks.count.HP_libconfig_setting_remove_elem_post ) {
- int (*postHookFunc) (int retVal___, config_setting_t *parent, unsigned int *idx);
+ int (*postHookFunc) (int retVal___, struct config_setting_t *parent, unsigned int *idx);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_remove_elem_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_remove_elem_post[hIndex].func;
retVal___ = postHookFunc(retVal___, parent, &idx);
@@ -37263,10 +37290,10 @@ int HP_libconfig_setting_remove_elem(config_setting_t *parent, unsigned int idx)
}
return retVal___;
}
-void HP_libconfig_setting_set_hook(config_setting_t *setting, void *hook) {
+void HP_libconfig_setting_set_hook(struct config_setting_t *setting, void *hook) {
int hIndex = 0;
if( HPMHooks.count.HP_libconfig_setting_set_hook_pre ) {
- void (*preHookFunc) (config_setting_t *setting, void *hook);
+ void (*preHookFunc) (struct config_setting_t *setting, void *hook);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_hook_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_set_hook_pre[hIndex].func;
@@ -37281,7 +37308,7 @@ void HP_libconfig_setting_set_hook(config_setting_t *setting, void *hook) {
HPMHooks.source.libconfig.setting_set_hook(setting, hook);
}
if( HPMHooks.count.HP_libconfig_setting_set_hook_post ) {
- void (*postHookFunc) (config_setting_t *setting, void *hook);
+ void (*postHookFunc) (struct config_setting_t *setting, void *hook);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_hook_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_set_hook_post[hIndex].func;
postHookFunc(setting, hook);
@@ -37289,11 +37316,11 @@ void HP_libconfig_setting_set_hook(config_setting_t *setting, void *hook) {
}
return;
}
-config_setting_t* HP_libconfig_lookup(const config_t *config, const char *filepath) {
+struct config_setting_t* HP_libconfig_lookup(const struct config_t *config, const char *filepath) {
int hIndex = 0;
- config_setting_t* retVal___ = NULL;
+ struct config_setting_t* retVal___ = NULL;
if( HPMHooks.count.HP_libconfig_lookup_pre ) {
- config_setting_t* (*preHookFunc) (const config_t *config, const char *filepath);
+ struct config_setting_t* (*preHookFunc) (const struct config_t *config, const char *filepath);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_lookup_pre[hIndex].func;
@@ -37308,7 +37335,7 @@ config_setting_t* HP_libconfig_lookup(const config_t *config, const char *filepa
retVal___ = HPMHooks.source.libconfig.lookup(config, filepath);
}
if( HPMHooks.count.HP_libconfig_lookup_post ) {
- config_setting_t* (*postHookFunc) (config_setting_t* retVal___, const config_t *config, const char *filepath);
+ struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, const struct config_t *config, const char *filepath);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_lookup_post[hIndex].func;
retVal___ = postHookFunc(retVal___, config, filepath);
@@ -37316,38 +37343,11 @@ config_setting_t* HP_libconfig_lookup(const config_t *config, const char *filepa
}
return retVal___;
}
-config_setting_t* HP_libconfig_lookup_from(config_setting_t *setting, const char *filepath) {
- int hIndex = 0;
- config_setting_t* retVal___ = NULL;
- if( HPMHooks.count.HP_libconfig_lookup_from_pre ) {
- config_setting_t* (*preHookFunc) (config_setting_t *setting, const char *filepath);
- *HPMforce_return = false;
- for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_from_pre; hIndex++ ) {
- preHookFunc = HPMHooks.list.HP_libconfig_lookup_from_pre[hIndex].func;
- retVal___ = preHookFunc(setting, filepath);
- }
- if( *HPMforce_return ) {
- *HPMforce_return = false;
- return retVal___;
- }
- }
- {
- retVal___ = HPMHooks.source.libconfig.lookup_from(setting, filepath);
- }
- if( HPMHooks.count.HP_libconfig_lookup_from_post ) {
- config_setting_t* (*postHookFunc) (config_setting_t* retVal___, config_setting_t *setting, const char *filepath);
- for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_from_post; hIndex++ ) {
- postHookFunc = HPMHooks.list.HP_libconfig_lookup_from_post[hIndex].func;
- retVal___ = postHookFunc(retVal___, setting, filepath);
- }
- }
- return retVal___;
-}
-int HP_libconfig_lookup_int(const config_t *config, const char *filepath, int *value) {
+int HP_libconfig_lookup_int(const struct config_t *config, const char *filepath, int *value) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_lookup_int_pre ) {
- int (*preHookFunc) (const config_t *config, const char *filepath, int *value);
+ int (*preHookFunc) (const struct config_t *config, const char *filepath, int *value);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_int_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_lookup_int_pre[hIndex].func;
@@ -37362,7 +37362,7 @@ int HP_libconfig_lookup_int(const config_t *config, const char *filepath, int *v
retVal___ = HPMHooks.source.libconfig.lookup_int(config, filepath, value);
}
if( HPMHooks.count.HP_libconfig_lookup_int_post ) {
- int (*postHookFunc) (int retVal___, const config_t *config, const char *filepath, int *value);
+ int (*postHookFunc) (int retVal___, const struct config_t *config, const char *filepath, int *value);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_int_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_lookup_int_post[hIndex].func;
retVal___ = postHookFunc(retVal___, config, filepath, value);
@@ -37370,11 +37370,11 @@ int HP_libconfig_lookup_int(const config_t *config, const char *filepath, int *v
}
return retVal___;
}
-int HP_libconfig_lookup_int64(const config_t *config, const char *filepath, long long *value) {
+int HP_libconfig_lookup_int64(const struct config_t *config, const char *filepath, long long *value) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_lookup_int64_pre ) {
- int (*preHookFunc) (const config_t *config, const char *filepath, long long *value);
+ int (*preHookFunc) (const struct config_t *config, const char *filepath, long long *value);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_int64_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_lookup_int64_pre[hIndex].func;
@@ -37389,7 +37389,7 @@ int HP_libconfig_lookup_int64(const config_t *config, const char *filepath, long
retVal___ = HPMHooks.source.libconfig.lookup_int64(config, filepath, value);
}
if( HPMHooks.count.HP_libconfig_lookup_int64_post ) {
- int (*postHookFunc) (int retVal___, const config_t *config, const char *filepath, long long *value);
+ int (*postHookFunc) (int retVal___, const struct config_t *config, const char *filepath, long long *value);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_int64_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_lookup_int64_post[hIndex].func;
retVal___ = postHookFunc(retVal___, config, filepath, value);
@@ -37397,11 +37397,11 @@ int HP_libconfig_lookup_int64(const config_t *config, const char *filepath, long
}
return retVal___;
}
-int HP_libconfig_lookup_float(const config_t *config, const char *filepath, double *value) {
+int HP_libconfig_lookup_float(const struct config_t *config, const char *filepath, double *value) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_lookup_float_pre ) {
- int (*preHookFunc) (const config_t *config, const char *filepath, double *value);
+ int (*preHookFunc) (const struct config_t *config, const char *filepath, double *value);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_float_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_lookup_float_pre[hIndex].func;
@@ -37416,7 +37416,7 @@ int HP_libconfig_lookup_float(const config_t *config, const char *filepath, doub
retVal___ = HPMHooks.source.libconfig.lookup_float(config, filepath, value);
}
if( HPMHooks.count.HP_libconfig_lookup_float_post ) {
- int (*postHookFunc) (int retVal___, const config_t *config, const char *filepath, double *value);
+ int (*postHookFunc) (int retVal___, const struct config_t *config, const char *filepath, double *value);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_float_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_lookup_float_post[hIndex].func;
retVal___ = postHookFunc(retVal___, config, filepath, value);
@@ -37424,11 +37424,11 @@ int HP_libconfig_lookup_float(const config_t *config, const char *filepath, doub
}
return retVal___;
}
-int HP_libconfig_lookup_bool(const config_t *config, const char *filepath, int *value) {
+int HP_libconfig_lookup_bool(const struct config_t *config, const char *filepath, int *value) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_lookup_bool_pre ) {
- int (*preHookFunc) (const config_t *config, const char *filepath, int *value);
+ int (*preHookFunc) (const struct config_t *config, const char *filepath, int *value);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_bool_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_lookup_bool_pre[hIndex].func;
@@ -37443,7 +37443,7 @@ int HP_libconfig_lookup_bool(const config_t *config, const char *filepath, int *
retVal___ = HPMHooks.source.libconfig.lookup_bool(config, filepath, value);
}
if( HPMHooks.count.HP_libconfig_lookup_bool_post ) {
- int (*postHookFunc) (int retVal___, const config_t *config, const char *filepath, int *value);
+ int (*postHookFunc) (int retVal___, const struct config_t *config, const char *filepath, int *value);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_bool_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_lookup_bool_post[hIndex].func;
retVal___ = postHookFunc(retVal___, config, filepath, value);
@@ -37451,11 +37451,11 @@ int HP_libconfig_lookup_bool(const config_t *config, const char *filepath, int *
}
return retVal___;
}
-int HP_libconfig_lookup_string(const config_t *config, const char *filepath, const char **value) {
+int HP_libconfig_lookup_string(const struct config_t *config, const char *filepath, const char **value) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_lookup_string_pre ) {
- int (*preHookFunc) (const config_t *config, const char *filepath, const char **value);
+ int (*preHookFunc) (const struct config_t *config, const char *filepath, const char **value);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_string_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_lookup_string_pre[hIndex].func;
@@ -37470,7 +37470,7 @@ int HP_libconfig_lookup_string(const config_t *config, const char *filepath, con
retVal___ = HPMHooks.source.libconfig.lookup_string(config, filepath, value);
}
if( HPMHooks.count.HP_libconfig_lookup_string_post ) {
- int (*postHookFunc) (int retVal___, const config_t *config, const char *filepath, const char **value);
+ int (*postHookFunc) (int retVal___, const struct config_t *config, const char *filepath, const char **value);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_string_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_lookup_string_post[hIndex].func;
retVal___ = postHookFunc(retVal___, config, filepath, value);
@@ -37478,14 +37478,14 @@ int HP_libconfig_lookup_string(const config_t *config, const char *filepath, con
}
return retVal___;
}
-int HP_libconfig_read_file(config_t *config, const char *config_filename) {
+int HP_libconfig_load_file(struct config_t *config, const char *config_filename) {
int hIndex = 0;
int retVal___ = 0;
- if( HPMHooks.count.HP_libconfig_read_file_pre ) {
- int (*preHookFunc) (config_t *config, const char *config_filename);
+ if( HPMHooks.count.HP_libconfig_load_file_pre ) {
+ int (*preHookFunc) (struct config_t *config, const char *config_filename);
*HPMforce_return = false;
- for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_read_file_pre; hIndex++ ) {
- preHookFunc = HPMHooks.list.HP_libconfig_read_file_pre[hIndex].func;
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_load_file_pre; hIndex++ ) {
+ preHookFunc = HPMHooks.list.HP_libconfig_load_file_pre[hIndex].func;
retVal___ = preHookFunc(config, config_filename);
}
if( *HPMforce_return ) {
@@ -37494,21 +37494,21 @@ int HP_libconfig_read_file(config_t *config, const char *config_filename) {
}
}
{
- retVal___ = HPMHooks.source.libconfig.read_file(config, config_filename);
+ retVal___ = HPMHooks.source.libconfig.load_file(config, config_filename);
}
- if( HPMHooks.count.HP_libconfig_read_file_post ) {
- int (*postHookFunc) (int retVal___, config_t *config, const char *config_filename);
- for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_read_file_post; hIndex++ ) {
- postHookFunc = HPMHooks.list.HP_libconfig_read_file_post[hIndex].func;
+ if( HPMHooks.count.HP_libconfig_load_file_post ) {
+ int (*postHookFunc) (int retVal___, struct config_t *config, const char *config_filename);
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_load_file_post; hIndex++ ) {
+ postHookFunc = HPMHooks.list.HP_libconfig_load_file_post[hIndex].func;
retVal___ = postHookFunc(retVal___, config, config_filename);
}
}
return retVal___;
}
-void HP_libconfig_setting_copy_simple(config_setting_t *parent, const config_setting_t *src) {
+void HP_libconfig_setting_copy_simple(struct config_setting_t *parent, const struct config_setting_t *src) {
int hIndex = 0;
if( HPMHooks.count.HP_libconfig_setting_copy_simple_pre ) {
- void (*preHookFunc) (config_setting_t *parent, const config_setting_t *src);
+ void (*preHookFunc) (struct config_setting_t *parent, const struct config_setting_t *src);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_copy_simple_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_copy_simple_pre[hIndex].func;
@@ -37523,7 +37523,7 @@ void HP_libconfig_setting_copy_simple(config_setting_t *parent, const config_set
HPMHooks.source.libconfig.setting_copy_simple(parent, src);
}
if( HPMHooks.count.HP_libconfig_setting_copy_simple_post ) {
- void (*postHookFunc) (config_setting_t *parent, const config_setting_t *src);
+ void (*postHookFunc) (struct config_setting_t *parent, const struct config_setting_t *src);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_copy_simple_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_copy_simple_post[hIndex].func;
postHookFunc(parent, src);
@@ -37531,10 +37531,10 @@ void HP_libconfig_setting_copy_simple(config_setting_t *parent, const config_set
}
return;
}
-void HP_libconfig_setting_copy_elem(config_setting_t *parent, const config_setting_t *src) {
+void HP_libconfig_setting_copy_elem(struct config_setting_t *parent, const struct config_setting_t *src) {
int hIndex = 0;
if( HPMHooks.count.HP_libconfig_setting_copy_elem_pre ) {
- void (*preHookFunc) (config_setting_t *parent, const config_setting_t *src);
+ void (*preHookFunc) (struct config_setting_t *parent, const struct config_setting_t *src);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_copy_elem_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_copy_elem_pre[hIndex].func;
@@ -37549,7 +37549,7 @@ void HP_libconfig_setting_copy_elem(config_setting_t *parent, const config_setti
HPMHooks.source.libconfig.setting_copy_elem(parent, src);
}
if( HPMHooks.count.HP_libconfig_setting_copy_elem_post ) {
- void (*postHookFunc) (config_setting_t *parent, const config_setting_t *src);
+ void (*postHookFunc) (struct config_setting_t *parent, const struct config_setting_t *src);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_copy_elem_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_copy_elem_post[hIndex].func;
postHookFunc(parent, src);
@@ -37557,10 +37557,10 @@ void HP_libconfig_setting_copy_elem(config_setting_t *parent, const config_setti
}
return;
}
-void HP_libconfig_setting_copy_aggregate(config_setting_t *parent, const config_setting_t *src) {
+void HP_libconfig_setting_copy_aggregate(struct config_setting_t *parent, const struct config_setting_t *src) {
int hIndex = 0;
if( HPMHooks.count.HP_libconfig_setting_copy_aggregate_pre ) {
- void (*preHookFunc) (config_setting_t *parent, const config_setting_t *src);
+ void (*preHookFunc) (struct config_setting_t *parent, const struct config_setting_t *src);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_copy_aggregate_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_copy_aggregate_pre[hIndex].func;
@@ -37575,7 +37575,7 @@ void HP_libconfig_setting_copy_aggregate(config_setting_t *parent, const config_
HPMHooks.source.libconfig.setting_copy_aggregate(parent, src);
}
if( HPMHooks.count.HP_libconfig_setting_copy_aggregate_post ) {
- void (*postHookFunc) (config_setting_t *parent, const config_setting_t *src);
+ void (*postHookFunc) (struct config_setting_t *parent, const struct config_setting_t *src);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_copy_aggregate_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_copy_aggregate_post[hIndex].func;
postHookFunc(parent, src);
@@ -37583,11 +37583,11 @@ void HP_libconfig_setting_copy_aggregate(config_setting_t *parent, const config_
}
return;
}
-int HP_libconfig_setting_copy(config_setting_t *parent, const config_setting_t *src) {
+int HP_libconfig_setting_copy(struct config_setting_t *parent, const struct config_setting_t *src) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_libconfig_setting_copy_pre ) {
- int (*preHookFunc) (config_setting_t *parent, const config_setting_t *src);
+ int (*preHookFunc) (struct config_setting_t *parent, const struct config_setting_t *src);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_copy_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_libconfig_setting_copy_pre[hIndex].func;
@@ -37602,7 +37602,7 @@ int HP_libconfig_setting_copy(config_setting_t *parent, const config_setting_t *
retVal___ = HPMHooks.source.libconfig.setting_copy(parent, src);
}
if( HPMHooks.count.HP_libconfig_setting_copy_post ) {
- int (*postHookFunc) (int retVal___, config_setting_t *parent, const config_setting_t *src);
+ int (*postHookFunc) (int retVal___, struct config_setting_t *parent, const struct config_setting_t *src);
for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_copy_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_libconfig_setting_copy_post[hIndex].func;
retVal___ = postHookFunc(retVal___, parent, src);
@@ -37610,6 +37610,276 @@ int HP_libconfig_setting_copy(config_setting_t *parent, const config_setting_t *
}
return retVal___;
}
+bool HP_libconfig_setting_get_bool_real(const struct config_setting_t *setting) {
+ int hIndex = 0;
+ bool retVal___ = false;
+ if( HPMHooks.count.HP_libconfig_setting_get_bool_real_pre ) {
+ bool (*preHookFunc) (const struct config_setting_t *setting);
+ *HPMforce_return = false;
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_bool_real_pre; hIndex++ ) {
+ preHookFunc = HPMHooks.list.HP_libconfig_setting_get_bool_real_pre[hIndex].func;
+ retVal___ = preHookFunc(setting);
+ }
+ if( *HPMforce_return ) {
+ *HPMforce_return = false;
+ return retVal___;
+ }
+ }
+ {
+ retVal___ = HPMHooks.source.libconfig.setting_get_bool_real(setting);
+ }
+ if( HPMHooks.count.HP_libconfig_setting_get_bool_real_post ) {
+ bool (*postHookFunc) (bool retVal___, const struct config_setting_t *setting);
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_bool_real_post; hIndex++ ) {
+ postHookFunc = HPMHooks.list.HP_libconfig_setting_get_bool_real_post[hIndex].func;
+ retVal___ = postHookFunc(retVal___, setting);
+ }
+ }
+ return retVal___;
+}
+uint32 HP_libconfig_setting_get_uint32(const struct config_setting_t *setting) {
+ int hIndex = 0;
+ uint32 retVal___ = 0;
+ if( HPMHooks.count.HP_libconfig_setting_get_uint32_pre ) {
+ uint32 (*preHookFunc) (const struct config_setting_t *setting);
+ *HPMforce_return = false;
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_uint32_pre; hIndex++ ) {
+ preHookFunc = HPMHooks.list.HP_libconfig_setting_get_uint32_pre[hIndex].func;
+ retVal___ = preHookFunc(setting);
+ }
+ if( *HPMforce_return ) {
+ *HPMforce_return = false;
+ return retVal___;
+ }
+ }
+ {
+ retVal___ = HPMHooks.source.libconfig.setting_get_uint32(setting);
+ }
+ if( HPMHooks.count.HP_libconfig_setting_get_uint32_post ) {
+ uint32 (*postHookFunc) (uint32 retVal___, const struct config_setting_t *setting);
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_uint32_post; hIndex++ ) {
+ postHookFunc = HPMHooks.list.HP_libconfig_setting_get_uint32_post[hIndex].func;
+ retVal___ = postHookFunc(retVal___, setting);
+ }
+ }
+ return retVal___;
+}
+uint16 HP_libconfig_setting_get_uint16(const struct config_setting_t *setting) {
+ int hIndex = 0;
+ uint16 retVal___ = 0;
+ if( HPMHooks.count.HP_libconfig_setting_get_uint16_pre ) {
+ uint16 (*preHookFunc) (const struct config_setting_t *setting);
+ *HPMforce_return = false;
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_uint16_pre; hIndex++ ) {
+ preHookFunc = HPMHooks.list.HP_libconfig_setting_get_uint16_pre[hIndex].func;
+ retVal___ = preHookFunc(setting);
+ }
+ if( *HPMforce_return ) {
+ *HPMforce_return = false;
+ return retVal___;
+ }
+ }
+ {
+ retVal___ = HPMHooks.source.libconfig.setting_get_uint16(setting);
+ }
+ if( HPMHooks.count.HP_libconfig_setting_get_uint16_post ) {
+ uint16 (*postHookFunc) (uint16 retVal___, const struct config_setting_t *setting);
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_uint16_post; hIndex++ ) {
+ postHookFunc = HPMHooks.list.HP_libconfig_setting_get_uint16_post[hIndex].func;
+ retVal___ = postHookFunc(retVal___, setting);
+ }
+ }
+ return retVal___;
+}
+int16 HP_libconfig_setting_get_int16(const struct config_setting_t *setting) {
+ int hIndex = 0;
+ int16 retVal___ = 0;
+ if( HPMHooks.count.HP_libconfig_setting_get_int16_pre ) {
+ int16 (*preHookFunc) (const struct config_setting_t *setting);
+ *HPMforce_return = false;
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int16_pre; hIndex++ ) {
+ preHookFunc = HPMHooks.list.HP_libconfig_setting_get_int16_pre[hIndex].func;
+ retVal___ = preHookFunc(setting);
+ }
+ if( *HPMforce_return ) {
+ *HPMforce_return = false;
+ return retVal___;
+ }
+ }
+ {
+ retVal___ = HPMHooks.source.libconfig.setting_get_int16(setting);
+ }
+ if( HPMHooks.count.HP_libconfig_setting_get_int16_post ) {
+ int16 (*postHookFunc) (int16 retVal___, const struct config_setting_t *setting);
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int16_post; hIndex++ ) {
+ postHookFunc = HPMHooks.list.HP_libconfig_setting_get_int16_post[hIndex].func;
+ retVal___ = postHookFunc(retVal___, setting);
+ }
+ }
+ return retVal___;
+}
+int HP_libconfig_setting_lookup_bool_real(const struct config_setting_t *setting, const char *name, bool *value) {
+ int hIndex = 0;
+ int retVal___ = 0;
+ if( HPMHooks.count.HP_libconfig_setting_lookup_bool_real_pre ) {
+ int (*preHookFunc) (const struct config_setting_t *setting, const char *name, bool *value);
+ *HPMforce_return = false;
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_bool_real_pre; hIndex++ ) {
+ preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_bool_real_pre[hIndex].func;
+ retVal___ = preHookFunc(setting, name, value);
+ }
+ if( *HPMforce_return ) {
+ *HPMforce_return = false;
+ return retVal___;
+ }
+ }
+ {
+ retVal___ = HPMHooks.source.libconfig.setting_lookup_bool_real(setting, name, value);
+ }
+ if( HPMHooks.count.HP_libconfig_setting_lookup_bool_real_post ) {
+ int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, bool *value);
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_bool_real_post; hIndex++ ) {
+ postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_bool_real_post[hIndex].func;
+ retVal___ = postHookFunc(retVal___, setting, name, value);
+ }
+ }
+ return retVal___;
+}
+int HP_libconfig_setting_lookup_uint32(const struct config_setting_t *setting, const char *name, uint32 *value) {
+ int hIndex = 0;
+ int retVal___ = 0;
+ if( HPMHooks.count.HP_libconfig_setting_lookup_uint32_pre ) {
+ int (*preHookFunc) (const struct config_setting_t *setting, const char *name, uint32 *value);
+ *HPMforce_return = false;
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_uint32_pre; hIndex++ ) {
+ preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_uint32_pre[hIndex].func;
+ retVal___ = preHookFunc(setting, name, value);
+ }
+ if( *HPMforce_return ) {
+ *HPMforce_return = false;
+ return retVal___;
+ }
+ }
+ {
+ retVal___ = HPMHooks.source.libconfig.setting_lookup_uint32(setting, name, value);
+ }
+ if( HPMHooks.count.HP_libconfig_setting_lookup_uint32_post ) {
+ int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, uint32 *value);
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_uint32_post; hIndex++ ) {
+ postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_uint32_post[hIndex].func;
+ retVal___ = postHookFunc(retVal___, setting, name, value);
+ }
+ }
+ return retVal___;
+}
+int HP_libconfig_setting_lookup_uint16(const struct config_setting_t *setting, const char *name, uint16 *value) {
+ int hIndex = 0;
+ int retVal___ = 0;
+ if( HPMHooks.count.HP_libconfig_setting_lookup_uint16_pre ) {
+ int (*preHookFunc) (const struct config_setting_t *setting, const char *name, uint16 *value);
+ *HPMforce_return = false;
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_uint16_pre; hIndex++ ) {
+ preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_uint16_pre[hIndex].func;
+ retVal___ = preHookFunc(setting, name, value);
+ }
+ if( *HPMforce_return ) {
+ *HPMforce_return = false;
+ return retVal___;
+ }
+ }
+ {
+ retVal___ = HPMHooks.source.libconfig.setting_lookup_uint16(setting, name, value);
+ }
+ if( HPMHooks.count.HP_libconfig_setting_lookup_uint16_post ) {
+ int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, uint16 *value);
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_uint16_post; hIndex++ ) {
+ postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_uint16_post[hIndex].func;
+ retVal___ = postHookFunc(retVal___, setting, name, value);
+ }
+ }
+ return retVal___;
+}
+int HP_libconfig_setting_lookup_int16(const struct config_setting_t *setting, const char *name, int16 *value) {
+ int hIndex = 0;
+ int retVal___ = 0;
+ if( HPMHooks.count.HP_libconfig_setting_lookup_int16_pre ) {
+ int (*preHookFunc) (const struct config_setting_t *setting, const char *name, int16 *value);
+ *HPMforce_return = false;
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_int16_pre; hIndex++ ) {
+ preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_int16_pre[hIndex].func;
+ retVal___ = preHookFunc(setting, name, value);
+ }
+ if( *HPMforce_return ) {
+ *HPMforce_return = false;
+ return retVal___;
+ }
+ }
+ {
+ retVal___ = HPMHooks.source.libconfig.setting_lookup_int16(setting, name, value);
+ }
+ if( HPMHooks.count.HP_libconfig_setting_lookup_int16_post ) {
+ int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, int16 *value);
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_int16_post; hIndex++ ) {
+ postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_int16_post[hIndex].func;
+ retVal___ = postHookFunc(retVal___, setting, name, value);
+ }
+ }
+ return retVal___;
+}
+int HP_libconfig_setting_lookup_mutable_string(const struct config_setting_t *setting, const char *name, char *out, size_t out_size) {
+ int hIndex = 0;
+ int retVal___ = 0;
+ if( HPMHooks.count.HP_libconfig_setting_lookup_mutable_string_pre ) {
+ int (*preHookFunc) (const struct config_setting_t *setting, const char *name, char *out, size_t *out_size);
+ *HPMforce_return = false;
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_mutable_string_pre; hIndex++ ) {
+ preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_mutable_string_pre[hIndex].func;
+ retVal___ = preHookFunc(setting, name, out, &out_size);
+ }
+ if( *HPMforce_return ) {
+ *HPMforce_return = false;
+ return retVal___;
+ }
+ }
+ {
+ retVal___ = HPMHooks.source.libconfig.setting_lookup_mutable_string(setting, name, out, out_size);
+ }
+ if( HPMHooks.count.HP_libconfig_setting_lookup_mutable_string_post ) {
+ int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, char *out, size_t *out_size);
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_mutable_string_post; hIndex++ ) {
+ postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_mutable_string_post[hIndex].func;
+ retVal___ = postHookFunc(retVal___, setting, name, out, &out_size);
+ }
+ }
+ return retVal___;
+}
+int HP_libconfig_lookup_mutable_string(const struct config_t *config, const char *name, char *out, size_t out_size) {
+ int hIndex = 0;
+ int retVal___ = 0;
+ if( HPMHooks.count.HP_libconfig_lookup_mutable_string_pre ) {
+ int (*preHookFunc) (const struct config_t *config, const char *name, char *out, size_t *out_size);
+ *HPMforce_return = false;
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_mutable_string_pre; hIndex++ ) {
+ preHookFunc = HPMHooks.list.HP_libconfig_lookup_mutable_string_pre[hIndex].func;
+ retVal___ = preHookFunc(config, name, out, &out_size);
+ }
+ if( *HPMforce_return ) {
+ *HPMforce_return = false;
+ return retVal___;
+ }
+ }
+ {
+ retVal___ = HPMHooks.source.libconfig.lookup_mutable_string(config, name, out, out_size);
+ }
+ if( HPMHooks.count.HP_libconfig_lookup_mutable_string_post ) {
+ int (*postHookFunc) (int retVal___, const struct config_t *config, const char *name, char *out, size_t *out_size);
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_mutable_string_post; hIndex++ ) {
+ postHookFunc = HPMHooks.list.HP_libconfig_lookup_mutable_string_post[hIndex].func;
+ retVal___ = postHookFunc(retVal___, config, name, out, &out_size);
+ }
+ }
+ return retVal___;
+}
/* logs */
void HP_logs_pick_pc(struct map_session_data *sd, e_log_pick_type type, int amount, struct item *itm, struct item_data *data) {
int hIndex = 0;
@@ -46177,11 +46447,11 @@ void HP_mob_readdb(void) {
}
return;
}
-bool HP_mob_lookup_const(const config_setting_t *it, const char *name, int *value) {
+bool HP_mob_lookup_const(const struct config_setting_t *it, const char *name, int *value) {
int hIndex = 0;
bool retVal___ = false;
if( HPMHooks.count.HP_mob_lookup_const_pre ) {
- bool (*preHookFunc) (const config_setting_t *it, const char *name, int *value);
+ bool (*preHookFunc) (const struct config_setting_t *it, const char *name, int *value);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_lookup_const_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_mob_lookup_const_pre[hIndex].func;
@@ -46196,7 +46466,7 @@ bool HP_mob_lookup_const(const config_setting_t *it, const char *name, int *valu
retVal___ = HPMHooks.source.mob.lookup_const(it, name, value);
}
if( HPMHooks.count.HP_mob_lookup_const_post ) {
- bool (*postHookFunc) (bool retVal___, const config_setting_t *it, const char *name, int *value);
+ bool (*postHookFunc) (bool retVal___, const struct config_setting_t *it, const char *name, int *value);
for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_lookup_const_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_mob_lookup_const_post[hIndex].func;
retVal___ = postHookFunc(retVal___, it, name, value);
@@ -46204,11 +46474,11 @@ bool HP_mob_lookup_const(const config_setting_t *it, const char *name, int *valu
}
return retVal___;
}
-bool HP_mob_get_const(const config_setting_t *it, int *value) {
+bool HP_mob_get_const(const struct config_setting_t *it, int *value) {
int hIndex = 0;
bool retVal___ = false;
if( HPMHooks.count.HP_mob_get_const_pre ) {
- bool (*preHookFunc) (const config_setting_t *it, int *value);
+ bool (*preHookFunc) (const struct config_setting_t *it, int *value);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_get_const_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_mob_get_const_pre[hIndex].func;
@@ -46223,7 +46493,7 @@ bool HP_mob_get_const(const config_setting_t *it, int *value) {
retVal___ = HPMHooks.source.mob.get_const(it, value);
}
if( HPMHooks.count.HP_mob_get_const_post ) {
- bool (*postHookFunc) (bool retVal___, const config_setting_t *it, int *value);
+ bool (*postHookFunc) (bool retVal___, const struct config_setting_t *it, int *value);
for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_get_const_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_mob_get_const_post[hIndex].func;
retVal___ = postHookFunc(retVal___, it, value);
@@ -46285,10 +46555,10 @@ int HP_mob_read_libconfig(const char *filename, bool ignore_missing) {
}
return retVal___;
}
-void HP_mob_read_db_additional_fields(struct mob_db *entry, config_setting_t *it, int n, const char *source) {
+void HP_mob_read_db_additional_fields(struct mob_db *entry, struct config_setting_t *it, int n, const char *source) {
int hIndex = 0;
if( HPMHooks.count.HP_mob_read_db_additional_fields_pre ) {
- void (*preHookFunc) (struct mob_db *entry, config_setting_t *it, int *n, const char *source);
+ void (*preHookFunc) (struct mob_db *entry, struct config_setting_t *it, int *n, const char *source);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_read_db_additional_fields_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_mob_read_db_additional_fields_pre[hIndex].func;
@@ -46303,7 +46573,7 @@ void HP_mob_read_db_additional_fields(struct mob_db *entry, config_setting_t *it
HPMHooks.source.mob.read_db_additional_fields(entry, it, n, source);
}
if( HPMHooks.count.HP_mob_read_db_additional_fields_post ) {
- void (*postHookFunc) (struct mob_db *entry, config_setting_t *it, int *n, const char *source);
+ void (*postHookFunc) (struct mob_db *entry, struct config_setting_t *it, int *n, const char *source);
for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_read_db_additional_fields_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_mob_read_db_additional_fields_post[hIndex].func;
postHookFunc(entry, it, &n, source);
@@ -46311,11 +46581,11 @@ void HP_mob_read_db_additional_fields(struct mob_db *entry, config_setting_t *it
}
return;
}
-int HP_mob_read_db_sub(config_setting_t *mobt, int id, const char *source) {
+int HP_mob_read_db_sub(struct config_setting_t *mobt, int id, const char *source) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_mob_read_db_sub_pre ) {
- int (*preHookFunc) (config_setting_t *mobt, int *id, const char *source);
+ int (*preHookFunc) (struct config_setting_t *mobt, int *id, const char *source);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_read_db_sub_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_mob_read_db_sub_pre[hIndex].func;
@@ -46330,7 +46600,7 @@ int HP_mob_read_db_sub(config_setting_t *mobt, int id, const char *source) {
retVal___ = HPMHooks.source.mob.read_db_sub(mobt, id, source);
}
if( HPMHooks.count.HP_mob_read_db_sub_post ) {
- int (*postHookFunc) (int retVal___, config_setting_t *mobt, int *id, const char *source);
+ int (*postHookFunc) (int retVal___, struct config_setting_t *mobt, int *id, const char *source);
for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_read_db_sub_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_mob_read_db_sub_post[hIndex].func;
retVal___ = postHookFunc(retVal___, mobt, &id, source);
@@ -46338,10 +46608,10 @@ int HP_mob_read_db_sub(config_setting_t *mobt, int id, const char *source) {
}
return retVal___;
}
-void HP_mob_read_db_drops_sub(struct mob_db *entry, config_setting_t *t) {
+void HP_mob_read_db_drops_sub(struct mob_db *entry, struct config_setting_t *t) {
int hIndex = 0;
if( HPMHooks.count.HP_mob_read_db_drops_sub_pre ) {
- void (*preHookFunc) (struct mob_db *entry, config_setting_t *t);
+ void (*preHookFunc) (struct mob_db *entry, struct config_setting_t *t);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_read_db_drops_sub_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_mob_read_db_drops_sub_pre[hIndex].func;
@@ -46356,7 +46626,7 @@ void HP_mob_read_db_drops_sub(struct mob_db *entry, config_setting_t *t) {
HPMHooks.source.mob.read_db_drops_sub(entry, t);
}
if( HPMHooks.count.HP_mob_read_db_drops_sub_post ) {
- void (*postHookFunc) (struct mob_db *entry, config_setting_t *t);
+ void (*postHookFunc) (struct mob_db *entry, struct config_setting_t *t);
for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_read_db_drops_sub_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_mob_read_db_drops_sub_post[hIndex].func;
postHookFunc(entry, t);
@@ -46364,10 +46634,10 @@ void HP_mob_read_db_drops_sub(struct mob_db *entry, config_setting_t *t) {
}
return;
}
-void HP_mob_read_db_mvpdrops_sub(struct mob_db *entry, config_setting_t *t) {
+void HP_mob_read_db_mvpdrops_sub(struct mob_db *entry, struct config_setting_t *t) {
int hIndex = 0;
if( HPMHooks.count.HP_mob_read_db_mvpdrops_sub_pre ) {
- void (*preHookFunc) (struct mob_db *entry, config_setting_t *t);
+ void (*preHookFunc) (struct mob_db *entry, struct config_setting_t *t);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_read_db_mvpdrops_sub_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_mob_read_db_mvpdrops_sub_pre[hIndex].func;
@@ -46382,7 +46652,7 @@ void HP_mob_read_db_mvpdrops_sub(struct mob_db *entry, config_setting_t *t) {
HPMHooks.source.mob.read_db_mvpdrops_sub(entry, t);
}
if( HPMHooks.count.HP_mob_read_db_mvpdrops_sub_post ) {
- void (*postHookFunc) (struct mob_db *entry, config_setting_t *t);
+ void (*postHookFunc) (struct mob_db *entry, struct config_setting_t *t);
for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_read_db_mvpdrops_sub_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_mob_read_db_mvpdrops_sub_post[hIndex].func;
postHookFunc(entry, t);
@@ -46390,11 +46660,11 @@ void HP_mob_read_db_mvpdrops_sub(struct mob_db *entry, config_setting_t *t) {
}
return;
}
-int HP_mob_read_db_mode_sub(struct mob_db *entry, config_setting_t *t) {
+int HP_mob_read_db_mode_sub(struct mob_db *entry, struct config_setting_t *t) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_mob_read_db_mode_sub_pre ) {
- int (*preHookFunc) (struct mob_db *entry, config_setting_t *t);
+ int (*preHookFunc) (struct mob_db *entry, struct config_setting_t *t);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_read_db_mode_sub_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_mob_read_db_mode_sub_pre[hIndex].func;
@@ -46409,7 +46679,7 @@ int HP_mob_read_db_mode_sub(struct mob_db *entry, config_setting_t *t) {
retVal___ = HPMHooks.source.mob.read_db_mode_sub(entry, t);
}
if( HPMHooks.count.HP_mob_read_db_mode_sub_post ) {
- int (*postHookFunc) (int retVal___, struct mob_db *entry, config_setting_t *t);
+ int (*postHookFunc) (int retVal___, struct mob_db *entry, struct config_setting_t *t);
for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_read_db_mode_sub_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_mob_read_db_mode_sub_post[hIndex].func;
retVal___ = postHookFunc(retVal___, entry, t);
@@ -46417,10 +46687,10 @@ int HP_mob_read_db_mode_sub(struct mob_db *entry, config_setting_t *t) {
}
return retVal___;
}
-void HP_mob_read_db_stats_sub(struct mob_db *entry, config_setting_t *t) {
+void HP_mob_read_db_stats_sub(struct mob_db *entry, struct config_setting_t *t) {
int hIndex = 0;
if( HPMHooks.count.HP_mob_read_db_stats_sub_pre ) {
- void (*preHookFunc) (struct mob_db *entry, config_setting_t *t);
+ void (*preHookFunc) (struct mob_db *entry, struct config_setting_t *t);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_read_db_stats_sub_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_mob_read_db_stats_sub_pre[hIndex].func;
@@ -46435,7 +46705,7 @@ void HP_mob_read_db_stats_sub(struct mob_db *entry, config_setting_t *t) {
HPMHooks.source.mob.read_db_stats_sub(entry, t);
}
if( HPMHooks.count.HP_mob_read_db_stats_sub_post ) {
- void (*postHookFunc) (struct mob_db *entry, config_setting_t *t);
+ void (*postHookFunc) (struct mob_db *entry, struct config_setting_t *t);
for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_read_db_stats_sub_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_mob_read_db_stats_sub_post[hIndex].func;
postHookFunc(entry, t);
@@ -59336,11 +59606,11 @@ int HP_quest_read_db(void) {
}
return retVal___;
}
-struct quest_db* HP_quest_read_db_sub(config_setting_t *cs, int n, const char *source) {
+struct quest_db* HP_quest_read_db_sub(struct config_setting_t *cs, int n, const char *source) {
int hIndex = 0;
struct quest_db* retVal___ = NULL;
if( HPMHooks.count.HP_quest_read_db_sub_pre ) {
- struct quest_db* (*preHookFunc) (config_setting_t *cs, int *n, const char *source);
+ struct quest_db* (*preHookFunc) (struct config_setting_t *cs, int *n, const char *source);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_quest_read_db_sub_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_quest_read_db_sub_pre[hIndex].func;
@@ -59355,7 +59625,7 @@ struct quest_db* HP_quest_read_db_sub(config_setting_t *cs, int n, const char *s
retVal___ = HPMHooks.source.quest.read_db_sub(cs, n, source);
}
if( HPMHooks.count.HP_quest_read_db_sub_post ) {
- struct quest_db* (*postHookFunc) (struct quest_db* retVal___, config_setting_t *cs, int *n, const char *source);
+ struct quest_db* (*postHookFunc) (struct quest_db* retVal___, struct config_setting_t *cs, int *n, const char *source);
for(hIndex = 0; hIndex < HPMHooks.count.HP_quest_read_db_sub_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_quest_read_db_sub_post[hIndex].func;
retVal___ = postHookFunc(retVal___, cs, &n, source);
@@ -70991,11 +71261,11 @@ bool HP_sockt_trusted_ip_check(uint32 ip) {
}
return retVal___;
}
-int HP_sockt_net_config_read_sub(config_setting_t *t, struct s_subnet_vector *list, const char *filename, const char *groupname) {
+int HP_sockt_net_config_read_sub(struct config_setting_t *t, struct s_subnet_vector *list, const char *filename, const char *groupname) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_sockt_net_config_read_sub_pre ) {
- int (*preHookFunc) (config_setting_t *t, struct s_subnet_vector *list, const char *filename, const char *groupname);
+ int (*preHookFunc) (struct config_setting_t *t, struct s_subnet_vector *list, const char *filename, const char *groupname);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_net_config_read_sub_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_sockt_net_config_read_sub_pre[hIndex].func;
@@ -71010,7 +71280,7 @@ int HP_sockt_net_config_read_sub(config_setting_t *t, struct s_subnet_vector *li
retVal___ = HPMHooks.source.sockt.net_config_read_sub(t, list, filename, groupname);
}
if( HPMHooks.count.HP_sockt_net_config_read_sub_post ) {
- int (*postHookFunc) (int retVal___, config_setting_t *t, struct s_subnet_vector *list, const char *filename, const char *groupname);
+ int (*postHookFunc) (int retVal___, struct config_setting_t *t, struct s_subnet_vector *list, const char *filename, const char *groupname);
for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_net_config_read_sub_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_sockt_net_config_read_sub_post[hIndex].func;
retVal___ = postHookFunc(retVal___, t, list, filename, groupname);
@@ -74830,11 +75100,11 @@ int HP_status_readdb_refine_libconfig(const char *filename) {
}
return retVal___;
}
-int HP_status_readdb_refine_libconfig_sub(config_setting_t *r, const char *name, const char *source) {
+int HP_status_readdb_refine_libconfig_sub(struct config_setting_t *r, const char *name, const char *source) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_status_readdb_refine_libconfig_sub_pre ) {
- int (*preHookFunc) (config_setting_t *r, const char *name, const char *source);
+ int (*preHookFunc) (struct config_setting_t *r, const char *name, const char *source);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_status_readdb_refine_libconfig_sub_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_status_readdb_refine_libconfig_sub_pre[hIndex].func;
@@ -74849,7 +75119,7 @@ int HP_status_readdb_refine_libconfig_sub(config_setting_t *r, const char *name,
retVal___ = HPMHooks.source.status.readdb_refine_libconfig_sub(r, name, source);
}
if( HPMHooks.count.HP_status_readdb_refine_libconfig_sub_post ) {
- int (*postHookFunc) (int retVal___, config_setting_t *r, const char *name, const char *source);
+ int (*postHookFunc) (int retVal___, struct config_setting_t *r, const char *name, const char *source);
for(hIndex = 0; hIndex < HPMHooks.count.HP_status_readdb_refine_libconfig_sub_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_status_readdb_refine_libconfig_sub_post[hIndex].func;
retVal___ = postHookFunc(retVal___, r, name, source);
@@ -74910,10 +75180,10 @@ void HP_status_read_job_db(void) {
}
return;
}
-void HP_status_read_job_db_sub(int idx, const char *name, config_setting_t *jdb) {
+void HP_status_read_job_db_sub(int idx, const char *name, struct config_setting_t *jdb) {
int hIndex = 0;
if( HPMHooks.count.HP_status_read_job_db_sub_pre ) {
- void (*preHookFunc) (int *idx, const char *name, config_setting_t *jdb);
+ void (*preHookFunc) (int *idx, const char *name, struct config_setting_t *jdb);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_status_read_job_db_sub_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_status_read_job_db_sub_pre[hIndex].func;
@@ -74928,7 +75198,7 @@ void HP_status_read_job_db_sub(int idx, const char *name, config_setting_t *jdb)
HPMHooks.source.status.read_job_db_sub(idx, name, jdb);
}
if( HPMHooks.count.HP_status_read_job_db_sub_post ) {
- void (*postHookFunc) (int *idx, const char *name, config_setting_t *jdb);
+ void (*postHookFunc) (int *idx, const char *name, struct config_setting_t *jdb);
for(hIndex = 0; hIndex < HPMHooks.count.HP_status_read_job_db_sub_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_status_read_job_db_sub_post[hIndex].func;
postHookFunc(&idx, name, jdb);
diff --git a/src/plugins/db2sql.c b/src/plugins/db2sql.c
index 44e2bac3c..ee6b0548a 100644
--- a/src/plugins/db2sql.c
+++ b/src/plugins/db2sql.c
@@ -65,9 +65,9 @@ bool itemdb2sql_torun = false;
bool mobdb2sql_torun = false;
/// Backup of the original item_db parser function pointer.
-int (*itemdb_readdb_libconfig_sub) (config_setting_t *it, int n, const char *source);
+int (*itemdb_readdb_libconfig_sub) (struct config_setting_t *it, int n, const char *source);
/// Backup of the original mob_db parser function pointer.
-int (*mob_read_db_sub) (config_setting_t *it, int n, const char *source);
+int (*mob_read_db_sub) (struct config_setting_t *it, int n, const char *source);
/**
* Normalizes and appends a string to the output buffer.
@@ -124,7 +124,7 @@ void db2sql_fileheader(void)
*
* @see itemdb_readdb_libconfig_sub.
*/
-int itemdb2sql_sub(config_setting_t *entry, int n, const char *source)
+int itemdb2sql_sub(struct config_setting_t *entry, int n, const char *source)
{
struct item_data *it = NULL;
@@ -134,7 +134,7 @@ int itemdb2sql_sub(config_setting_t *entry, int n, const char *source)
char *str;
int i32;
uint32 ui32;
- config_setting_t *t = NULL;
+ struct config_setting_t *t = NULL;
StringBuf buf;
nullpo_ret(entry);
@@ -424,7 +424,7 @@ void do_itemdb2sql(void)
*
* @see mobdb_readdb_libconfig_sub.
*/
-int mobdb2sql_sub(config_setting_t *mobt, int n, const char *source)
+int mobdb2sql_sub(struct config_setting_t *mobt, int n, const char *source)
{
struct mob_db *md = NULL;
nullpo_ret(mobt);
diff --git a/src/test/test_libconfig.c b/src/test/test_libconfig.c
index ff742af71..a3b233b98 100644
--- a/src/test/test_libconfig.c
+++ b/src/test/test_libconfig.c
@@ -71,7 +71,7 @@ static const char *test_libconfig_defaults(void)
static const char *test_libconfig_init_destroy(void)
{
- config_t config;
+ struct config_t config;
libconfig->init(&config);
if (config.root == NULL || config.root != config_root_setting(&config)) {
return "Unable to create config.";
@@ -85,7 +85,7 @@ static const char *test_libconfig_init_destroy(void)
static const char *test_libconfig_read_file_src(void)
{
- config_t config;
+ struct config_t config;
#define FILENAME "src/test/libconfig/test.conf"
if (libconfig->read_file_src(&config, FILENAME) == CONFIG_FALSE) {
libconfig->destroy(&config);
@@ -102,7 +102,7 @@ static const char *test_libconfig_read_file_src(void)
static const char *test_libconfig_read(void)
{
- config_t config;
+ struct config_t config;
#define FILENAME "src/test/libconfig/test.conf"
FILE *fp = fopen(FILENAME, "r");
if (!fp) {
@@ -122,11 +122,11 @@ static const char *test_libconfig_read(void)
return NULL;
}
-static const char *test_libconfig_read_file(void)
+static const char *test_libconfig_load_file(void)
{
- config_t config;
+ struct config_t config;
#define FILENAME "src/test/libconfig/test.conf"
- if (libconfig->read_file(&config, FILENAME) != 0) {
+ if (libconfig->load_file(&config, FILENAME) == CONFIG_FALSE) {
return "Unable to read file '" FILENAME "'.";
}
#undef FILENAME
@@ -140,19 +140,19 @@ static const char *test_libconfig_read_file(void)
static const char *test_libconfig_write(void)
{
- //void (*write) (const config_t *config, FILE *stream);
+ //void (*write) (const struct config_t *config, FILE *stream);
return "TEST NOT IMPLEMENTED";
}
static const char *test_libconfig_write_file(void)
{
- //int (*write_file) (config_t *config, const char *filename);
+ //int (*write_file) (struct config_t *config, const char *filename);
return "TEST NOT IMPLEMENTED";
}
static const char *test_libconfig_read_string(void)
{
- config_t config;
+ struct config_t config;
if (libconfig->read_string(&config, "") == CONFIG_FALSE) {
libconfig->destroy(&config);
return "Unable to read from string.";
@@ -167,7 +167,7 @@ static const char *test_libconfig_read_string(void)
static const char *test_libconfig_syntax(void)
{
- config_t config;
+ struct config_t config;
const char *input = "/* Test File */\n"
"Setting_Int: 1;\n"
"Setting_Int64: 1L;\n"
@@ -193,14 +193,14 @@ static const char *test_libconfig_syntax(void)
static const char *test_libconfig_set_include_dir(void)
{
- //void (*set_include_dir) (config_t *config, const char *include_dir);
+ //void (*set_include_dir) (struct config_t *config, const char *include_dir);
return "TEST NOT IMPLEMENTED";
}
static const char *test_libconfig_lookup(void)
{
- config_t config;
- config_setting_t *t = NULL;
+ struct config_t config;
+ struct config_setting_t *t = NULL;
int32 i32;
int64 i64;
double f;
@@ -226,9 +226,9 @@ static const char *test_libconfig_lookup(void)
return "libconfig->lookup failed.";
}
- if ((t = libconfig->lookup_from(config.root, "Setting_Int")) == NULL) {
+ if ((t = libconfig->setting_lookup(config.root, "Setting_Int")) == NULL) {
libconfig->destroy(&config);
- return "libconfig->lookup_from failed.";
+ return "libconfig->setting_lookup failed.";
}
if (libconfig->lookup_int(&config, "Setting_Int", &i32) == CONFIG_FALSE || i32 != 1) {
@@ -263,8 +263,8 @@ static const char *test_libconfig_lookup(void)
static const char *test_libconfig_setting_get(void)
{
- config_t config;
- config_setting_t *t = NULL;
+ struct config_t config;
+ struct config_setting_t *t = NULL;
double f;
const char *str;
const char *input = "/* Test File */\n"
@@ -366,17 +366,17 @@ static const char *test_libconfig_setting_get(void)
static const char *test_libconfig_set(void)
{
- //int (*setting_set_int) (config_setting_t *setting ,int value);
- //int (*setting_set_int64) (config_setting_t *setting, long long value);
- //int (*setting_set_float) (config_setting_t *setting, double value);
- //int (*setting_set_bool) (config_setting_t *setting, int value);
- //int (*setting_set_string) (config_setting_t *setting, const char *value);
+ //int (*setting_set_int) (struct config_setting_t *setting ,int value);
+ //int (*setting_set_int64) (struct config_setting_t *setting, long long value);
+ //int (*setting_set_float) (struct config_setting_t *setting, double value);
+ //int (*setting_set_bool) (struct config_setting_t *setting, int value);
+ //int (*setting_set_string) (struct config_setting_t *setting, const char *value);
return "TEST NOT IMPLEMENTED";
}
static const char *test_libconfig_setting_lookup(void)
{
- config_t config;
+ struct config_t config;
int32 i32;
int64 i64;
double f;
@@ -429,8 +429,8 @@ static const char *test_libconfig_setting_lookup(void)
static const char *test_libconfig_setting_types(void)
{
- config_t config;
- config_setting_t *t;
+ struct config_t config;
+ struct config_setting_t *t;
const char *input = "/* Test File */\n"
"Setting_Int: 1;\n"
"Setting_Int64: 1L;\n"
@@ -523,7 +523,7 @@ static const char *test_libconfig_setting_types(void)
static const char *test_libconfig_values(void)
{
- config_t config;
+ struct config_t config;
int32 i32;
int64 i64;
const char *input = "/* Test File */\n"
@@ -583,7 +583,7 @@ static const char *test_libconfig_values(void)
static const char *test_libconfig_path_lookup(void)
{
- config_t config;
+ struct config_t config;
int32 i32;
const char *input = "/* Test File */\n"
"Setting_Array: [1, 2, 3];\n"
@@ -666,7 +666,7 @@ static const char *test_libconfig_path_lookup(void)
static const char *test_libconfig_setting_names(void)
{
- config_t config;
+ struct config_t config;
int32 i32;
const char *input = "/* Test File */\n"
"Setting'with'apostrophes: 1;\n"
@@ -724,9 +724,9 @@ static const char *test_libconfig_setting_names(void)
static const char *test_libconfig_duplicate_keys(void)
{
- config_t config;
+ struct config_t config;
int32 i32;
- config_setting_t *t, *tt;
+ struct config_setting_t *t, *tt;
int i = 0;
const char *input = "/* Test File */\n"
"Setting_Group: {\n"
@@ -775,7 +775,7 @@ static const char *test_libconfig_duplicate_keys(void)
static const char *test_libconfig_special_string_syntax(void)
{
- config_t config;
+ struct config_t config;
const char *str;
const char *input = "/* Test File */\n"
"SpecialString: <\"This is an \"Item_Script\" Special String\n\tWith a line-break inside.\">;\n"
@@ -809,33 +809,33 @@ int do_init(int argc, char **argv)
TEST("libconfig->init and libconfig->destroy", test_libconfig_init_destroy);
TEST("libconfig->read_file_src", test_libconfig_read_file_src);
TEST("libconfig->read", test_libconfig_read);
- TEST("libconfig->read_file", test_libconfig_read_file);
+ TEST("libconfig->load_file", test_libconfig_load_file);
(void)test_libconfig_write; //TEST("libconfig->write", test_libconfig_write);
(void)test_libconfig_write_file; //TEST("libconfig->write_file", test_libconfig_write_file);
TEST("libconfig->read_string", test_libconfig_read_string);
TEST("libconfig syntax", test_libconfig_syntax);
(void)test_libconfig_set_include_dir; //TEST("libconfig->set_include_dir", test_libconfig_set_include_dir);
- //int (*setting_set_format) (config_setting_t *setting, short format);
- //short (*setting_get_format) (const config_setting_t *setting);
- //config_setting_t * (*setting_set_int_elem) (config_setting_t *setting, int idx, int value);
- //config_setting_t * (*setting_set_int64_elem) (config_setting_t *setting, int idx, long long value);
- //config_setting_t * (*setting_set_float_elem) (config_setting_t *setting, int idx, double value);
- //config_setting_t * (*setting_set_bool_elem) (config_setting_t *setting, int idx, int value);
- //config_setting_t * (*setting_set_string_elem) (config_setting_t *setting, int idx, const char *value);
- //config_setting_t * (*setting_add) (config_setting_t *parent, const char *name, int type);
- //int (*setting_remove) (config_setting_t *parent, const char *name);
- //int (*setting_remove_elem) (config_setting_t *parent, unsigned int idx);
- //void (*setting_set_hook) (config_setting_t *setting, void *hook);
- //void (*set_destructor) (config_t *config, void (*destructor)(void *));
+ //int (*setting_set_format) (struct config_setting_t *setting, short format);
+ //short (*setting_get_format) (const struct config_setting_t *setting);
+ //struct config_setting_t * (*setting_set_int_elem) (struct config_setting_t *setting, int idx, int value);
+ //struct config_setting_t * (*setting_set_int64_elem) (struct config_setting_t *setting, int idx, long long value);
+ //struct config_setting_t * (*setting_set_float_elem) (struct config_setting_t *setting, int idx, double value);
+ //struct config_setting_t * (*setting_set_bool_elem) (struct config_setting_t *setting, int idx, int value);
+ //struct config_setting_t * (*setting_set_string_elem) (struct config_setting_t *setting, int idx, const char *value);
+ //struct config_setting_t * (*setting_add) (struct config_setting_t *parent, const char *name, int type);
+ //int (*setting_remove) (struct config_setting_t *parent, const char *name);
+ //int (*setting_remove_elem) (struct config_setting_t *parent, unsigned int idx);
+ //void (*setting_set_hook) (struct config_setting_t *setting, void *hook);
+ //void (*set_destructor) (struct config_t *config, void (*destructor)(void *));
TEST("libconfig->lookup_*", test_libconfig_lookup);
TEST("libconfig->setting_get_*", test_libconfig_setting_get);
(void)test_libconfig_set; //TEST("libconfig->setting_set_*", test_libconfig_setting_set);
TEST("libconfig->setting_lookup_*", test_libconfig_setting_lookup);
TEST("setting types", test_libconfig_setting_types);
- //void (*setting_copy_simple) (config_setting_t *parent, const config_setting_t *src);
- //void (*setting_copy_elem) (config_setting_t *parent, const config_setting_t *src);
- //void (*setting_copy_aggregate) (config_setting_t *parent, const config_setting_t *src);
- //int (*setting_copy) (config_setting_t *parent, const config_setting_t *src);
+ //void (*setting_copy_simple) (struct config_setting_t *parent, const struct config_setting_t *src);
+ //void (*setting_copy_elem) (struct config_setting_t *parent, const struct config_setting_t *src);
+ //void (*setting_copy_aggregate) (struct config_setting_t *parent, const struct config_setting_t *src);
+ //int (*setting_copy) (struct config_setting_t *parent, const struct config_setting_t *src);
TEST("values", test_libconfig_values);
TEST("path lookup", test_libconfig_path_lookup);
TEST("setting key names", test_libconfig_setting_names);