diff options
| author | Vladimir Levijev <vladimir.levijev@zabbix.com> | 2011-05-24 17:11:16 +0400 |
|---|---|---|
| committer | Vladimir Levijev <vladimir.levijev@zabbix.com> | 2011-05-24 17:11:16 +0400 |
| commit | 762b30cfeb6f3257cc5deb28925557ae20415492 (patch) | |
| tree | cd633ff0b19af19b7ecf3919e89c547822da93f4 /include/cfg.h | |
| parent | 126d7cd39e276e69d7814becd63f900f43b29a06 (diff) | |
- [ZBX-3105] Fix conflicts when merging to trunk.
- [svn merge svn://svn.zabbix.com/branches/1.8 -r19812:19814]
Diffstat (limited to 'include/cfg.h')
| -rw-r--r-- | include/cfg.h | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/include/cfg.h b/include/cfg.h index 737b42343cb..e24e2e9ef31 100644 --- a/include/cfg.h +++ b/include/cfg.h @@ -20,12 +20,20 @@ #ifndef ZABBIX_CFG_H #define ZABBIX_CFG_H -#define TYPE_INT 0 -#define TYPE_STRING 1 +#define TYPE_INT 0 +#define TYPE_STRING 1 +#define TYPE_MULTISTRING 2 #define PARM_OPT 0 #define PARM_MAND 1 +/* config file parsing options */ +#define ZBX_CFG_FILE_REQUIRED 0 +#define ZBX_CFG_FILE_OPTIONAL 1 + +#define ZBX_CFG_NOT_STRICT 0 +#define ZBX_CFG_STRICT 1 + extern int CONFIG_ZABBIX_FORKS; /* contains the number of listeners for processing passive checks */ extern char *CONFIG_FILE; extern char *CONFIG_LOG_FILE; @@ -36,14 +44,12 @@ struct cfg_line { char *parameter; void *variable; - int (*function)(); int type; int mandatory; int min; int max; }; -int parse_cfg_file(const char *cfg_file, struct cfg_line *cfg); -int parse_opt_cfg_file(const char *cfg_file, struct cfg_line *cfg); +int parse_cfg_file(const char *cfg_file, struct cfg_line *cfg, int optional, int strict); #endif |