diff options
| author | Dmitri Pal <dpal@redhat.com> | 2009-12-10 17:44:23 -0500 |
|---|---|---|
| committer | Stephen Gallagher <sgallagh@redhat.com> | 2009-12-10 18:12:54 -0500 |
| commit | 4db60f9d2aaa7ab949151b0b991dfdfe5bd3a146 (patch) | |
| tree | 8713807b8983e69c3ee58f6f2ae2b2d1bcef800e | |
| parent | 150431bbb08bfac7ec0bd751a405b91f79646640 (diff) | |
| download | ding-libs-4db60f9d2aaa7ab949151b0b991dfdfe5bd3a146.tar.gz ding-libs-4db60f9d2aaa7ab949151b0b991dfdfe5bd3a146.tar.xz ding-libs-4db60f9d2aaa7ab949151b0b991dfdfe5bd3a146.zip | |
INI Correcting build warnings.
The previous patch included "config.h"
into the public header which caused all sorts
of redefinitions and warnings.
| -rw-r--r-- | ini/ini_config.c | 9 | ||||
| -rw-r--r-- | ini/ini_config.h | 6 |
2 files changed, 7 insertions, 8 deletions
diff --git a/ini/ini_config.c b/ini/ini_config.c index 6766dfa..17cb53b 100644 --- a/ini/ini_config.c +++ b/ini/ini_config.c @@ -76,6 +76,11 @@ #define INI_ERROR "errors" #define INI_ERROR_NAME "errname" + +/* Internal sizes. MAX_KEY is defined in config.h */ +#define MAX_VALUE PATH_MAX +#define BUFFER_SIZE MAX_KEY + MAX_VALUE + 3 + /* Internally used functions */ static int config_with_lines(const char *application, FILE *config_file, @@ -111,7 +116,7 @@ const char *parsing_error_str(int parsing_error) } /* Function to return grammar error. - * This functions is currently not used. + * This function is currently not used. * It is planned to be used by the INI * file grammar parser. */ @@ -136,7 +141,7 @@ const char *grammar_error_str(int grammar_error) } /* Function to return validation error. - * This functions is currently not used. + * This function is currently not used. * It is planned to be used by the INI * file grammar validator. */ diff --git a/ini/ini_config.h b/ini/ini_config.h index f7e0415..12d4a80 100644 --- a/ini/ini_config.h +++ b/ini/ini_config.h @@ -26,7 +26,6 @@ #include <limits.h> #include <stdio.h> #include "collection.h" -#include "config.h" /* Name of the default (missing section in the INI file */ #define INI_DEFAULT_SECTION "default" @@ -68,11 +67,6 @@ #define ERR_MAXVALID 0 - -/* Internal sizes. MAX_KEY is defined in config.h */ -#define MAX_VALUE PATH_MAX -#define BUFFER_SIZE MAX_KEY + MAX_VALUE + 3 - struct parse_error { unsigned line; int error; |