diff options
| author | Stef Walter <stefw@collabora.co.uk> | 2011-07-27 11:24:55 +0200 |
|---|---|---|
| committer | Stef Walter <stefw@collabora.co.uk> | 2011-07-27 11:24:55 +0200 |
| commit | 308a776372eb1560480fbfcb5ef9d918a7a1454f (patch) | |
| tree | 97f650f4a829c16ef6146ac95c80a37edf6eca60 /p11-kit/conf.h | |
| parent | 3bb86b72ca5882b1e5684db837c75df810f283c3 (diff) | |
| download | p11-kit-308a776372eb1560480fbfcb5ef9d918a7a1454f.tar.gz | |
Reimplement and remove apache licensed bits of code.
* Reimplement the various bits of the hash table that were
still based on the apache apr code. Use different algorithms
for hashing, lookup and other stuff.
* Use this as an opportunity to cleanup that code and make
it more legible.
https://bugzilla.redhat.com/show_bug.cgi?id=725905
Diffstat (limited to 'p11-kit/conf.h')
| -rw-r--r-- | p11-kit/conf.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/p11-kit/conf.h b/p11-kit/conf.h index dc48210..dccaebf 100644 --- a/p11-kit/conf.h +++ b/p11-kit/conf.h @@ -36,7 +36,7 @@ #ifndef __CONF_H__ #define __CONF_H__ -#include "hash.h" +#include "hashmap.h" enum { CONF_IGNORE_MISSING = 0x01, @@ -51,19 +51,19 @@ enum { typedef void (*conf_error_func) (const char *message); -int _p11_conf_merge_defaults (hash_t *config, - hash_t *defaults); +int _p11_conf_merge_defaults (hashmap *config, + hashmap *defaults); /* Returns a hash of char *key -> char *value */ -hash_t* _p11_conf_parse_file (const char *filename, +hashmap * _p11_conf_parse_file (const char *filename, int flags); /* Returns a hash of char *key -> char *value */ -hash_t* _p11_conf_load_globals (const char *system_conf, const char *user_conf, +hashmap * _p11_conf_load_globals (const char *system_conf, const char *user_conf, int *user_mode); /* Returns a hash of char* name -> hash_t *config */ -hash_t* _p11_conf_load_modules (int user_mode, const char *system_dir, +hashmap * _p11_conf_load_modules (int user_mode, const char *system_dir, const char *user_dir); #endif /* __CONF_H__ */ |