diff options
Diffstat (limited to 'p11-kit/conf.h')
| -rw-r--r-- | p11-kit/conf.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/p11-kit/conf.h b/p11-kit/conf.h index 0627f14..b70666d 100644 --- a/p11-kit/conf.h +++ b/p11-kit/conf.h @@ -36,7 +36,7 @@ #ifndef __CONF_H__ #define __CONF_H__ -#include "hashmap.h" +#include "dict.h" enum { CONF_IGNORE_MISSING = 0x01, @@ -50,19 +50,21 @@ enum { CONF_USER_ONLY }; -int _p11_conf_merge_defaults (hashmap *config, - hashmap *defaults); +int _p11_conf_merge_defaults (p11_dict *config, + p11_dict *defaults); /* Returns a hash of char *key -> char *value */ -hashmap * _p11_conf_parse_file (const char *filename, +p11_dict * _p11_conf_parse_file (const char *filename, int flags); /* Returns a hash of char *key -> char *value */ -hashmap * _p11_conf_load_globals (const char *system_conf, const char *user_conf, +p11_dict * _p11_conf_load_globals (const char *system_conf, + const char *user_conf, int *user_mode); /* Returns a hash of char* name -> hash_t *config */ -hashmap * _p11_conf_load_modules (int user_mode, const char *system_dir, +p11_dict * _p11_conf_load_modules (int user_mode, + const char *system_dir, const char *user_dir); int _p11_conf_parse_boolean (const char *string, |