summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorVicent Marti <tanoku@gmail.com>2011-11-26 04:59:21 +0100
committerVicent Marti <tanoku@gmail.com>2011-11-26 08:48:00 +0100
commit45e79e37012ffec58c754000c23077ecac2da753 (patch)
tree809092609a4ca641ada8990c9008c7fb96c9cc07 /src
parent9462c471435b4de74848408bebe41d770dc49a50 (diff)
downloadlibgit2-45e79e37012ffec58c754000c23077ecac2da753.tar.gz
Rename all `_close` methods
There's no difference between `_free` and `_close` semantics: keep everything with the same name to avoid confusions.
Diffstat (limited to 'src')
-rw-r--r--src/blob.c2
-rw-r--r--src/object.c8
-rw-r--r--src/odb.c8
-rw-r--r--src/refs.c2
-rw-r--r--src/revwalk.c4
-rw-r--r--src/status.c10
-rw-r--r--src/tag.c2
-rw-r--r--src/transports/local.c2
-rw-r--r--src/tree.c4
9 files changed, 21 insertions, 21 deletions
diff --git a/src/blob.c b/src/blob.c
index 5fd0fd67e..87f5686af 100644
--- a/src/blob.c
+++ b/src/blob.c
@@ -26,7 +26,7 @@ size_t git_blob_rawsize(git_blob *blob)
void git_blob__free(git_blob *blob)
{
- git_odb_object_close(blob->odb_object);
+ git_odb_object_free(blob->odb_object);
git__free(blob);
}
diff --git a/src/object.c b/src/object.c
index 12947f035..95c7cf9d2 100644
--- a/src/object.c
+++ b/src/object.c
@@ -109,7 +109,7 @@ int git_object_lookup_prefix(
object = git_cache_get(&repo->objects, id);
if (object != NULL) {
if (type != GIT_OBJ_ANY && type != object->type) {
- git_object_close(object);
+ git_object_free(object);
return git__throw(GIT_EINVALIDTYPE,
"Failed to lookup object. "
"The given type does not match the type on the ODB");
@@ -151,7 +151,7 @@ int git_object_lookup_prefix(
return git__rethrow(error, "Failed to lookup object");
if (type != GIT_OBJ_ANY && type != odb_obj->raw.type) {
- git_odb_object_close(odb_obj);
+ git_odb_object_free(odb_obj);
return git__throw(GIT_EINVALIDTYPE, "Failed to lookup object. The given type does not match the type on the ODB");
}
@@ -185,7 +185,7 @@ int git_object_lookup_prefix(
break;
}
- git_odb_object_close(odb_obj);
+ git_odb_object_free(odb_obj);
if (error < GIT_SUCCESS) {
git_object__free(object);
@@ -229,7 +229,7 @@ void git_object__free(void *_obj)
}
}
-void git_object_close(git_object *object)
+void git_object_free(git_object *object)
{
if (object == NULL)
return;
diff --git a/src/odb.c b/src/odb.c
index 9b72e7fd3..d31f93f73 100644
--- a/src/odb.c
+++ b/src/odb.c
@@ -108,7 +108,7 @@ git_otype git_odb_object_type(git_odb_object *object)
return object->raw.type;
}
-void git_odb_object_close(git_odb_object *object)
+void git_odb_object_free(git_odb_object *object)
{
git_cached_obj_decref((git_cached_obj *)object, &free_odb_object);
}
@@ -446,7 +446,7 @@ int git_odb_exists(git_odb *db, const git_oid *id)
assert(db && id);
if ((object = git_cache_get(&db->cache, id)) != NULL) {
- git_odb_object_close(object);
+ git_odb_object_free(object);
return 1;
}
@@ -472,7 +472,7 @@ int git_odb_read_header(size_t *len_p, git_otype *type_p, git_odb *db, const git
if ((object = git_cache_get(&db->cache, id)) != NULL) {
*len_p = object->raw.len;
*type_p = object->raw.type;
- git_odb_object_close(object);
+ git_odb_object_free(object);
return GIT_SUCCESS;
}
@@ -497,7 +497,7 @@ int git_odb_read_header(size_t *len_p, git_otype *type_p, git_odb *db, const git
*len_p = object->raw.len;
*type_p = object->raw.type;
- git_odb_object_close(object);
+ git_odb_object_free(object);
}
return GIT_SUCCESS;
diff --git a/src/refs.c b/src/refs.c
index 4c45fec2c..8931d5bac 100644
--- a/src/refs.c
+++ b/src/refs.c
@@ -686,7 +686,7 @@ static int packed_find_peel(git_repository *repo, struct packref *ref)
*/
}
- git_object_close(object);
+ git_object_free(object);
return GIT_SUCCESS;
}
diff --git a/src/revwalk.c b/src/revwalk.c
index 64775649c..d632a19b8 100644
--- a/src/revwalk.c
+++ b/src/revwalk.c
@@ -230,12 +230,12 @@ static int commit_parse(git_revwalk *walk, commit_object *commit)
return git__rethrow(error, "Failed to parse commit. Can't read object");
if (obj->raw.type != GIT_OBJ_COMMIT) {
- git_odb_object_close(obj);
+ git_odb_object_free(obj);
return git__throw(GIT_EOBJTYPE, "Failed to parse commit. Object is no commit object");
}
error = commit_quick_parse(walk, commit, &obj->raw);
- git_odb_object_close(obj);
+ git_odb_object_free(obj);
return error == GIT_SUCCESS ? GIT_SUCCESS : git__rethrow(error, "Failed to parse commit");
}
diff --git a/src/status.c b/src/status.c
index d09abfd69..97093a553 100644
--- a/src/status.c
+++ b/src/status.c
@@ -162,7 +162,7 @@ static int retrieve_head_tree(git_tree **tree_out, git_repository *repo)
*tree_out = tree;
exit:
- git_commit_close(head_commit);
+ git_commit_free(head_commit);
return error;
}
@@ -214,7 +214,7 @@ static int process_folder(struct status_st *st, const git_tree_entry *tree_entry
}
if (tree_entry_type == GIT_OBJ_TREE) {
- git_object_close(subtree);
+ git_object_free(subtree);
st->head_tree_relative_path_len -= 1 + tree_entry->filename_len;
st->tree = pushed_tree;
st->tree_position = pushed_tree_position;
@@ -477,7 +477,7 @@ int git_status_foreach(git_repository *repo, int (*callback)(const char *, unsig
exit:
git_vector_free(&entries);
- git_tree_close(tree);
+ git_tree_free(tree);
return error;
}
@@ -512,7 +512,7 @@ static int recurse_tree_entry(git_tree *tree, struct status_entry *e, const char
return git__throw(GIT_EOBJCORRUPTED, "Can't find tree object '%s'", tree_entry->filename);
error = recurse_tree_entry(subtree, e, dir_sep+1);
- git_tree_close(subtree);
+ git_tree_free(subtree);
return error;
}
@@ -585,7 +585,7 @@ int git_status_file(unsigned int *status_flags, git_repository *repo, const char
*status_flags = e->status_flags;
exit:
- git_tree_close(tree);
+ git_tree_free(tree);
git__free(e);
return error;
}
diff --git a/src/tag.c b/src/tag.c
index fd79dc326..16d46ce16 100644
--- a/src/tag.c
+++ b/src/tag.c
@@ -319,7 +319,7 @@ int git_tag_create_frombuffer(git_oid *oid, git_repository *repo, const char *bu
if (tag.type != target_obj->raw.type)
return git__throw(error, "The type for the given target is invalid");
- git_odb_object_close(target_obj);
+ git_odb_object_free(target_obj);
error = retrieve_tag_reference(&new_ref, ref_name, repo, tag.tag_name);
diff --git a/src/transports/local.c b/src/transports/local.c
index 058ed7e79..afc17e55f 100644
--- a/src/transports/local.c
+++ b/src/transports/local.c
@@ -114,7 +114,7 @@ static int add_ref(const char *name, git_repository *repo, git_vector *vec)
git_reference_free(ref);
git_reference_free(resolved_ref);
- git_object_close(obj);
+ git_object_free(obj);
if (error < GIT_SUCCESS) {
git__free(head->name);
git__free(head);
diff --git a/src/tree.c b/src/tree.c
index ec44d2492..702095d14 100644
--- a/src/tree.c
+++ b/src/tree.c
@@ -680,7 +680,7 @@ static int tree_frompath(
slash_pos - treeentry_path + 1
);
- git_tree_close(subtree);
+ git_tree_free(subtree);
return error;
}
@@ -731,7 +731,7 @@ static int tree_walk_post(
payload
);
- git_tree_close(subtree);
+ git_tree_free(subtree);
}
}