1 files changed, 53 insertions, 53 deletions

diff --git a/src/object.c b/src/object.c
index 87a8d1aae..ef7a4dd29 100644
--- a/src/object.c
+++ b/src/object.c
@@ -20,7 +20,7 @@
 
 bool git_object__strict_input_validation = true;
 
-extern int git_odb_hash(git_oid *out, const void *data, size_t len, git_otype type);
+extern int git_odb_hash(git_oid *out, const void *data, size_t len, git_object_t type);
 
 typedef struct {
 	const char	*str;	/* type name string */
@@ -32,26 +32,26 @@ typedef struct {
 } git_object_def;
 
 static git_object_def git_objects_table[] = {
-	/* 0 = GIT_OBJ__EXT1 */
+	/* 0 = GIT_OBJECT__EXT1 */
 	{ "", 0, NULL, NULL, NULL },
 
-	/* 1 = GIT_OBJ_COMMIT */
+	/* 1 = GIT_OBJECT_COMMIT */
 	{ "commit", sizeof(git_commit), git_commit__parse, git_commit__parse_raw, git_commit__free },
 
-	/* 2 = GIT_OBJ_TREE */
+	/* 2 = GIT_OBJECT_TREE */
 	{ "tree", sizeof(git_tree), git_tree__parse, git_tree__parse_raw, git_tree__free },
 
-	/* 3 = GIT_OBJ_BLOB */
+	/* 3 = GIT_OBJECT_BLOB */
 	{ "blob", sizeof(git_blob), git_blob__parse, git_blob__parse_raw, git_blob__free },
 
-	/* 4 = GIT_OBJ_TAG */
+	/* 4 = GIT_OBJECT_TAG */
 	{ "tag", sizeof(git_tag), git_tag__parse, git_tag__parse_raw, git_tag__free },
 
-	/* 5 = GIT_OBJ__EXT2 */
+	/* 5 = GIT_OBJECT__EXT2 */
 	{ "", 0, NULL, NULL, NULL },
-	/* 6 = GIT_OBJ_OFS_DELTA */
+	/* 6 = GIT_OBJECT_OFS_DELTA */
 	{ "OFS_DELTA", 0, NULL, NULL, NULL },
-	/* 7 = GIT_OBJ_REF_DELTA */
+	/* 7 = GIT_OBJECT_REF_DELTA */
 	{ "REF_DELTA", 0, NULL, NULL, NULL },
 };
 
@@ -59,7 +59,7 @@ int git_object__from_raw(
 	git_object **object_out,
 	const char *data,
 	size_t size,
-	git_otype type)
+	git_object_t type)
 {
 	git_object_def *def;
 	git_object *object;
@@ -70,7 +70,7 @@ int git_object__from_raw(
 	*object_out = NULL;
 
 	/* Validate type match */
-	if (type != GIT_OBJ_BLOB && type != GIT_OBJ_TREE && type != GIT_OBJ_COMMIT && type != GIT_OBJ_TAG) {
+	if (type != GIT_OBJECT_BLOB && type != GIT_OBJECT_TREE && type != GIT_OBJECT_COMMIT && type != GIT_OBJECT_TAG) {
 		giterr_set(GITERR_INVALID, "the requested type is invalid");
 		return GIT_ENOTFOUND;
 	}
@@ -106,7 +106,7 @@ int git_object__from_odb_object(
 	git_object **object_out,
 	git_repository *repo,
 	git_odb_object *odb_obj,
-	git_otype type)
+	git_object_t type)
 {
 	int error;
 	size_t object_size;
@@ -117,7 +117,7 @@ int git_object__from_odb_object(
 	*object_out = NULL;
 
 	/* Validate type match */
-	if (type != GIT_OBJ_ANY && type != odb_obj->cached.type) {
+	if (type != GIT_OBJECT_ANY && type != odb_obj->cached.type) {
 		giterr_set(GITERR_INVALID,
 			"the requested type does not match the type in the ODB");
 		return GIT_ENOTFOUND;
@@ -151,7 +151,7 @@ int git_object__from_odb_object(
 
 void git_object__free(void *obj)
 {
-	git_otype type = ((git_object *)obj)->cached.type;
+	git_object_t type = ((git_object *)obj)->cached.type;
 
 	if (type < 0 || ((size_t)type) >= ARRAY_SIZE(git_objects_table) ||
 		!git_objects_table[type].free)
@@ -165,7 +165,7 @@ int git_object_lookup_prefix(
 	git_repository *repo,
 	const git_oid *id,
 	size_t len,
-	git_otype type)
+	git_object_t type)
 {
 	git_object *object = NULL;
 	git_odb *odb = NULL;
@@ -197,7 +197,7 @@ int git_object_lookup_prefix(
 			if (cached->flags == GIT_CACHE_STORE_PARSED) {
 				object = (git_object *)cached;
 
-				if (type != GIT_OBJ_ANY && type != object->cached.type) {
+				if (type != GIT_OBJECT_ANY && type != object->cached.type) {
 					git_object_free(object);
 					giterr_set(GITERR_INVALID,
 						"the requested type does not match the type in ODB");
@@ -247,7 +247,7 @@ int git_object_lookup_prefix(
 	return error;
 }
 
-int git_object_lookup(git_object **object_out, git_repository *repo, const git_oid *id, git_otype type) {
+int git_object_lookup(git_object **object_out, git_repository *repo, const git_oid *id, git_object_t type) {
 	return git_object_lookup_prefix(object_out, repo, id, GIT_OID_HEXSZ, type);
 }
 
@@ -265,7 +265,7 @@ const git_oid *git_object_id(const git_object *obj)
 	return &obj->cached.oid;
 }
 
-git_otype git_object_type(const git_object *obj)
+git_object_t git_object_type(const git_object *obj)
 {
 	assert(obj);
 	return obj->cached.type;
@@ -277,7 +277,7 @@ git_repository *git_object_owner(const git_object *obj)
 	return obj->repo;
 }
 
-const char *git_object_type2string(git_otype type)
+const char *git_object_type2string(git_object_t type)
 {
 	if (type < 0 || ((size_t) type) >= ARRAY_SIZE(git_objects_table))
 		return "";
@@ -285,30 +285,30 @@ const char *git_object_type2string(git_otype type)
 	return git_objects_table[type].str;
 }
 
-git_otype git_object_string2type(const char *str)
+git_object_t git_object_string2type(const char *str)
 {
 	if (!str)
-		return GIT_OBJ_BAD;
+		return GIT_OBJECT_BAD;
 
 	return git_object_stringn2type(str, strlen(str));
 }
 
-git_otype git_object_stringn2type(const char *str, size_t len)
+git_object_t git_object_stringn2type(const char *str, size_t len)
 {
 	size_t i;
 
 	if (!str || !len || !*str)
-		return GIT_OBJ_BAD;
+		return GIT_OBJECT_BAD;
 
 	for (i = 0; i < ARRAY_SIZE(git_objects_table); i++)
 		if (*git_objects_table[i].str &&
 			!git__prefixncmp(str, len, git_objects_table[i].str))
-			return (git_otype)i;
+			return (git_object_t)i;
 
-	return GIT_OBJ_BAD;
+	return GIT_OBJECT_BAD;
 }
 
-int git_object_typeisloose(git_otype type)
+int git_object_typeisloose(git_object_t type)
 {
 	if (type < 0 || ((size_t) type) >= ARRAY_SIZE(git_objects_table))
 		return 0;
@@ -316,7 +316,7 @@ int git_object_typeisloose(git_otype type)
 	return (git_objects_table[type].size > 0) ? 1 : 0;
 }
 
-size_t git_object__size(git_otype type)
+size_t git_object__size(git_object_t type)
 {
 	if (type < 0 || ((size_t) type) >= ARRAY_SIZE(git_objects_table))
 		return 0;
@@ -326,17 +326,17 @@ size_t git_object__size(git_otype type)
 
 static int dereference_object(git_object **dereferenced, git_object *obj)
 {
-	git_otype type = git_object_type(obj);
+	git_object_t type = git_object_type(obj);
 
 	switch (type) {
-	case GIT_OBJ_COMMIT:
+	case GIT_OBJECT_COMMIT:
 		return git_commit_tree((git_tree **)dereferenced, (git_commit*)obj);
 
-	case GIT_OBJ_TAG:
+	case GIT_OBJECT_TAG:
 		return git_tag_target(dereferenced, (git_tag*)obj);
 
-	case GIT_OBJ_BLOB:
-	case GIT_OBJ_TREE:
+	case GIT_OBJECT_BLOB:
+	case GIT_OBJECT_TREE:
 		return GIT_EPEEL;
 
 	default:
@@ -344,7 +344,7 @@ static int dereference_object(git_object **dereferenced, git_object *obj)
 	}
 }
 
-static int peel_error(int error, const git_oid *oid, git_otype type)
+static int peel_error(int error, const git_oid *oid, git_object_t type)
 {
 	const char *type_name;
 	char hex_oid[GIT_OID_HEXSZ + 1];
@@ -355,28 +355,28 @@ static int peel_error(int error, const git_oid *oid, git_otype type)
 	hex_oid[GIT_OID_HEXSZ] = '\0';
 
 	giterr_set(GITERR_OBJECT, "the git_object of id '%s' can not be "
-		"successfully peeled into a %s (git_otype=%i).", hex_oid, type_name, type);
+		"successfully peeled into a %s (git_object_t=%i).", hex_oid, type_name, type);
 
 	return error;
 }
 
-static int check_type_combination(git_otype type, git_otype target)
+static int check_type_combination(git_object_t type, git_object_t target)
 {
 	if (type == target)
 		return 0;
 
 	switch (type) {
-	case GIT_OBJ_BLOB:
-	case GIT_OBJ_TREE:
+	case GIT_OBJECT_BLOB:
+	case GIT_OBJECT_TREE:
 		/* a blob or tree can never be peeled to anything but themselves */
 		return GIT_EINVALIDSPEC;
 		break;
-	case GIT_OBJ_COMMIT:
+	case GIT_OBJECT_COMMIT:
 		/* a commit can only be peeled to a tree */
-		if (target != GIT_OBJ_TREE && target != GIT_OBJ_ANY)
+		if (target != GIT_OBJECT_TREE && target != GIT_OBJECT_ANY)
 			return GIT_EINVALIDSPEC;
 		break;
-	case GIT_OBJ_TAG:
+	case GIT_OBJECT_TAG:
 		/* a tag may point to anything, so we let anything through */
 		break;
 	default:
@@ -389,18 +389,18 @@ static int check_type_combination(git_otype type, git_otype target)
 int git_object_peel(
 	git_object **peeled,
 	const git_object *object,
-	git_otype target_type)
+	git_object_t target_type)
 {
 	git_object *source, *deref = NULL;
 	int error;
 
 	assert(object && peeled);
 
-	assert(target_type == GIT_OBJ_TAG ||
-		target_type == GIT_OBJ_COMMIT ||
-		target_type == GIT_OBJ_TREE ||
-		target_type == GIT_OBJ_BLOB ||
-		target_type == GIT_OBJ_ANY);
+	assert(target_type == GIT_OBJECT_TAG ||
+		target_type == GIT_OBJECT_COMMIT ||
+		target_type == GIT_OBJECT_TREE ||
+		target_type == GIT_OBJECT_BLOB ||
+		target_type == GIT_OBJECT_ANY);
 
 	if ((error = check_type_combination(git_object_type(object), target_type)) < 0)
 		return peel_error(error, git_object_id(object), target_type);
@@ -420,7 +420,7 @@ int git_object_peel(
 			return 0;
 		}
 
-		if (target_type == GIT_OBJ_ANY &&
+		if (target_type == GIT_OBJECT_ANY &&
 			git_object_type(deref) != git_object_type(object))
 		{
 			*peeled = deref;
@@ -453,7 +453,7 @@ int git_object_lookup_bypath(
 		git_object **out,
 		const git_object *treeish,
 		const char *path,
-		git_otype type)
+		git_object_t type)
 {
 	int error = -1;
 	git_tree *tree = NULL;
@@ -461,13 +461,13 @@ int git_object_lookup_bypath(
 
 	assert(out && treeish && path);
 
-	if ((error = git_object_peel((git_object**)&tree, treeish, GIT_OBJ_TREE)) < 0 ||
+	if ((error = git_object_peel((git_object**)&tree, treeish, GIT_OBJECT_TREE)) < 0 ||
 		 (error = git_tree_entry_bypath(&entry, tree, path)) < 0)
 	{
 		goto cleanup;
 	}
 
-	if (type != GIT_OBJ_ANY && git_tree_entry_type(entry) != type)
+	if (type != GIT_OBJECT_ANY && git_tree_entry_type(entry) != type)
 	{
 		giterr_set(GITERR_OBJECT,
 				"object at path '%s' is not of the asked-for type %d",
@@ -527,10 +527,10 @@ int git_object_short_id(git_buf *out, const git_object *obj)
 }
 
 bool git_object__is_valid(
-	git_repository *repo, const git_oid *id, git_otype expected_type)
+	git_repository *repo, const git_oid *id, git_object_t expected_type)
 {
 	git_odb *odb;
-	git_otype actual_type;
+	git_object_t actual_type;
 	size_t len;
 	int error;
 
@@ -541,7 +541,7 @@ bool git_object__is_valid(
 		(error = git_odb_read_header(&len, &actual_type, odb, id)) < 0)
 		return false;
 
-	if (expected_type != GIT_OBJ_ANY && expected_type != actual_type) {
+	if (expected_type != GIT_OBJECT_ANY && expected_type != actual_type) {
 		giterr_set(GITERR_INVALID,
 			"the requested type does not match the type in the ODB");
 		return false;