summaryrefslogtreecommitdiff
path: root/src/sortedcache.c
diff options
context:
space:
mode:
authorRussell Belfer <rb@github.com>2013-08-22 15:44:34 -0700
committerRussell Belfer <rb@github.com>2013-08-22 15:44:34 -0700
commit805755f49b0db5bc884f8929621ac61238b2c30e (patch)
treea739f9ff6b390d66fcc68d9e22e545ee6e20f276 /src/sortedcache.c
parentb6ac07b51771641f3ae994c17f361fbd8bec36ef (diff)
downloadlibgit2-805755f49b0db5bc884f8929621ac61238b2c30e.tar.gz
Fix sortedcache docs and other feedback
This converts an internal lock from a write lock to a read lock where write isn't needed, and also clarifies some doc things about where various locks are acquired and how various APIs are intended to be used.
Diffstat (limited to 'src/sortedcache.c')
-rw-r--r--src/sortedcache.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/sortedcache.c b/src/sortedcache.c
index 33171c48d..466e55dbe 100644
--- a/src/sortedcache.c
+++ b/src/sortedcache.c
@@ -110,7 +110,7 @@ static int sortedcache_copy_item(void *payload, void *tgt_item, void *src_item)
int git_sortedcache_copy(
git_sortedcache **out,
git_sortedcache *src,
- bool wlock,
+ bool lock,
int (*copy_item)(void *payload, void *tgt_item, void *src_item),
void *payload)
{
@@ -131,7 +131,7 @@ int git_sortedcache_copy(
src->items._cmp, src->path)) < 0)
return error;
- if (wlock && git_sortedcache_wlock(src) < 0) {
+ if (lock && git_sortedcache_rlock(src) < 0) {
git_sortedcache_free(tgt);
return -1;
}
@@ -144,8 +144,8 @@ int git_sortedcache_copy(
break;
}
- if (wlock)
- git_sortedcache_wunlock(src);
+ if (lock)
+ git_sortedcache_runlock(src);
if (error)
git_sortedcache_free(tgt);