From 6f6115d4d19e0ed85c6bff80b11ae59d62d962d4 Mon Sep 17 00:00:00 2001 From: madmurphy Date: Mon, 11 May 2020 10:40:41 +0100 Subject: [PATCH] Commit #143 --- ChangeLog | 7 ++++ MANUAL.md | 2 -- Makefile.am | 6 +--- README | 49 ++++++++++++++----------- autostuff/chunks/revision-warning.c | 5 ++- autostuff/m4/not-autotools.m4 | 4 +-- autostuff/shadows/package.json.in | 2 +- configure.ac | 25 ++++++------- dev/hackings/all/confini-metadata.c | 2 +- dev/hackings/all/confini-metadata.h | 2 +- dev/hackings/baremetal/README.md | 4 +-- dev/marked-sources/confini-marked.c | 21 ++++++----- dev/marked-sources/confini-marked.h | 11 +++--- docs/html/baremetal.html | 20 +++++------ docs/html/changelog.html | 5 +++ docs/html/confini_8c.html | 44 +++++++++++------------ docs/html/confini_8h.html | 44 +++++++++++------------ docs/html/confini_8h_source.html | 56 ++++++++++++++--------------- docs/html/libconfini.html | 32 ++++++++--------- docs/html/readme.html | 6 ++-- docs/man/man3/IniDispatch.3 | 2 +- docs/man/man3/IniFormat.3 | 2 +- docs/man/man3/IniStatistics.3 | 2 +- docs/man/man3/confini.h.3 | 8 ++--- docs/man/man3/libconfini.3 | 4 +-- docs/manual.html | 4 +-- examples/ini_files/delivery.conf | 2 -- package.json | 2 +- src/confini.c | 15 ++++---- src/confini.h | 2 +- src/winres.rc | 8 ++--- 31 files changed, 207 insertions(+), 191 deletions(-) diff --git a/ChangeLog b/ChangeLog index 24d35b6..54e5d02 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,13 @@ Change Log {#changelog} ======================= +## 1.14.1 -- 2020-05-11 + +Changes: + +* Documentation + + ## 1.14.0 -- 2020-03-01 Changes: diff --git a/MANUAL.md b/MANUAL.md index 302f053..4589f73 100644 --- a/MANUAL.md +++ b/MANUAL.md @@ -35,12 +35,10 @@ location = Colosseum place = Rome [sender] - name = John Smith email = john.smith@example.com [receiver] - name = Mario Rossi # He's a big guy email = mario.rossi@example.com ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/Makefile.am b/Makefile.am index f1d1142..1354da6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -56,7 +56,7 @@ endif WANT_DOC if WANT_EXAMPLES examplesdir = $(docdir)/examples -dist_examples_DATA = \ +dist_examples_SCRIPTS = \ examples/run-example.sh examplesinifilesdir = $(examplesdir)/ini_files @@ -120,10 +120,6 @@ _examples_insthook_ += \ endif HAVE_TRANSFORMATIONS -# Make examples script executable -_examples_insthook_ += \ - chmod +x '$(DESTDIR)$(examplesdir)/run-example.sh'; - endif WANT_EXAMPLES diff --git a/README b/README index faf2b9b..2e8c273 100644 --- a/README +++ b/README @@ -164,34 +164,43 @@ by running the `bootstrap` script. By default, `bootstrap` will also run the `./bootstrap --help`. If you are using **Microsoft Windows**, a batch script for compiling -**libconfini** with [MinGW][7] without Bash is available (`mgwmake.bat`). If you -are interested in using Autotools for compiling **libconfini** under Microsoft -Windows, you can integrate MinGW with [MSYS][8], or you can directly use -[MSYS2][9]. Alternatively, [an unofficial port][10] of **libconfini** for -[Cygwin][11] is available. +**libconfini** with [MinGW][7] without Bash is available (`mgwmake.bat`). If +you are interested in using Autotools for compiling **libconfini** under +Microsoft Windows, you can integrate MinGW with [MSYS][8], or you can directly +use [MSYS2][9] and [its official port][10] of the library. Alternatively, [an +unofficial port][11] of **libconfini** for [Cygwin][12] is available. -For further information, see [INSTALL][12]. +For further information, see [INSTALL][13]. + + +Bindings +-------- + +[Danilo Spinella][14] maintains [a D binding package][15] of **libconfini**. Free software ------------- This library is free software. You can redistribute it and/or modify it under -the terms of the GPL license version 3 or any later version. See [COPYING][13] +the terms of the GPL license version 3 or any later version. See [COPYING][16] for details. -[1]: https://madmurphy.github.io/libconfini/html/baremetal.html -[2]: https://madmurphy.github.io/libconfini/html/libconfini.html -[3]: https://madmurphy.github.io/libconfini/manual.html -[4]: https://github.com/ -[5]: https://github.com/madmurphy/libconfini -[6]: https://repology.org/project/libconfini/versions -[7]: http://www.mingw.org/ -[8]: http://www.mingw.org/wiki/MSYS -[9]: https://www.msys2.org/ -[10]: https://github.com/fd00/yacp/tree/master/libconfini -[11]: https://www.cygwin.com/ -[12]: https://github.com/madmurphy/libconfini/blob/master/INSTALL -[13]: https://github.com/madmurphy/libconfini/blob/master/COPYING + [1]: https://madmurphy.github.io/libconfini/html/baremetal.html + [2]: https://madmurphy.github.io/libconfini/html/libconfini.html + [3]: https://madmurphy.github.io/libconfini/manual.html + [4]: https://github.com/ + [5]: https://github.com/madmurphy/libconfini + [6]: https://repology.org/project/libconfini/versions + [7]: http://www.mingw.org/ + [8]: http://www.mingw.org/wiki/MSYS + [9]: https://www.msys2.org/ + [10]: https://packages.msys2.org/base/mingw-w64-libconfini + [11]: https://github.com/fd00/yacp/tree/master/libconfini + [12]: https://www.cygwin.com/ + [13]: https://github.com/madmurphy/libconfini/blob/master/INSTALL + [14]: https://danyspin97.org/ + [15]: https://github.com/DanySpin97/libconfini-d + [16]: https://github.com/madmurphy/libconfini/blob/master/COPYING diff --git a/autostuff/chunks/revision-warning.c b/autostuff/chunks/revision-warning.c index 94f44d0..3549b4b 100644 --- a/autostuff/chunks/revision-warning.c +++ b/autostuff/chunks/revision-warning.c @@ -5,10 +5,9 @@ ever revised this content, although someone should have. If you are instead that human appointed to review this code before it is pasted to the public header, please remove this text. - If a "standard" header providing these objects is available for your - platform, please replace the entire section below with the following single - line: + platform, please replace the entire section below with the following + content: #include diff --git a/autostuff/m4/not-autotools.m4 b/autostuff/m4/not-autotools.m4 index 2843cb7..e7d710d 100644 --- a/autostuff/m4/not-autotools.m4 +++ b/autostuff/m4/not-autotools.m4 @@ -17,8 +17,8 @@ dnl ************************************************************************** dnl ************************************************************************** -dnl NOTE: This is only a selection of macros from the Not Autotools project -dnl without documentation. For the entire collection and the +dnl NOTE: This is only a selection of macros from the **Not Autotools** +dnl project without documentation. For the entire collection and the dnl documentation please refer to the project's website. dnl ************************************************************************** diff --git a/autostuff/shadows/package.json.in b/autostuff/shadows/package.json.in index 6da7973..8025ea0 100644 --- a/autostuff/shadows/package.json.in +++ b/autostuff/shadows/package.json.in @@ -4,7 +4,7 @@ "description": "@PROJECT_DESCRIPTION@", "homepage": "@PACKAGE_URL@", "author": "@PACKAGE_BUGREPORT@", - "license": "@LICENSE_ID@", + "license": "@LICENSE_SPDX@", "main": "@PACKAGE_CONFNAME@", "repo": "@PUBLISHER_ID@/@PACKAGE_TARNAME@", "repository": { diff --git a/configure.ac b/configure.ac index ad37dbc..1b15924 100644 --- a/configure.ac +++ b/configure.ac @@ -26,7 +26,7 @@ AC_INIT([lib]n4_mem([GL_PROJECT_NAME], [confini]), m4_joinall([.], n4_mem([GL_PROJECT_MAJVER], [1]), n4_mem([GL_PROJECT_MINVER], [14]), - n4_mem([GL_PROJECT_REVVER], [0])), + n4_mem([GL_PROJECT_REVVER], [1])), [madmurphy333@gmail.com], [lib]GL_PROJECT_NAME, [https://madmurphy.github.io/libconfini]) @@ -38,7 +38,7 @@ NC_GLOBAL_LITERALS( [PROJECT_DESCRIPTION], [Yet another INI parser], [LICENSE_STRING], [GNU General Public License, version 3 or any later version], - [LICENSE_ID], [GPL-3.0-or-later], + [LICENSE_SPDX], [GPL-3.0-or-later], [PUBLISHER_NAME], [Stefano Gioffré], [PUBLISHER_ID], [madmurphy], [GIT_HTTP_SERVER], [https://github.com] @@ -141,7 +141,7 @@ AC_CONFIG_AUX_DIR([build-aux]) ### Add `--enable-extended-config[=MODE]` option NC_CONFIG_SHADOW_DIR([autostuff/shadows]) -AM_INIT_AUTOMAKE +AM_INIT_AUTOMAKE([gnu]) ### Add `--enable-author-mode` option AC_ARG_ENABLE([author-mode], @@ -225,7 +225,7 @@ AC_ARG_WITH([io_api], AS_VAR_SET([AC_CPPENV], ['$(OFFICIAL_CPPENV)']) AS_CASE(["${na_tmp_ioflavor}"], - [standard], [], + [standard], [:], [posix], [ AS_IF([test "x${ac_cv_have_posix_c}" = xno], [ NC_MSG_WARNBOX([The POSIX I/O API is not supported on this platform @@ -869,7 +869,7 @@ AS_MKDIR_P(['help']) ### Create a `help/make-targets.txt` file to be printed by `make help` { cat << 'END_HEREDOC' -GNU make utility to maintain AC_PACKAGE_NAME +GNU make utility to maintain AC_PACKAGE_NAME AC_PACKAGE_VERSION Commonly used targets: @@ -888,19 +888,19 @@ NA_HELP_STRINGS( `make check` tests the compiled objects directly from the source directory, `make installcheck` tests the compiled objects from the installation paths (you can pass a `DESTDIR` variable in case of staged - installations), `make finishcheck` tests the compiled objects from + installations), and `make finishcheck` tests the compiled objects from the installation paths without passing any information to the compiler about the latter, in order to check that and are automatically reachable (therefore no `DESTDIR` variable is supported here); note that `make installcheck` and `make finishcheck` can be - launched only after `make install(*)` has been launched], + launched only after having launched `make install(*)`], [[make mostlyclean], [make clean], [make distclean]], [clean the source directory according to different degrees of fury], [[make clobber]], [launch `make uninstall` followed by `make clean`], [[make alldone]], [launch `make install-strip` followed by `make installcheck` - in case - of staged installations it is possible to pass a `DEST` variable (see + of staged installations it is possible to pass a `DESTDIR` variable (see below)], [[make binary-release], [make manifest]], [create respectively a package and a manifest in the current location @@ -956,7 +956,7 @@ NA_HELP_STRINGS( script], [[make approve-revision], [make reject-revision]], [Approve/reject the current customization for a non-standard - environment (available only in specific cases))], + environment (available only in specific cases)], [[make expired]], [(Re)build all the targets listed in the `EXPIRE` user variable, as in `make EXPIRE=']AC_PACKAGE_TARNAME[-git.tar.gz @@ -977,9 +977,10 @@ NA_HELP_STRINGS( the `DESTDIR` variable allows to change the final installation path, independently of how the package has been configured; this variable can contain absolute paths only and defaults to an empty string when - omitted; the `DESTDIR` variable is meant only for staged installations - and must never contain a real installation path - if you need to - customize the target directories, launch `./configure --help`], + omitted; the `DESTDIR` variable is meant to be used only in case of + staged installations and should never contain a real installation path + - if you need to customize the target directories, launch `./configure + --help`], [[ZIPTYPE]], [Supported by `make authors-copy`, `make binary-release`, `make git-clone`, `make portable-builds` and `make source-release`, this diff --git a/dev/hackings/all/confini-metadata.c b/dev/hackings/all/confini-metadata.c index c38091b..71b4e8e 100644 --- a/dev/hackings/all/confini-metadata.c +++ b/dev/hackings/all/confini-metadata.c @@ -4,7 +4,7 @@ @brief libconfini functions @author Stefano Gioffré @copyright GNU General Public License, version 3 or any later version - @version 1.14.0 + @version 1.14.1 @date 2016-2020 @see https://madmurphy.github.io/libconfini diff --git a/dev/hackings/all/confini-metadata.h b/dev/hackings/all/confini-metadata.h index ad651b1..41b7ba9 100644 --- a/dev/hackings/all/confini-metadata.h +++ b/dev/hackings/all/confini-metadata.h @@ -4,7 +4,7 @@ @brief libconfini header @author Stefano Gioffré @copyright GNU General Public License, version 3 or any later version - @version 1.14.0 + @version 1.14.1 @date 2016-2020 @see https://madmurphy.github.io/libconfini diff --git a/dev/hackings/baremetal/README.md b/dev/hackings/baremetal/README.md index cc0636b..7e46b01 100644 --- a/dev/hackings/baremetal/README.md +++ b/dev/hackings/baremetal/README.md @@ -18,7 +18,7 @@ and possibly even without any header at all. Starting from version 1.13.0 a “bare metal” version of **libconfini** has been made available by simply passing a `--without-io-api` option to the `configure` -script. This modified version has the following characteristics: +script. This modified version comes with the following characteristics: * No heap usage (no memory is every allocated or freed) * No I/O functions (it is possible to parse only disposable `char` buffers via @@ -26,7 +26,7 @@ script. This modified version has the following characteristics: * Everything else is inherited verbatim from the official version -## The `--without-io-api` option +## The `dev/hackings/baremetal/` subdirectory When the `configure` script is launched with the `--without-io-api` option (or, equivalently, with `--with-io-api=baremetal`), it assumes that no standard diff --git a/dev/marked-sources/confini-marked.c b/dev/marked-sources/confini-marked.c index c3057ea..2cd04ab 100644 --- a/dev/marked-sources/confini-marked.c +++ b/dev/marked-sources/confini-marked.c @@ -3,14 +3,14 @@ /*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ !START_OMISSION! @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@- -This is a marked **exact copy** of `src/confini.c`, where replaceable sections have -been enclosed within special tags that can be parsed and amended by GNU Make to -create custom forks of the library. +This is a marked **exact copy** of `src/confini.c`, in which replaceable sections +have been wrapped within special tags that can be parsed and amended by GNU Make +during the build process in order to create custom forks of the library. If you want to contribute to the development of this project, please **use this file**, as `src/confini.c` is automatically generated from here. -For more information about the tags used here, see the `NA_AMEND()` macro from +For more information about the tags used here, please see the `NA_AMEND()` macro in `m4/not-autotools.m4` at https://github.com/madmurphy/not-autotools The code below is distributed under the terms of the GPL license version 3 or any @@ -460,8 +460,9 @@ later version. /* - Maybe in the future there will be support for UTF-8 casefold (although probably - not -- see "Code considerations" in the Manual), but for now only ASCII... + Maybe in the future there will be support for UTF-8 case folding (although + probably not -- see "Code considerations" in the Manual), but for now only + ASCII... */ #define _LIBCONFINI_CHR_CASEFOLD_(CHR) (CHR > 0x40 && CHR < 0x5b ? CHR | 0x60 : CHR) @@ -4846,9 +4847,11 @@ void ini_global_set_lowercase_mode (const bool lowercase) { @brief Sets the value to be to be assigned to implicit keys @param implicit_value The string to be used as implicit value - (usually `"YES"`, or `"TRUE"`) - @param implicit_v_len The length of @p implicit_value (usually - `0`, independently of its real length) + (usually `"YES"`, `"TRUE"`, or `"ON"`, or + any other string; it can be `NULL`) + @param implicit_v_len The length of @p implicit_value (without + counting the NUL terminator; use `0` for + both an empty string and `NULL`) @return Nothing @warning This function changes the value of one or more global variables. In diff --git a/dev/marked-sources/confini-marked.h b/dev/marked-sources/confini-marked.h index 095f650..054f9d6 100644 --- a/dev/marked-sources/confini-marked.h +++ b/dev/marked-sources/confini-marked.h @@ -2,15 +2,16 @@ /*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ !START_OMISSION! @@@@@@@@@@@@@@@@@@@@@@@@@@@@@- -This is a marked **exact copy** of `src/confini.h`, where replaceable sections -have been enclosed within special tags that can be parsed and amended by GNU -Make to create custom forks of the library. +This is a marked **exact copy** of `src/confini.h`, in which replaceable +sections have been wrapped within special tags that can be parsed and amended +by GNU Make during the build process in order to create custom forks of the +library. If you want to contribute to the development of this project, please **use this file**, as `src/confini.h` is automatically generated from here. -For more information about the tags used here, see the `NA_AMEND()` macro from -`m4/not-autotools.m4` at https://github.com/madmurphy/not-autotools +For more information about the tags used here, please see the `NA_AMEND()` +macro in `m4/not-autotools.m4` at https://github.com/madmurphy/not-autotools The code below is distributed under the terms of the GPL license version 3 or any later version. diff --git a/docs/html/baremetal.html b/docs/html/baremetal.html index 2fb828f..e3721fc 100644 --- a/docs/html/baremetal.html +++ b/docs/html/baremetal.html @@ -69,17 +69,17 @@

What ./configure --without-io-api does

Almost everything in libconfini is implemented from scratch, with the only notable exception of the I/O functions load_ini_file() and load_ini_path(), which rely on standard libraries (either the C Standard or the POSIX Standard, depending on the build settings). On some platforms, however, only a rather exotic I/O API is available, while for some other platforms the C Standard Library is simply too heavy or just not implementable.

In the past the build environment of libconfini did not offer shortcuts for facing this kind of situations – although thanks to the modularity of the source code it was still relatively simple to get rid of every tie with the C Standard Library and compile libconfini as “bare metal”, with strip_ini_cache() as the only parsing function (since this relies only on a buffer for its input) – i.e. without load_ini_file() and load_ini_path(), and possibly even without any header at all.

-

Starting from version 1.13.0 a “bare metal” version of libconfini has been made available by simply passing a --without-io-api option to the configure script. This modified version has the following characteristics:

+

Starting from version 1.13.0 a “bare metal” version of libconfini has been made available by simply passing a --without-io-api option to the configure script. This modified version comes with the following characteristics:

  • No heap usage (no memory is every allocated or freed)
  • No I/O functions (it is possible to parse only disposable char buffers via strip_ini_cache())
  • Everything else is inherited verbatim from the official version
-

The --without-io-api option

+

The dev/hackings/baremetal/ subdirectory

When the configure script is launched with the --without-io-api option (or, equivalently, with --with-io-api=baremetal), it assumes that no standard library at all could be present in the system. Hence it runs a series of tests and creates an inventory of what is present and what is not, in order to amend the source code accordingly – to ignore all the tests and assume that literally nothing from the C Standard library is supported use --with-io-api=nolibc. The amendments are necessary (instead of just relying on the C preprocessor) because it is required to change the public header, and not just the compiled code.

Fortunately only a very small amount of code in libconfini, besides the I/O functions, depends on the C Standard library, so it is relatively easy to produce a “bare metal” fork with or without it.

The dev/hackings/baremetal subdirectory contains all the necessary amendments. These are automatically applied when launching make all or make baremetal-csources from the top level directory, after having launched ./configure --without-io-api (the original source code will be preserved).

-

The files pp-utils.c and number-parsers.c constitute a re-implementation of the functions ini_get_int(), ini_get_lint(), ini_get_llint(), ini_get_float() and ini_get_double(), which in the original code are implemented as pointers to standard functions (see below). These two files amend src/confini.c.

+

The files pp-utils.c and number-parsers.c constitute a re-implementation of the functions ini_get_int(), ini_get_lint(), ini_get_llint(), ini_get_float() and ini_get_double(), which in the original code are implemented as pointers to standard functions (see below). These two files amend src/confini.c.

The file number-parsers.h exports the function headers of what number-parsers.c implements, and amends src/confini.h (i.e. the public header).

The file confini-header.c contains only a nominal workaround-amendment to src/confini.c (for facilitating the build system) that does not change the final C code compiled.

To produce the source code of the “bare metal” version of libconfini a fifth amendment to the public header is also required, containing some common C standard definitions. This amendment is automatically generated for each platform during the build process and will be located under no-dist/hackings/baremetal/c-standard-library.h.

@@ -341,20 +341,20 @@

Parsing numbers without the C Standard Library

}
-
ini_get_lint
long int(*const ini_get_lint)(const char *ini_string)
Pointer to atol()
Definition: confini.c:4986
+
ini_get_lint
long int(*const ini_get_lint)(const char *ini_string)
Pointer to atol()
Definition: confini.c:4989
IniFormat
24-bit bitfield representing the format of an INI file (INI dialect)
Definition: confini.h:95
CONFINI_ENOENT
@ CONFINI_ENOENT
Definition: confini.h:380
CONFINI_EIO
@ CONFINI_EIO
Definition: confini.h:382
CONFINI_EBADF
@ CONFINI_EBADF
Definition: confini.h:385
CONFINI_ENOMEM
@ CONFINI_ENOMEM
Definition: confini.h:381
-
ini_get_llint
long long int(*const ini_get_llint)(const char *ini_string)
Pointer to atoll()
Definition: confini.c:4988
-
load_ini_file
int load_ini_file(FILE *const ini_file, const IniFormat format, const IniStatsHandler f_init, const IniDispHandler f_foreach, void *const user_data)
Parses an INI file and dispatches its content to a custom callback using a FILE structure as argument...
Definition: confini.c:2806
-
strip_ini_cache
int strip_ini_cache(register char *const ini_source, const size_t ini_length, const IniFormat format, const IniStatsHandler f_init, const IniDispHandler f_foreach, void *const user_data)
Parses and tokenizes a buffer containing an INI file, then dispatches its content to a custom callbac...
Definition: confini.c:2296
-
ini_get_double
double(*const ini_get_double)(const char *ini_string)
Pointer to atof()
Definition: confini.c:4990
-
ini_get_int
int(*const ini_get_int)(const char *ini_string)
Pointer to atoi()
Definition: confini.c:4984
+
ini_get_llint
long long int(*const ini_get_llint)(const char *ini_string)
Pointer to atoll()
Definition: confini.c:4991
+
load_ini_file
int load_ini_file(FILE *const ini_file, const IniFormat format, const IniStatsHandler f_init, const IniDispHandler f_foreach, void *const user_data)
Parses an INI file and dispatches its content to a custom callback using a FILE structure as argument...
Definition: confini.c:2807
+
strip_ini_cache
int strip_ini_cache(register char *const ini_source, const size_t ini_length, const IniFormat format, const IniStatsHandler f_init, const IniDispHandler f_foreach, void *const user_data)
Parses and tokenizes a buffer containing an INI file, then dispatches its content to a custom callbac...
Definition: confini.c:2297
+
ini_get_double
double(*const ini_get_double)(const char *ini_string)
Pointer to atof()
Definition: confini.c:4993
+
ini_get_int
int(*const ini_get_int)(const char *ini_string)
Pointer to atoi()
Definition: confini.c:4987
CONFINI_EFBIG
@ CONFINI_EFBIG
Definition: confini.h:387
IniDispHandler
int(* IniDispHandler)(IniDispatch *dispatch, void *user_data)
Callback function for handling an IniDispatch structure.
Definition: confini.h:142
-
load_ini_path
int load_ini_path(const char *const path, const IniFormat format, const IniStatsHandler f_init, const IniDispHandler f_foreach, void *const user_data)
Parses an INI file and dispatches its content to a custom callback using a path as argument.
Definition: confini.c:2890
+
load_ini_path
int load_ini_path(const char *const path, const IniFormat format, const IniStatsHandler f_init, const IniDispHandler f_foreach, void *const user_data)
Parses an INI file and dispatches its content to a custom callback using a path as argument.
Definition: confini.c:2891
IniStatsHandler
int(* IniStatsHandler)(IniStatistics *statistics, void *user_data)
Callback function for handling an IniStatistics structure.
Definition: confini.h:133
diff --git a/docs/html/changelog.html b/docs/html/changelog.html index 7442717..ab92de1 100644 --- a/docs/html/changelog.html +++ b/docs/html/changelog.html @@ -67,6 +67,11 @@

Record of notable changes

+

1.14.1 – 2020-05-11

+

Changes:

+
    +
  • Documentation
    • +

1.14.0 – 2020-03-01

Changes:

-
ini_string_match_ss
bool ini_string_match_ss(const char *const simple_string_a, const char *const simple_string_b, const IniFormat format)
Compares two simple strings and checks whether they match.
Definition: confini.c:2967
+
ini_array_split
int ini_array_split(char *const ini_string, const char delimiter, const IniFormat format, const IniStrHandler f_foreach, void *const user_data)
Splits a stringified INI array into NUL-separated members and calls a custom function for each member...
Definition: confini.c:4697
+
ini_string_match_ss
bool ini_string_match_ss(const char *const simple_string_a, const char *const simple_string_b, const IniFormat format)
Compares two simple strings and checks whether they match.
Definition: confini.c:2968
IniDispatch::format
const IniFormat format
Definition: confini.h:112
IniDispatch::v_len
size_t v_len
Definition: confini.h:118
IniDispatch::data
char * data
Definition: confini.h:114
IniFormat
24-bit bitfield representing the format of an INI file (INI dialect)
Definition: confini.h:95
-
ini_unquote
size_t ini_unquote(char *const ini_string, const IniFormat format)
Unescapes \', \", and \\ and removes all unescaped quotes (if single/double quotes are considered met...
Definition: confini.c:3662
-
ini_string_match_ii
bool ini_string_match_ii(const char *const ini_string_a, const char *const ini_string_b, const IniFormat format)
Compares two INI strings and checks whether they match.
Definition: confini.c:3233
-
ini_array_break
char * ini_array_break(char *const ini_string, const char delimiter, const IniFormat format)
Replaces the first delimiter found (together with the spaces that surround it) with \0
Definition: confini.c:4545
+
ini_unquote
size_t ini_unquote(char *const ini_string, const IniFormat format)
Unescapes \', \", and \\ and removes all unescaped quotes (if single/double quotes are considered met...
Definition: confini.c:3663
+
ini_string_match_ii
bool ini_string_match_ii(const char *const ini_string_a, const char *const ini_string_b, const IniFormat format)
Compares two INI strings and checks whether they match.
Definition: confini.c:3234
+
ini_array_break
char * ini_array_break(char *const ini_string, const char delimiter, const IniFormat format)
Replaces the first delimiter found (together with the spaces that surround it) with \0
Definition: confini.c:4546
IniStatistics
Global statistics about an INI file.
Definition: confini.h:101
CONFINI_FEINTR
@ CONFINI_FEINTR
Definition: confini.h:378
-
ini_array_shift
size_t ini_array_shift(const char **const ini_strptr, const char delimiter, const IniFormat format)
Shifts the location pointed by ini_strptr to the next member of the INI array (without modifying the ...
Definition: confini.c:4245
-
load_ini_file
int load_ini_file(FILE *const ini_file, const IniFormat format, const IniStatsHandler f_init, const IniDispHandler f_foreach, void *const user_data)
Parses an INI file and dispatches its content to a custom callback using a FILE structure as argument...
Definition: confini.c:2806
-
ini_array_collapse
size_t ini_array_collapse(char *const ini_string, const char delimiter, const IniFormat format)
Compresses the distribution of the data in a stringified INI array by removing all the white spaces t...
Definition: confini.c:4339
+
ini_array_shift
size_t ini_array_shift(const char **const ini_strptr, const char delimiter, const IniFormat format)
Shifts the location pointed by ini_strptr to the next member of the INI array (without modifying the ...
Definition: confini.c:4246
+
load_ini_file
int load_ini_file(FILE *const ini_file, const IniFormat format, const IniStatsHandler f_init, const IniDispHandler f_foreach, void *const user_data)
Parses an INI file and dispatches its content to a custom callback using a FILE structure as argument...
Definition: confini.c:2807
+
ini_array_collapse
size_t ini_array_collapse(char *const ini_string, const char delimiter, const IniFormat format)
Compresses the distribution of the data in a stringified INI array by removing all the white spaces t...
Definition: confini.c:4340
IniFormat::semicolon_marker
unsigned char semicolon_marker
Definition: confini.h:95
IniDispatch
Dispatch of a single INI node.
Definition: confini.h:111
INI_IGNORE
@ INI_IGNORE
Definition: confini.h:437
IniFormat::hash_marker
unsigned char hash_marker
Definition: confini.h:95
IniDispatch::dispatch_id
size_t dispatch_id
Definition: confini.h:120
-
strip_ini_cache
int strip_ini_cache(register char *const ini_source, const size_t ini_length, const IniFormat format, const IniStatsHandler f_init, const IniDispHandler f_foreach, void *const user_data)
Parses and tokenizes a buffer containing an INI file, then dispatches its content to a custom callbac...
Definition: confini.c:2296
-
ini_string_parse
size_t ini_string_parse(char *const ini_string, const IniFormat format)
Unescapes \', \", and \\ and removes all unescaped quotes (if single/double quotes are considered met...
Definition: confini.c:3800
-
ini_get_int
int(*const ini_get_int)(const char *ini_string)
Pointer to atoi()
Definition: confini.c:4984
+
strip_ini_cache
int strip_ini_cache(register char *const ini_source, const size_t ini_length, const IniFormat format, const IniStatsHandler f_init, const IniDispHandler f_foreach, void *const user_data)
Parses and tokenizes a buffer containing an INI file, then dispatches its content to a custom callbac...
Definition: confini.c:2297
+
ini_string_parse
size_t ini_string_parse(char *const ini_string, const IniFormat format)
Unescapes \', \", and \\ and removes all unescaped quotes (if single/double quotes are considered met...
Definition: confini.c:3801
+
ini_get_int
int(*const ini_get_int)(const char *ini_string)
Pointer to atoi()
Definition: confini.c:4987
IniDispatch::value
char * value
Definition: confini.h:115
-
ini_array_get_length
size_t ini_array_get_length(const char *const ini_string, const char delimiter, const IniFormat format)
Gets the length of a stringified INI array in number of members.
Definition: confini.c:3992
+
ini_array_get_length
size_t ini_array_get_length(const char *const ini_string, const char delimiter, const IniFormat format)
Gets the length of a stringified INI array in number of members.
Definition: confini.c:3993
CONFINI_ERROR
#define CONFINI_ERROR
Error mask (flags not present in user-generated interruptions)
Definition: confini.h:367
-
ini_string_match_si
bool ini_string_match_si(const char *const simple_string, const char *const ini_string, const IniFormat format)
Compares a simple string and an INI string and and checks whether they match.
Definition: confini.c:3065
+
ini_string_match_si
bool ini_string_match_si(const char *const simple_string, const char *const ini_string, const IniFormat format)
Compares a simple string and an INI string and and checks whether they match.
Definition: confini.c:3066
IniFormat::implicit_is_not_empty
unsigned char implicit_is_not_empty
Definition: confini.h:95
IniDispatch::append_to
const char * append_to
Definition: confini.h:116
confini.h
libconfini header
@@ -3442,13 +3442,13 @@

INI_KEY
@ INI_KEY
Definition: confini.h:402

IniDispatch::type
uint8_t type
Definition: confini.h:113
INI_DISABLED_KEY
@ INI_DISABLED_KEY
Definition: confini.h:407
-
INI_GLOBAL_IMPLICIT_VALUE
char * INI_GLOBAL_IMPLICIT_VALUE
Value to be assigned to implicit keys (default value: NULL)
Definition: confini.c:5005
-
load_ini_path
int load_ini_path(const char *const path, const IniFormat format, const IniStatsHandler f_init, const IniDispHandler f_foreach, void *const user_data)
Parses an INI file and dispatches its content to a custom callback using a path as argument.
Definition: confini.c:2890
-
ini_global_set_implicit_value
void ini_global_set_implicit_value(char *const implicit_value, const size_t implicit_v_len)
Sets the value to be to be assigned to implicit keys.
Definition: confini.c:4845
-
ini_get_bool
int ini_get_bool(const char *const ini_string, const int when_fail)
Checks whether a string matches one of the booleans listed in the private constant INI_BOOLEANS (case...
Definition: confini.c:4927
+
INI_GLOBAL_IMPLICIT_VALUE
char * INI_GLOBAL_IMPLICIT_VALUE
Value to be assigned to implicit keys (default value: NULL)
Definition: confini.c:5008
+
load_ini_path
int load_ini_path(const char *const path, const IniFormat format, const IniStatsHandler f_init, const IniDispHandler f_foreach, void *const user_data)
Parses an INI file and dispatches its content to a custom callback using a path as argument.
Definition: confini.c:2891
+
ini_global_set_implicit_value
void ini_global_set_implicit_value(char *const implicit_value, const size_t implicit_v_len)
Sets the value to be to be assigned to implicit keys.
Definition: confini.c:4848
+
ini_get_bool
int ini_get_bool(const char *const ini_string, const int when_fail)
Checks whether a string matches one of the booleans listed in the private constant INI_BOOLEANS (case...
Definition: confini.c:4930
INI_DEFAULT_FORMAT
static const IniFormat INI_DEFAULT_FORMAT
A model format for standard INI files.
Definition: confini.h:485
-
ini_array_foreach
int ini_array_foreach(const char *const ini_string, const char delimiter, const IniFormat format, const IniSubstrHandler f_foreach, void *const user_data)
Calls a custom function for each member of a stringified INI array, without modifying the content of ...
Definition: confini.c:4114
-
ini_array_release
char * ini_array_release(char **const ini_strptr, const char delimiter, const IniFormat format)
Replaces the first delimiter found (together with the spaces that surround it) with \0,...
Definition: confini.c:4624
+
ini_array_foreach
int ini_array_foreach(const char *const ini_string, const char delimiter, const IniFormat format, const IniSubstrHandler f_foreach, void *const user_data)
Calls a custom function for each member of a stringified INI array, without modifying the content of ...
Definition: confini.c:4115
+
ini_array_release
char * ini_array_release(char **const ini_strptr, const char delimiter, const IniFormat format)
Replaces the first delimiter found (together with the spaces that surround it) with \0,...
Definition: confini.c:4625
Generated by   diff --git a/docs/html/confini_8h.html b/docs/html/confini_8h.html index 2658ee4..285ce6a 100644 --- a/docs/html/confini_8h.html +++ b/docs/html/confini_8h.html @@ -303,7 +303,7 @@

libconfini header

Author
Stefano Gioffré
Copyright
GNU General Public License, version 3 or any later version
-
Version
1.14.0
+
Version
1.14.1
Date
2016-2020
See also
https://madmurphy.github.io/libconfini

Macro Definition Documentation

@@ -1774,8 +1774,8 @@

Parameters
- - + +
implicit_valueThe string to be used as implicit value (usually "YES", or "TRUE")
implicit_v_lenThe length of implicit_value (usually 0, independently of its real length)
implicit_valueThe string to be used as implicit value (usually "YES", "TRUE", or "ON", or any other string; it can be NULL)
implicit_v_lenThe length of implicit_value (without counting the NUL terminator; use 0 for both an empty string and NULL)
@@ -2870,35 +2870,35 @@

ini_array_split
int ini_array_split(char *const ini_string, const char delimiter, const IniFormat format, const IniStrHandler f_foreach, void *const user_data)
Splits a stringified INI array into NUL-separated members and calls a custom function for each member...
Definition: confini.c:4696
+
ini_array_split
int ini_array_split(char *const ini_string, const char delimiter, const IniFormat format, const IniStrHandler f_foreach, void *const user_data)
Splits a stringified INI array into NUL-separated members and calls a custom function for each member...
Definition: confini.c:4697
INI_MULTILINE_EVERYWHERE
@ INI_MULTILINE_EVERYWHERE
Definition: confini.h:468
-
ini_string_match_ss
bool ini_string_match_ss(const char *const simple_string_a, const char *const simple_string_b, const IniFormat format)
Compares two simple strings and checks whether they match.
Definition: confini.c:2967
+
ini_string_match_ss
bool ini_string_match_ss(const char *const simple_string_a, const char *const simple_string_b, const IniFormat format)
Compares two simple strings and checks whether they match.
Definition: confini.c:2968
IniDispatch::format
const IniFormat format
Definition: confini.h:112
IniDispatch::v_len
size_t v_len
Definition: confini.h:118
IniDispatch::data
char * data
Definition: confini.h:114
IniFormat
24-bit bitfield representing the format of an INI file (INI dialect)
Definition: confini.h:95
-
ini_unquote
size_t ini_unquote(char *const ini_string, const IniFormat format)
Unescapes \', \", and \\ and removes all unescaped quotes (if single/double quotes are considered met...
Definition: confini.c:3662
-
ini_string_match_ii
bool ini_string_match_ii(const char *const ini_string_a, const char *const ini_string_b, const IniFormat format)
Compares two INI strings and checks whether they match.
Definition: confini.c:3233
+
ini_unquote
size_t ini_unquote(char *const ini_string, const IniFormat format)
Unescapes \', \", and \\ and removes all unescaped quotes (if single/double quotes are considered met...
Definition: confini.c:3663
+
ini_string_match_ii
bool ini_string_match_ii(const char *const ini_string_a, const char *const ini_string_b, const IniFormat format)
Compares two INI strings and checks whether they match.
Definition: confini.c:3234
INI_ABSOLUTE_AND_RELATIVE
@ INI_ABSOLUTE_AND_RELATIVE
Definition: confini.h:449
-
ini_array_break
char * ini_array_break(char *const ini_string, const char delimiter, const IniFormat format)
Replaces the first delimiter found (together with the spaces that surround it) with \0
Definition: confini.c:4545
+
ini_array_break
char * ini_array_break(char *const ini_string, const char delimiter, const IniFormat format)
Replaces the first delimiter found (together with the spaces that surround it) with \0
Definition: confini.c:4546
IniStatistics
Global statistics about an INI file.
Definition: confini.h:101
CONFINI_FEINTR
@ CONFINI_FEINTR
Definition: confini.h:378
-
ini_array_shift
size_t ini_array_shift(const char **const ini_strptr, const char delimiter, const IniFormat format)
Shifts the location pointed by ini_strptr to the next member of the INI array (without modifying the ...
Definition: confini.c:4245
-
load_ini_file
int load_ini_file(FILE *const ini_file, const IniFormat format, const IniStatsHandler f_init, const IniDispHandler f_foreach, void *const user_data)
Parses an INI file and dispatches its content to a custom callback using a FILE structure as argument...
Definition: confini.c:2806
-
ini_array_collapse
size_t ini_array_collapse(char *const ini_string, const char delimiter, const IniFormat format)
Compresses the distribution of the data in a stringified INI array by removing all the white spaces t...
Definition: confini.c:4339
+
ini_array_shift
size_t ini_array_shift(const char **const ini_strptr, const char delimiter, const IniFormat format)
Shifts the location pointed by ini_strptr to the next member of the INI array (without modifying the ...
Definition: confini.c:4246
+
load_ini_file
int load_ini_file(FILE *const ini_file, const IniFormat format, const IniStatsHandler f_init, const IniDispHandler f_foreach, void *const user_data)
Parses an INI file and dispatches its content to a custom callback using a FILE structure as argument...
Definition: confini.c:2807
+
ini_array_collapse
size_t ini_array_collapse(char *const ini_string, const char delimiter, const IniFormat format)
Compresses the distribution of the data in a stringified INI array by removing all the white spaces t...
Definition: confini.c:4340
IniFormat::semicolon_marker
unsigned char semicolon_marker
Definition: confini.h:95
IniDispatch
Dispatch of a single INI node.
Definition: confini.h:111
INI_IGNORE
@ INI_IGNORE
Definition: confini.h:437
IniFormat::hash_marker
unsigned char hash_marker
Definition: confini.h:95
IniDispatch::dispatch_id
size_t dispatch_id
Definition: confini.h:120
-
strip_ini_cache
int strip_ini_cache(register char *const ini_source, const size_t ini_length, const IniFormat format, const IniStatsHandler f_init, const IniDispHandler f_foreach, void *const user_data)
Parses and tokenizes a buffer containing an INI file, then dispatches its content to a custom callbac...
Definition: confini.c:2296
-
ini_string_parse
size_t ini_string_parse(char *const ini_string, const IniFormat format)
Unescapes \', \", and \\ and removes all unescaped quotes (if single/double quotes are considered met...
Definition: confini.c:3800
-
ini_get_int
int(*const ini_get_int)(const char *ini_string)
Pointer to atoi()
Definition: confini.c:4984
+
strip_ini_cache
int strip_ini_cache(register char *const ini_source, const size_t ini_length, const IniFormat format, const IniStatsHandler f_init, const IniDispHandler f_foreach, void *const user_data)
Parses and tokenizes a buffer containing an INI file, then dispatches its content to a custom callbac...
Definition: confini.c:2297
+
ini_string_parse
size_t ini_string_parse(char *const ini_string, const IniFormat format)
Unescapes \', \", and \\ and removes all unescaped quotes (if single/double quotes are considered met...
Definition: confini.c:3801
+
ini_get_int
int(*const ini_get_int)(const char *ini_string)
Pointer to atoi()
Definition: confini.c:4987
IniDispatch::value
char * value
Definition: confini.h:115
INI_DISABLED_OR_COMMENT
@ INI_DISABLED_OR_COMMENT
Definition: confini.h:434
-
ini_array_get_length
size_t ini_array_get_length(const char *const ini_string, const char delimiter, const IniFormat format)
Gets the length of a stringified INI array in number of members.
Definition: confini.c:3992
+
ini_array_get_length
size_t ini_array_get_length(const char *const ini_string, const char delimiter, const IniFormat format)
Gets the length of a stringified INI array in number of members.
Definition: confini.c:3993
CONFINI_ERROR
#define CONFINI_ERROR
Error mask (flags not present in user-generated interruptions)
Definition: confini.h:367
-
ini_string_match_si
bool ini_string_match_si(const char *const simple_string, const char *const ini_string, const IniFormat format)
Compares a simple string and an INI string and and checks whether they match.
Definition: confini.c:3065
+
ini_string_match_si
bool ini_string_match_si(const char *const simple_string, const char *const ini_string, const IniFormat format)
Compares a simple string and an INI string and and checks whether they match.
Definition: confini.c:3066
IniFormat::implicit_is_not_empty
unsigned char implicit_is_not_empty
Definition: confini.h:95
IniDispatch::append_to
const char * append_to
Definition: confini.h:116
confini.h
libconfini header
@@ -2908,14 +2908,14 @@

INI_KEY
@ INI_KEY
Definition: confini.h:402
IniDispatch::type
uint8_t type
Definition: confini.h:113
INI_DISABLED_KEY
@ INI_DISABLED_KEY
Definition: confini.h:407
-
INI_GLOBAL_IMPLICIT_VALUE
char * INI_GLOBAL_IMPLICIT_VALUE
Value to be assigned to implicit keys (default value: NULL)
Definition: confini.c:5005
+
INI_GLOBAL_IMPLICIT_VALUE
char * INI_GLOBAL_IMPLICIT_VALUE
Value to be assigned to implicit keys (default value: NULL)
Definition: confini.c:5008
INI_EQUALS
@ INI_EQUALS
Definition: confini.h:421
-
load_ini_path
int load_ini_path(const char *const path, const IniFormat format, const IniStatsHandler f_init, const IniDispHandler f_foreach, void *const user_data)
Parses an INI file and dispatches its content to a custom callback using a path as argument.
Definition: confini.c:2890
-
ini_global_set_implicit_value
void ini_global_set_implicit_value(char *const implicit_value, const size_t implicit_v_len)
Sets the value to be to be assigned to implicit keys.
Definition: confini.c:4845
-
ini_get_bool
int ini_get_bool(const char *const ini_string, const int when_fail)
Checks whether a string matches one of the booleans listed in the private constant INI_BOOLEANS (case...
Definition: confini.c:4927
+
load_ini_path
int load_ini_path(const char *const path, const IniFormat format, const IniStatsHandler f_init, const IniDispHandler f_foreach, void *const user_data)
Parses an INI file and dispatches its content to a custom callback using a path as argument.
Definition: confini.c:2891
+
ini_global_set_implicit_value
void ini_global_set_implicit_value(char *const implicit_value, const size_t implicit_v_len)
Sets the value to be to be assigned to implicit keys.
Definition: confini.c:4848
+
ini_get_bool
int ini_get_bool(const char *const ini_string, const int when_fail)
Checks whether a string matches one of the booleans listed in the private constant INI_BOOLEANS (case...
Definition: confini.c:4930
INI_DEFAULT_FORMAT
static const IniFormat INI_DEFAULT_FORMAT
A model format for standard INI files.
Definition: confini.h:485
-
ini_array_foreach
int ini_array_foreach(const char *const ini_string, const char delimiter, const IniFormat format, const IniSubstrHandler f_foreach, void *const user_data)
Calls a custom function for each member of a stringified INI array, without modifying the content of ...
Definition: confini.c:4114
-
ini_array_release
char * ini_array_release(char **const ini_strptr, const char delimiter, const IniFormat format)
Replaces the first delimiter found (together with the spaces that surround it) with \0,...
Definition: confini.c:4624
+
ini_array_foreach
int ini_array_foreach(const char *const ini_string, const char delimiter, const IniFormat format, const IniSubstrHandler f_foreach, void *const user_data)
Calls a custom function for each member of a stringified INI array, without modifying the content of ...
Definition: confini.c:4115
+
ini_array_release
char * ini_array_release(char **const ini_strptr, const char delimiter, const IniFormat format)
Replaces the first delimiter found (together with the spaces that surround it) with \0,...
Definition: confini.c:4625
Generated by   diff --git a/docs/html/confini_8h_source.html b/docs/html/confini_8h_source.html index 02213a2..d3fa24a 100644 --- a/docs/html/confini_8h_source.html +++ b/docs/html/confini_8h_source.html @@ -495,13 +495,13 @@
547 
INI_NO_SECTIONS
@ INI_NO_SECTIONS
Definition: confini.h:458
-
ini_array_split
int ini_array_split(char *const ini_string, const char delimiter, const IniFormat format, const IniStrHandler f_foreach, void *const user_data)
Splits a stringified INI array into NUL-separated members and calls a custom function for each member...
Definition: confini.c:4696
+
ini_array_split
int ini_array_split(char *const ini_string, const char delimiter, const IniFormat format, const IniStrHandler f_foreach, void *const user_data)
Splits a stringified INI array into NUL-separated members and calls a custom function for each member...
Definition: confini.c:4697
INI_DOT
@ INI_DOT
Definition: confini.h:423
INI_MULTILINE_EVERYWHERE
@ INI_MULTILINE_EVERYWHERE
Definition: confini.h:468
-
ini_string_match_ss
bool ini_string_match_ss(const char *const simple_string_a, const char *const simple_string_b, const IniFormat format)
Compares two simple strings and checks whether they match.
Definition: confini.c:2967
+
ini_string_match_ss
bool ini_string_match_ss(const char *const simple_string_a, const char *const simple_string_b, const IniFormat format)
Compares two simple strings and checks whether they match.
Definition: confini.c:2968
INI_UNKNOWN
@ INI_UNKNOWN
Definition: confini.h:396
INI_BUT_DISABLED_AND_COMMENTS
@ INI_BUT_DISABLED_AND_COMMENTS
Definition: confini.h:474
-
ini_get_lint
long int(*const ini_get_lint)(const char *ini_string)
Pointer to atol()
Definition: confini.c:4986
+
ini_get_lint
long int(*const ini_get_lint)(const char *ini_string)
Pointer to atol()
Definition: confini.c:4989
CONFINI_EOOR
@ CONFINI_EOOR
Definition: confini.h:383
INI_DISABLED_SECTION
@ INI_DISABLED_SECTION
Definition: confini.h:408
IniDispatch::format
const IniFormat format
Definition: confini.h:112
@@ -511,39 +511,39 @@
INI_COMMA
@ INI_COMMA
Definition: confini.h:424
ConfiniInterruptNo
ConfiniInterruptNo
Error codes.
Definition: confini.h:373
IniFormat
24-bit bitfield representing the format of an INI file (INI dialect)
Definition: confini.h:95
-
ini_unquote
size_t ini_unquote(char *const ini_string, const IniFormat format)
Unescapes \', \", and \\ and removes all unescaped quotes (if single/double quotes are considered met...
Definition: confini.c:3662
-
ini_string_match_ii
bool ini_string_match_ii(const char *const ini_string_a, const char *const ini_string_b, const IniFormat format)
Compares two INI strings and checks whether they match.
Definition: confini.c:3233
+
ini_unquote
size_t ini_unquote(char *const ini_string, const IniFormat format)
Unescapes \', \", and \\ and removes all unescaped quotes (if single/double quotes are considered met...
Definition: confini.c:3663
+
ini_string_match_ii
bool ini_string_match_ii(const char *const ini_string_a, const char *const ini_string_b, const IniFormat format)
Compares two INI strings and checks whether they match.
Definition: confini.c:3234
IniSubstrHandler
int(* IniSubstrHandler)(const char *ini_string, size_t fragm_offset, size_t fragm_length, size_t fragm_num, IniFormat format, void *user_data)
Callback function for handling a selected fragment of an INI string.
Definition: confini.h:164
CONFINI_EROADDR
@ CONFINI_EROADDR
Definition: confini.h:388
INI_ABSOLUTE_AND_RELATIVE
@ INI_ABSOLUTE_AND_RELATIVE
Definition: confini.h:449
INI_ANY_SPACE
@ INI_ANY_SPACE
Definition: confini.h:418
-
ini_array_break
char * ini_array_break(char *const ini_string, const char delimiter, const IniFormat format)
Replaces the first delimiter found (together with the spaces that surround it) with \0
Definition: confini.c:4545
-
ini_fton
IniFormatNum ini_fton(const IniFormat format)
Calculates the IniFormatNum of an IniFormat.
Definition: confini.c:4861
+
ini_array_break
char * ini_array_break(char *const ini_string, const char delimiter, const IniFormat format)
Replaces the first delimiter found (together with the spaces that surround it) with \0
Definition: confini.c:4546
+
ini_fton
IniFormatNum ini_fton(const IniFormat format)
Calculates the IniFormatNum of an IniFormat.
Definition: confini.c:4864
CONFINI_ENOENT
@ CONFINI_ENOENT
Definition: confini.h:380
IniStatistics
Global statistics about an INI file.
Definition: confini.h:101
CONFINI_FEINTR
@ CONFINI_FEINTR
Definition: confini.h:378
-
ini_array_shift
size_t ini_array_shift(const char **const ini_strptr, const char delimiter, const IniFormat format)
Shifts the location pointed by ini_strptr to the next member of the INI array (without modifying the ...
Definition: confini.c:4245
+
ini_array_shift
size_t ini_array_shift(const char **const ini_strptr, const char delimiter, const IniFormat format)
Shifts the location pointed by ini_strptr to the next member of the INI array (without modifying the ...
Definition: confini.c:4246
CONFINI_EIO
@ CONFINI_EIO
Definition: confini.h:382
CONFINI_EBADF
@ CONFINI_EBADF
Definition: confini.h:385
IniDelimiters
IniDelimiters
Common array and key-value delimiters (but a delimiter may also be any other ASCII character not pres...
Definition: confini.h:417
CONFINI_ENOMEM
@ CONFINI_ENOMEM
Definition: confini.h:381
-
ini_get_llint
long long int(*const ini_get_llint)(const char *ini_string)
Pointer to atoll()
Definition: confini.c:4988
+
ini_get_llint
long long int(*const ini_get_llint)(const char *ini_string)
Pointer to atoll()
Definition: confini.c:4991
IniDispatch
struct IniDispatch IniDispatch
Dispatch of a single INI node.
INI_ABSOLUTE_ONLY
@ INI_ABSOLUTE_ONLY
Definition: confini.h:452
INI_BUT_COMMENTS
@ INI_BUT_COMMENTS
Definition: confini.h:471
-
ini_global_set_lowercase_mode
void ini_global_set_lowercase_mode(const bool lowercase)
Sets the value of the global variable INI_GLOBAL_LOWERCASE_MODE.
Definition: confini.c:4820
-
load_ini_file
int load_ini_file(FILE *const ini_file, const IniFormat format, const IniStatsHandler f_init, const IniDispHandler f_foreach, void *const user_data)
Parses an INI file and dispatches its content to a custom callback using a FILE structure as argument...
Definition: confini.c:2806
-
ini_array_collapse
size_t ini_array_collapse(char *const ini_string, const char delimiter, const IniFormat format)
Compresses the distribution of the data in a stringified INI array by removing all the white spaces t...
Definition: confini.c:4339
+
ini_global_set_lowercase_mode
void ini_global_set_lowercase_mode(const bool lowercase)
Sets the value of the global variable INI_GLOBAL_LOWERCASE_MODE.
Definition: confini.c:4821
+
load_ini_file
int load_ini_file(FILE *const ini_file, const IniFormat format, const IniStatsHandler f_init, const IniDispHandler f_foreach, void *const user_data)
Parses an INI file and dispatches its content to a custom callback using a FILE structure as argument...
Definition: confini.c:2807
+
ini_array_collapse
size_t ini_array_collapse(char *const ini_string, const char delimiter, const IniFormat format)
Compresses the distribution of the data in a stringified INI array by removing all the white spaces t...
Definition: confini.c:4340
IniDispatch
Dispatch of a single INI node.
Definition: confini.h:111
IniStatistics::members
const size_t members
Definition: confini.h:104
INI_IGNORE
@ INI_IGNORE
Definition: confini.h:437
INI_SECTION
@ INI_SECTION
Definition: confini.h:403
IniDispatch::dispatch_id
size_t dispatch_id
Definition: confini.h:120
-
INI_GLOBAL_IMPLICIT_V_LEN
size_t INI_GLOBAL_IMPLICIT_V_LEN
Length of the value assigned to implicit keys (default value: 0)
Definition: confini.c:5007
-
strip_ini_cache
int strip_ini_cache(register char *const ini_source, const size_t ini_length, const IniFormat format, const IniStatsHandler f_init, const IniDispHandler f_foreach, void *const user_data)
Parses and tokenizes a buffer containing an INI file, then dispatches its content to a custom callbac...
Definition: confini.c:2296
-
ini_string_parse
size_t ini_string_parse(char *const ini_string, const IniFormat format)
Unescapes \', \", and \\ and removes all unescaped quotes (if single/double quotes are considered met...
Definition: confini.c:3800
-
ini_get_double
double(*const ini_get_double)(const char *ini_string)
Pointer to atof()
Definition: confini.c:4990
-
ini_get_int
int(*const ini_get_int)(const char *ini_string)
Pointer to atoi()
Definition: confini.c:4984
+
INI_GLOBAL_IMPLICIT_V_LEN
size_t INI_GLOBAL_IMPLICIT_V_LEN
Length of the value assigned to implicit keys (default value: 0)
Definition: confini.c:5010
+
strip_ini_cache
int strip_ini_cache(register char *const ini_source, const size_t ini_length, const IniFormat format, const IniStatsHandler f_init, const IniDispHandler f_foreach, void *const user_data)
Parses and tokenizes a buffer containing an INI file, then dispatches its content to a custom callbac...
Definition: confini.c:2297
+
ini_string_parse
size_t ini_string_parse(char *const ini_string, const IniFormat format)
Unescapes \', \", and \\ and removes all unescaped quotes (if single/double quotes are considered met...
Definition: confini.c:3801
+
ini_get_double
double(*const ini_get_double)(const char *ini_string)
Pointer to atof()
Definition: confini.c:4993
+
ini_get_int
int(*const ini_get_int)(const char *ini_string)
Pointer to atoi()
Definition: confini.c:4987
INI_ONE_LEVEL_ONLY
@ INI_ONE_LEVEL_ONLY
Definition: confini.h:455
IniStatistics::format
const IniFormat format
Definition: confini.h:102
IniDispatch::value
char * value
Definition: confini.h:115
@@ -551,9 +551,9 @@
CONFINI_SUCCESS
@ CONFINI_SUCCESS
Definition: confini.h:374
INI_INLINE_COMMENT
@ INI_INLINE_COMMENT
Definition: confini.h:406
INI_DISABLED_OR_COMMENT
@ INI_DISABLED_OR_COMMENT
Definition: confini.h:434
-
ini_array_get_length
size_t ini_array_get_length(const char *const ini_string, const char delimiter, const IniFormat format)
Gets the length of a stringified INI array in number of members.
Definition: confini.c:3992
-
ini_array_match
bool ini_array_match(const char *const ini_string_a, const char *const ini_string_b, const char delimiter, const IniFormat format)
Compares two INI arrays and checks whether they match.
Definition: confini.c:3427
-
ini_string_match_si
bool ini_string_match_si(const char *const simple_string, const char *const ini_string, const IniFormat format)
Compares a simple string and an INI string and and checks whether they match.
Definition: confini.c:3065
+
ini_array_get_length
size_t ini_array_get_length(const char *const ini_string, const char delimiter, const IniFormat format)
Gets the length of a stringified INI array in number of members.
Definition: confini.c:3993
+
ini_array_match
bool ini_array_match(const char *const ini_string_a, const char *const ini_string_b, const char delimiter, const IniFormat format)
Compares two INI arrays and checks whether they match.
Definition: confini.c:3428
+
ini_string_match_si
bool ini_string_match_si(const char *const simple_string, const char *const ini_string, const IniFormat format)
Compares a simple string and an INI string and and checks whether they match.
Definition: confini.c:3066
IniStatistics
struct IniStatistics IniStatistics
Global statistics about an INI file.
IniDispatch::append_to
const char * append_to
Definition: confini.h:116
INI_IS_NOT_A_MARKER
@ INI_IS_NOT_A_MARKER
Definition: confini.h:440
@@ -563,27 +563,27 @@
INI_ONLY_COMMENT
@ INI_ONLY_COMMENT
Definition: confini.h:436
INI_UNIXLIKE_FORMAT
static const IniFormat INI_UNIXLIKE_FORMAT
A model format for Unix-like .conf files (where space characters are delimiters between keys and valu...
Definition: confini.h:493
IniNodeType
IniNodeType
INI node types.
Definition: confini.h:395
-
INI_GLOBAL_LOWERCASE_MODE
bool INI_GLOBAL_LOWERCASE_MODE
If set to true, key and section names in case-insensitive INI formats will be dispatched lowercase,...
Definition: confini.c:5003
+
INI_GLOBAL_LOWERCASE_MODE
bool INI_GLOBAL_LOWERCASE_MODE
If set to true, key and section names in case-insensitive INI formats will be dispatched lowercase,...
Definition: confini.c:5006
INI_KEY
@ INI_KEY
Definition: confini.h:402
INI_COMMENT
@ INI_COMMENT
Definition: confini.h:405
IniStrHandler
int(* IniStrHandler)(char *ini_string, size_t string_length, size_t string_num, IniFormat format, void *user_data)
Callback function for handling an INI string belonging to a sequence of INI strings.
Definition: confini.h:152
IniMultiline
IniMultiline
Possible values of IniFormat::multiline_nodes.
Definition: confini.h:467
-
ini_ntof
IniFormat ini_ntof(const IniFormatNum format_id)
Constructs a new IniFormat according to an IniFormatNum.
Definition: confini.c:4882
+
ini_ntof
IniFormat ini_ntof(const IniFormatNum format_id)
Constructs a new IniFormat according to an IniFormatNum.
Definition: confini.c:4885
IniStatistics::bytes
const size_t bytes
Definition: confini.h:103
CONFINI_IINTR
@ CONFINI_IINTR
Definition: confini.h:376
IniDispatch::type
uint8_t type
Definition: confini.h:113
INI_COLON
@ INI_COLON
Definition: confini.h:422
INI_DISABLED_KEY
@ INI_DISABLED_KEY
Definition: confini.h:407
-
INI_GLOBAL_IMPLICIT_VALUE
char * INI_GLOBAL_IMPLICIT_VALUE
Value to be assigned to implicit keys (default value: NULL)
Definition: confini.c:5005
+
INI_GLOBAL_IMPLICIT_VALUE
char * INI_GLOBAL_IMPLICIT_VALUE
Value to be assigned to implicit keys (default value: NULL)
Definition: confini.c:5008
INI_EQUALS
@ INI_EQUALS
Definition: confini.h:421
IniDispatch::at_len
size_t at_len
Definition: confini.h:119
IniDispatch::d_len
size_t d_len
Definition: confini.h:117
-
load_ini_path
int load_ini_path(const char *const path, const IniFormat format, const IniStatsHandler f_init, const IniDispHandler f_foreach, void *const user_data)
Parses an INI file and dispatches its content to a custom callback using a path as argument.
Definition: confini.c:2890
-
ini_global_set_implicit_value
void ini_global_set_implicit_value(char *const implicit_value, const size_t implicit_v_len)
Sets the value to be to be assigned to implicit keys.
Definition: confini.c:4845
-
ini_get_bool
int ini_get_bool(const char *const ini_string, const int when_fail)
Checks whether a string matches one of the booleans listed in the private constant INI_BOOLEANS (case...
Definition: confini.c:4927
+
load_ini_path
int load_ini_path(const char *const path, const IniFormat format, const IniStatsHandler f_init, const IniDispHandler f_foreach, void *const user_data)
Parses an INI file and dispatches its content to a custom callback using a path as argument.
Definition: confini.c:2891
+
ini_global_set_implicit_value
void ini_global_set_implicit_value(char *const implicit_value, const size_t implicit_v_len)
Sets the value to be to be assigned to implicit keys.
Definition: confini.c:4848
+
ini_get_bool
int ini_get_bool(const char *const ini_string, const int when_fail)
Checks whether a string matches one of the booleans listed in the private constant INI_BOOLEANS (case...
Definition: confini.c:4930
INI_DEFAULT_FORMAT
static const IniFormat INI_DEFAULT_FORMAT
A model format for standard INI files.
Definition: confini.h:485
-
ini_array_foreach
int ini_array_foreach(const char *const ini_string, const char delimiter, const IniFormat format, const IniSubstrHandler f_foreach, void *const user_data)
Calls a custom function for each member of a stringified INI array, without modifying the content of ...
Definition: confini.c:4114
-
ini_array_release
char * ini_array_release(char **const ini_strptr, const char delimiter, const IniFormat format)
Replaces the first delimiter found (together with the spaces that surround it) with \0,...
Definition: confini.c:4624
+
ini_array_foreach
int ini_array_foreach(const char *const ini_string, const char delimiter, const IniFormat format, const IniSubstrHandler f_foreach, void *const user_data)
Calls a custom function for each member of a stringified INI array, without modifying the content of ...
Definition: confini.c:4115
+
ini_array_release
char * ini_array_release(char **const ini_strptr, const char delimiter, const IniFormat format)
Replaces the first delimiter found (together with the spaces that surround it) with \0,...
Definition: confini.c:4625
IniStatsHandler
int(* IniStatsHandler)(IniStatistics *statistics, void *user_data)
Callback function for handling an IniStatistics structure.
Definition: confini.h:133
INI_VALUE
@ INI_VALUE
Definition: confini.h:398
IniCommentMarker
IniCommentMarker
Possible values of IniFormat::semicolon_marker and IniFormat::hash_marker (i.e., meaning of /\s+;/ an...
Definition: confini.h:433
diff --git a/docs/html/libconfini.html b/docs/html/libconfini.html index 7ca8440..b4179bf 100644 --- a/docs/html/libconfini.html +++ b/docs/html/libconfini.html @@ -82,12 +82,10 @@

WHAT IS AN INI FILE?

place = Rome
[sender]
-
name = John Smith
email = john.smith@example.com
[receiver]
-
name = Mario Rossi # He's a big guy
email = mario.rossi@example.com

SUPPORTED SYNTAXES

@@ -1231,34 +1229,34 @@

COMMENT OR DISABLED ENTRY?

IniDispatch::v_len
size_t v_len
Definition: confini.h:118
IniDispatch::data
char * data
Definition: confini.h:114
IniFormat
24-bit bitfield representing the format of an INI file (INI dialect)
Definition: confini.h:95
-
ini_unquote
size_t ini_unquote(char *const ini_string, const IniFormat format)
Unescapes \', \", and \\ and removes all unescaped quotes (if single/double quotes are considered met...
Definition: confini.c:3662
+
ini_unquote
size_t ini_unquote(char *const ini_string, const IniFormat format)
Unescapes \', \", and \\ and removes all unescaped quotes (if single/double quotes are considered met...
Definition: confini.c:3663
IniFormat::multiline_nodes
unsigned char multiline_nodes
Definition: confini.h:95
-
ini_string_match_ii
bool ini_string_match_ii(const char *const ini_string_a, const char *const ini_string_b, const IniFormat format)
Compares two INI strings and checks whether they match.
Definition: confini.c:3233
+
ini_string_match_ii
bool ini_string_match_ii(const char *const ini_string_a, const char *const ini_string_b, const IniFormat format)
Compares two INI strings and checks whether they match.
Definition: confini.c:3234
INI_ABSOLUTE_AND_RELATIVE
@ INI_ABSOLUTE_AND_RELATIVE
Definition: confini.h:449
INI_ANY_SPACE
@ INI_ANY_SPACE
Definition: confini.h:418
-
ini_fton
IniFormatNum ini_fton(const IniFormat format)
Calculates the IniFormatNum of an IniFormat.
Definition: confini.c:4861
+
ini_fton
IniFormatNum ini_fton(const IniFormat format)
Calculates the IniFormatNum of an IniFormat.
Definition: confini.c:4864
IniStatistics
Global statistics about an INI file.
Definition: confini.h:101
CONFINI_FEINTR
@ CONFINI_FEINTR
Definition: confini.h:378
IniFormat::section_paths
unsigned char section_paths
Definition: confini.h:95
CONFINI_ENOMEM
@ CONFINI_ENOMEM
Definition: confini.h:381
INI_ABSOLUTE_ONLY
@ INI_ABSOLUTE_ONLY
Definition: confini.h:452
-
load_ini_file
int load_ini_file(FILE *const ini_file, const IniFormat format, const IniStatsHandler f_init, const IniDispHandler f_foreach, void *const user_data)
Parses an INI file and dispatches its content to a custom callback using a FILE structure as argument...
Definition: confini.c:2806
+
load_ini_file
int load_ini_file(FILE *const ini_file, const IniFormat format, const IniStatsHandler f_init, const IniDispHandler f_foreach, void *const user_data)
Parses an INI file and dispatches its content to a custom callback using a FILE structure as argument...
Definition: confini.c:2807
IniFormat::semicolon_marker
unsigned char semicolon_marker
Definition: confini.h:95
IniFormat::no_double_quotes
unsigned char no_double_quotes
Definition: confini.h:95
IniDispatch
Dispatch of a single INI node.
Definition: confini.h:111
INI_IGNORE
@ INI_IGNORE
Definition: confini.h:437
IniFormat::hash_marker
unsigned char hash_marker
Definition: confini.h:95
IniDispatch::dispatch_id
size_t dispatch_id
Definition: confini.h:120
-
INI_GLOBAL_IMPLICIT_V_LEN
size_t INI_GLOBAL_IMPLICIT_V_LEN
Length of the value assigned to implicit keys (default value: 0)
Definition: confini.c:5007
-
strip_ini_cache
int strip_ini_cache(register char *const ini_source, const size_t ini_length, const IniFormat format, const IniStatsHandler f_init, const IniDispHandler f_foreach, void *const user_data)
Parses and tokenizes a buffer containing an INI file, then dispatches its content to a custom callbac...
Definition: confini.c:2296
-
ini_string_parse
size_t ini_string_parse(char *const ini_string, const IniFormat format)
Unescapes \', \", and \\ and removes all unescaped quotes (if single/double quotes are considered met...
Definition: confini.c:3800
+
INI_GLOBAL_IMPLICIT_V_LEN
size_t INI_GLOBAL_IMPLICIT_V_LEN
Length of the value assigned to implicit keys (default value: 0)
Definition: confini.c:5010
+
strip_ini_cache
int strip_ini_cache(register char *const ini_source, const size_t ini_length, const IniFormat format, const IniStatsHandler f_init, const IniDispHandler f_foreach, void *const user_data)
Parses and tokenizes a buffer containing an INI file, then dispatches its content to a custom callbac...
Definition: confini.c:2297
+
ini_string_parse
size_t ini_string_parse(char *const ini_string, const IniFormat format)
Unescapes \', \", and \\ and removes all unescaped quotes (if single/double quotes are considered met...
Definition: confini.c:3801
IniDispatch::value
char * value
Definition: confini.h:115
INI_DISABLED_OR_COMMENT
@ INI_DISABLED_OR_COMMENT
Definition: confini.h:434
CONFINI_ERROR
#define CONFINI_ERROR
Error mask (flags not present in user-generated interruptions)
Definition: confini.h:367
IniFormat::case_sensitive
unsigned char case_sensitive
Definition: confini.h:95
-
ini_array_match
bool ini_array_match(const char *const ini_string_a, const char *const ini_string_b, const char delimiter, const IniFormat format)
Compares two INI arrays and checks whether they match.
Definition: confini.c:3427
+
ini_array_match
bool ini_array_match(const char *const ini_string_a, const char *const ini_string_b, const char delimiter, const IniFormat format)
Compares two INI arrays and checks whether they match.
Definition: confini.c:3428
IniFormat::no_spaces_in_names
unsigned char no_spaces_in_names
Definition: confini.h:95
-
ini_string_match_si
bool ini_string_match_si(const char *const simple_string, const char *const ini_string, const IniFormat format)
Compares a simple string and an INI string and and checks whether they match.
Definition: confini.c:3065
+
ini_string_match_si
bool ini_string_match_si(const char *const simple_string, const char *const ini_string, const IniFormat format)
Compares a simple string and an INI string and and checks whether they match.
Definition: confini.c:3066
IniFormat::implicit_is_not_empty
unsigned char implicit_is_not_empty
Definition: confini.h:95
IniDispatch::append_to
const char * append_to
Definition: confini.h:116
confini.h
libconfini header
@@ -1270,20 +1268,20 @@

COMMENT OR DISABLED ENTRY?

INI_ONLY_COMMENT
@ INI_ONLY_COMMENT
Definition: confini.h:436
IniFormat::disabled_can_be_implicit
unsigned char disabled_can_be_implicit
Definition: confini.h:95
INI_UNIXLIKE_FORMAT
static const IniFormat INI_UNIXLIKE_FORMAT
A model format for Unix-like .conf files (where space characters are delimiters between keys and valu...
Definition: confini.h:493
-
INI_GLOBAL_LOWERCASE_MODE
bool INI_GLOBAL_LOWERCASE_MODE
If set to true, key and section names in case-insensitive INI formats will be dispatched lowercase,...
Definition: confini.c:5003
+
INI_GLOBAL_LOWERCASE_MODE
bool INI_GLOBAL_LOWERCASE_MODE
If set to true, key and section names in case-insensitive INI formats will be dispatched lowercase,...
Definition: confini.c:5006
IniFormat::delimiter_symbol
unsigned char delimiter_symbol
Definition: confini.h:95
INI_KEY
@ INI_KEY
Definition: confini.h:402
-
ini_ntof
IniFormat ini_ntof(const IniFormatNum format_id)
Constructs a new IniFormat according to an IniFormatNum.
Definition: confini.c:4882
+
ini_ntof
IniFormat ini_ntof(const IniFormatNum format_id)
Constructs a new IniFormat according to an IniFormatNum.
Definition: confini.c:4885
IniStatistics::bytes
const size_t bytes
Definition: confini.h:103
IniDispatch::type
uint8_t type
Definition: confini.h:113
INI_DISABLED_KEY
@ INI_DISABLED_KEY
Definition: confini.h:407
-
INI_GLOBAL_IMPLICIT_VALUE
char * INI_GLOBAL_IMPLICIT_VALUE
Value to be assigned to implicit keys (default value: NULL)
Definition: confini.c:5005
+
INI_GLOBAL_IMPLICIT_VALUE
char * INI_GLOBAL_IMPLICIT_VALUE
Value to be assigned to implicit keys (default value: NULL)
Definition: confini.c:5008
INI_EQUALS
@ INI_EQUALS
Definition: confini.h:421
IniDispatch::d_len
size_t d_len
Definition: confini.h:117
-
load_ini_path
int load_ini_path(const char *const path, const IniFormat format, const IniStatsHandler f_init, const IniDispHandler f_foreach, void *const user_data)
Parses an INI file and dispatches its content to a custom callback using a path as argument.
Definition: confini.c:2890
+
load_ini_path
int load_ini_path(const char *const path, const IniFormat format, const IniStatsHandler f_init, const IniDispHandler f_foreach, void *const user_data)
Parses an INI file and dispatches its content to a custom callback using a path as argument.
Definition: confini.c:2891
IniFormat::no_single_quotes
unsigned char no_single_quotes
Definition: confini.h:95
-
ini_global_set_implicit_value
void ini_global_set_implicit_value(char *const implicit_value, const size_t implicit_v_len)
Sets the value to be to be assigned to implicit keys.
Definition: confini.c:4845
-
ini_get_bool
int ini_get_bool(const char *const ini_string, const int when_fail)
Checks whether a string matches one of the booleans listed in the private constant INI_BOOLEANS (case...
Definition: confini.c:4927
+
ini_global_set_implicit_value
void ini_global_set_implicit_value(char *const implicit_value, const size_t implicit_v_len)
Sets the value to be to be assigned to implicit keys.
Definition: confini.c:4848
+
ini_get_bool
int ini_get_bool(const char *const ini_string, const int when_fail)
Checks whether a string matches one of the booleans listed in the private constant INI_BOOLEANS (case...
Definition: confini.c:4930
INI_DEFAULT_FORMAT
static const IniFormat INI_DEFAULT_FORMAT
A model format for standard INI files.
Definition: confini.h:485
IniStatsHandler
int(* IniStatsHandler)(IniStatistics *statistics, void *user_data)
Callback function for handling an IniStatistics structure.
Definition: confini.h:133
IniFormat::do_not_collapse_values
unsigned char do_not_collapse_values
Definition: confini.h:95
diff --git a/docs/html/readme.html b/docs/html/readme.html index 440f669..46da031 100644 --- a/docs/html/readme.html +++ b/docs/html/readme.html @@ -150,8 +150,10 @@

Installation

If the strip utility is not available on your machine, use make install instead (it will produce larger binaries)

For a minimum installation without development files (i.e. static libraries, headers, documentation, examples, etc.) use ./configure --disable-devel.

If the configure script is missing from your package you need to generate it by running the bootstrap script. By default, bootstrap will also run the configure script immediately after having generated it, so you may type the make command directly after bootstrap. To list different options use ./bootstrap --help.

-

If you are using Microsoft Windows, a batch script for compiling libconfini with MinGW without Bash is available (mgwmake.bat). If you are interested in using Autotools for compiling libconfini under Microsoft Windows, you can integrate MinGW with MSYS, or you can directly use MSYS2. Alternatively, an unofficial port of libconfini for Cygwin is available.

+

If you are using Microsoft Windows, a batch script for compiling libconfini with MinGW without Bash is available (mgwmake.bat). If you are interested in using Autotools for compiling libconfini under Microsoft Windows, you can integrate MinGW with MSYS, or you can directly use MSYS2 and its official port of the library. Alternatively, an unofficial port of libconfini for Cygwin is available.

For further information, see INSTALL.

+

Bindings

+

Danilo Spinella maintains a D binding package of libconfini.

Free software

This library is free software. You can redistribute it and/or modify it under the terms of the GPL license version 3 or any later version. See COPYING for details.

@@ -161,7 +163,7 @@

Free software

confini.h
libconfini header
INI_KEY
@ INI_KEY
Definition: confini.h:402
IniDispatch::type
uint8_t type
Definition: confini.h:113
-
load_ini_path
int load_ini_path(const char *const path, const IniFormat format, const IniStatsHandler f_init, const IniDispHandler f_foreach, void *const user_data)
Parses an INI file and dispatches its content to a custom callback using a path as argument.
Definition: confini.c:2890
+
load_ini_path
int load_ini_path(const char *const path, const IniFormat format, const IniStatsHandler f_init, const IniDispHandler f_foreach, void *const user_data)
Parses an INI file and dispatches its content to a custom callback using a path as argument.
Definition: confini.c:2891
INI_DEFAULT_FORMAT
static const IniFormat INI_DEFAULT_FORMAT
A model format for standard INI files.
Definition: confini.h:485
diff --git a/docs/man/man3/IniDispatch.3 b/docs/man/man3/IniDispatch.3 index 73090d4..1a30ecf 100644 --- a/docs/man/man3/IniDispatch.3 +++ b/docs/man/man3/IniDispatch.3 @@ -1,4 +1,4 @@ -.TH "IniDispatch" 3 "Sun Mar 1 2020" "libconfini" \" -*- nroff -*- +.TH "IniDispatch" 3 "Mon May 11 2020" "libconfini" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/docs/man/man3/IniFormat.3 b/docs/man/man3/IniFormat.3 index d43e64d..3d88196 100644 --- a/docs/man/man3/IniFormat.3 +++ b/docs/man/man3/IniFormat.3 @@ -1,4 +1,4 @@ -.TH "IniFormat" 3 "Sun Mar 1 2020" "libconfini" \" -*- nroff -*- +.TH "IniFormat" 3 "Mon May 11 2020" "libconfini" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/docs/man/man3/IniStatistics.3 b/docs/man/man3/IniStatistics.3 index 3569c86..5b259ce 100644 --- a/docs/man/man3/IniStatistics.3 +++ b/docs/man/man3/IniStatistics.3 @@ -1,4 +1,4 @@ -.TH "IniStatistics" 3 "Sun Mar 1 2020" "libconfini" \" -*- nroff -*- +.TH "IniStatistics" 3 "Mon May 11 2020" "libconfini" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/docs/man/man3/confini.h.3 b/docs/man/man3/confini.h.3 index d8dfa1b..102198d 100644 --- a/docs/man/man3/confini.h.3 +++ b/docs/man/man3/confini.h.3 @@ -1,4 +1,4 @@ -.TH "confini.h" 3 "Sun Mar 1 2020" "libconfini" \" -*- nroff -*- +.TH "confini.h" 3 "Mon May 11 2020" "libconfini" \" -*- nroff -*- .ad l .nh .SH NAME @@ -256,7 +256,7 @@ GNU General Public License, version 3 or any later version .PP \fBVersion\fP .RS 4 -1\&.14\&.0 +1\&.14\&.1 .RE .PP \fBDate\fP @@ -1413,9 +1413,9 @@ Sets the value to be to be assigned to implicit keys\&. .PP \fBParameters\fP .RS 4 -\fIimplicit_value\fP The string to be used as implicit value (usually \fC'YES'\fP, or \fC'TRUE'\fP) +\fIimplicit_value\fP The string to be used as implicit value (usually \fC'YES'\fP, \fC'TRUE'\fP, or \fC'ON'\fP, or any other string; it can be \fCNULL\fP) .br -\fIimplicit_v_len\fP The length of \fCimplicit_value\fP (usually \fC0\fP, independently of its real length) +\fIimplicit_v_len\fP The length of \fCimplicit_value\fP (without counting the NUL terminator; use \fC0\fP for both an empty string and \fCNULL\fP) .RE .PP \fBReturns\fP diff --git a/docs/man/man3/libconfini.3 b/docs/man/man3/libconfini.3 index 93944fc..e608635 100644 --- a/docs/man/man3/libconfini.3 +++ b/docs/man/man3/libconfini.3 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "LIBCONFINI" "3" "March 2020" "Stefano Gioffré" "Library Functions Manual" +.TH "LIBCONFINI" "3" "May 2020" "Stefano Gioffré" "Library Functions Manual" . .SH "NAME" \fBlibconfini\fR @@ -30,12 +30,10 @@ location = Colosseum place = Rome [sender] - name = John Smith email = john\.smith@example\.com [receiver] - name = Mario Rossi # He\'s a big guy email = mario\.rossi@example\.com . diff --git a/docs/manual.html b/docs/manual.html index f8eb7a8..af3ad57 100644 --- a/docs/manual.html +++ b/docs/manual.html @@ -111,12 +111,10 @@

WHAT IS AN INI FILE?

place = Rome [sender] - name = John Smith email = john.smith@example.com [receiver] - name = Mario Rossi # He's a big guy email = mario.rossi@example.com @@ -1977,7 +1975,7 @@

COMMENT OR DISABLED ENTRY?

  1. Stefano Gioffré
    2. -
  2. March 2020
    3. +
  3. May 2020
  4. libconfini(3)
diff --git a/examples/ini_files/delivery.conf b/examples/ini_files/delivery.conf index 5f07557..7d4fe92 100644 --- a/examples/ini_files/delivery.conf +++ b/examples/ini_files/delivery.conf @@ -6,11 +6,9 @@ location = Colosseum place = Rome [sender] - name = John Smith email = john.smith@example.com [receiver] - name = Mario Rossi # He's a big guy email = mario.rossi@example.com diff --git a/package.json b/package.json index f5990af..7877358 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "libconfini", - "version": "1.14.0", + "version": "1.14.1", "description": "Yet another INI parser", "homepage": "https://madmurphy.github.io/libconfini", "author": "madmurphy333@gmail.com", diff --git a/src/confini.c b/src/confini.c index 63ca3c7..2026659 100644 --- a/src/confini.c +++ b/src/confini.c @@ -7,7 +7,7 @@ @brief libconfini functions @author Stefano Gioffré @copyright GNU General Public License, version 3 or any later version - @version 1.14.0 + @version 1.14.1 @date 2016-2020 @see https://madmurphy.github.io/libconfini @@ -445,8 +445,9 @@ /* - Maybe in the future there will be support for UTF-8 casefold (although probably - not -- see "Code considerations" in the Manual), but for now only ASCII... + Maybe in the future there will be support for UTF-8 case folding (although + probably not -- see "Code considerations" in the Manual), but for now only + ASCII... */ #define _LIBCONFINI_CHR_CASEFOLD_(CHR) (CHR > 0x40 && CHR < 0x5b ? CHR | 0x60 : CHR) @@ -4829,9 +4830,11 @@ void ini_global_set_lowercase_mode (const bool lowercase) { @brief Sets the value to be to be assigned to implicit keys @param implicit_value The string to be used as implicit value - (usually `"YES"`, or `"TRUE"`) - @param implicit_v_len The length of @p implicit_value (usually - `0`, independently of its real length) + (usually `"YES"`, `"TRUE"`, or `"ON"`, or + any other string; it can be `NULL`) + @param implicit_v_len The length of @p implicit_value (without + counting the NUL terminator; use `0` for + both an empty string and `NULL`) @return Nothing @warning This function changes the value of one or more global variables. In diff --git a/src/confini.h b/src/confini.h index c4c0068..3475f7c 100644 --- a/src/confini.h +++ b/src/confini.h @@ -6,7 +6,7 @@ @brief libconfini header @author Stefano Gioffré @copyright GNU General Public License, version 3 or any later version - @version 1.14.0 + @version 1.14.1 @date 2016-2020 @see https://madmurphy.github.io/libconfini diff --git a/src/winres.rc b/src/winres.rc index 99e37e2..f8bd303 100644 --- a/src/winres.rc +++ b/src/winres.rc @@ -6,8 +6,8 @@ /* Windows DLL version information */ VS_VERSION_INFO VERSIONINFO -FILEVERSION 1,14,0,0 -PRODUCTVERSION 1,14,0,0 +FILEVERSION 1,14,1,0 +PRODUCTVERSION 1,14,1,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG | VS_FF_PRERELEASE @@ -24,12 +24,12 @@ BEGIN BEGIN VALUE "CompanyName", "Stefano Gioffré" VALUE "FileDescription", "Yet another INI parser" - VALUE "FileVersion", "1.14.0" + VALUE "FileVersion", "1.14.1" VALUE "InternalName", "libconfini" VALUE "LegalCopyright", "GNU General Public License, version 3 or any later version" VALUE "OriginalFilename", "libconfini.dll" VALUE "ProductName", "libconfini" - VALUE "ProductVersion", "1.14.0" + VALUE "ProductVersion", "1.14.1" VALUE "Comments", "https://madmurphy.github.io/libconfini" END END