Merge pull request #4992 from pks-t/pks/cache-dispose

pks-t · web-flow · commit 3aa8401a8fd8 · 2019-02-21T14:10:43.000+01:00
cache: fix misnaming of `git_cache_free`
diff --git a/src/cache.c b/src/cache.c
@@ -101,7 +101,7 @@ void git_cache_clear(git_cache *cache)
 	git_rwlock_wrunlock(&cache->lock);
 }
 
-void git_cache_free(git_cache *cache)
+void git_cache_dispose(git_cache *cache)
 {
 	git_cache_clear(cache);
 	git_oidmap_free(cache->map);
diff --git a/src/cache.h b/src/cache.h
@@ -43,7 +43,7 @@ extern git_atomic_ssize git_cache__current_storage;
 int git_cache_set_max_object_size(git_object_t type, size_t size);
 
 int git_cache_init(git_cache *cache);
-void git_cache_free(git_cache *cache);
+void git_cache_dispose(git_cache *cache);
 void git_cache_clear(git_cache *cache);
 
 void *git_cache_store_raw(git_cache *cache, git_odb_object *entry);
diff --git a/src/odb.c b/src/odb.c
@@ -448,7 +448,7 @@ int git_odb_new(git_odb **out)
 		return -1;
 	}
 	if (git_vector_init(&db->backends, 4, backend_sort_cmp) < 0) {
-		git_cache_free(&db->own_cache);
+		git_cache_dispose(&db->own_cache);
 		git__free(db);
 		return -1;
 	}
@@ -686,7 +686,7 @@ static void odb_free(git_odb *db)
 	}
 
 	git_vector_free(&db->backends);
-	git_cache_free(&db->own_cache);
+	git_cache_dispose(&db->own_cache);
 
 	git__memzero(db, sizeof(*db));
 	git__free(db);
diff --git a/src/repository.c b/src/repository.c
@@ -160,7 +160,7 @@ void git_repository_free(git_repository *repo)
 
 	git_repository__cleanup(repo);
 
-	git_cache_free(&repo->objects);
+	git_cache_dispose(&repo->objects);
 
 	git_diff_driver_registry_free(repo->diff_drivers);
 	repo->diff_drivers = NULL;
@@ -245,7 +245,7 @@ static git_repository *repository_alloc(void)
 
 on_error:
 	if (repo)
-		git_cache_free(&repo->objects);
+		git_cache_dispose(&repo->objects);
 
 	git__free(repo);
 	return NULL;

Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ void git_cache_clear(git_cache *cache)`
`101`	`101`	`git_rwlock_wrunlock(&cache->lock);`
`102`	`102`	`}`
`103`	`103`
`104`		`-void git_cache_free(git_cache *cache)`
	`104`	`+void git_cache_dispose(git_cache *cache)`
`105`	`105`	`{`
`106`	`106`	`git_cache_clear(cache);`
`107`	`107`	`git_oidmap_free(cache->map);`
Original file line number	Diff line number	Diff line change
`@@ -448,7 +448,7 @@ int git_odb_new(git_odb **out)`
`448`	`448`	`return -1;`
`449`	`449`	`}`
`450`	`450`	`if (git_vector_init(&db->backends, 4, backend_sort_cmp) < 0) {`
`451`		`- git_cache_free(&db->own_cache);`
	`451`	`+ git_cache_dispose(&db->own_cache);`
`452`	`452`	`git__free(db);`
`453`	`453`	`return -1;`
`454`	`454`	`}`
`@@ -686,7 +686,7 @@ static void odb_free(git_odb *db)`
`686`	`686`	`}`
`687`	`687`
`688`	`688`	`git_vector_free(&db->backends);`
`689`		`- git_cache_free(&db->own_cache);`
	`689`	`+ git_cache_dispose(&db->own_cache);`
`690`	`690`
`691`	`691`	`git__memzero(db, sizeof(*db));`
`692`	`692`	`git__free(db);`