summaryrefslogtreecommitdiff
path: root/src/attr.h
diff options
context:
space:
mode:
authorRussell Belfer <rb@github.com>2012-04-25 15:20:28 -0700
committerRussell Belfer <rb@github.com>2012-04-25 15:20:28 -0700
commitc2b670436f4cc8901811ae0348f3c56150d1ccd5 (patch)
tree31fdce14700ca5fa9c223521ab842f3127c0c452 /src/attr.h
parent01fed0a8f9b80e80c8f76cde29fc0d66cb77fff7 (diff)
downloadlibgit2-c2b670436f4cc8901811ae0348f3c56150d1ccd5.tar.gz
Rename git_khash_str to git_strmap, etc.
This renamed `git_khash_str` to `git_strmap`, `git_hash_oid` to `git_oidmap`, and deletes `git_hashtable` from the tree, plus adds unit tests for `git_strmap`.
Diffstat (limited to 'src/attr.h')
-rw-r--r--src/attr.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/attr.h b/src/attr.h
index 75e98607f..43caf1b81 100644
--- a/src/attr.h
+++ b/src/attr.h
@@ -8,7 +8,7 @@
#define INCLUDE_attr_h__
#include "attr_file.h"
-#include "khash_str.h"
+#include "strmap.h"
#define GIT_ATTR_CONFIG "core.attributesfile"
#define GIT_IGNORE_CONFIG "core.excludesfile"
@@ -16,8 +16,8 @@
typedef struct {
int initialized;
git_pool pool;
- git_khash_str *files; /* hash path to git_attr_file of rules */
- git_khash_str *macros; /* hash name to vector<git_attr_assignment> */
+ git_strmap *files; /* hash path to git_attr_file of rules */
+ git_strmap *macros; /* hash name to vector<git_attr_assignment> */
const char *cfg_attr_file; /* cached value of core.attributesfile */
const char *cfg_excl_file; /* cached value of core.excludesfile */
} git_attr_cache;