Commit f039c836438f96407abc08cbd238b9102318deb2
2019-07-29T13:02:37
Merge pull request #5192 from libgit2/cmn/object-size-nopublic object: deprecate git_object__size for removal
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98
diff --git a/include/git2/deprecated.h b/include/git2/deprecated.h
index fec56b1..df53cf0 100644
--- a/include/git2/deprecated.h
+++ b/include/git2/deprecated.h
@@ -301,6 +301,18 @@ GIT_EXTERN(int) git_index_add_frombuffer(
#define GIT_OBJ_OFS_DELTA GIT_OBJECT_OFS_DELTA
#define GIT_OBJ_REF_DELTA GIT_OBJECT_REF_DELTA
+/**
+ * Get the size in bytes for the structure which
+ * acts as an in-memory representation of any given
+ * object type.
+ *
+ * For all the core types, this would the equivalent
+ * of calling `sizeof(git_commit)` if the core types
+ * were not opaque on the external API.
+ *
+ * @param type object type to get its size
+ * @return size in bytes of the object
+ */
GIT_EXTERN(size_t) git_object__size(git_object_t type);
/**@}*/
diff --git a/include/git2/object.h b/include/git2/object.h
index 9b45178..2045dd8 100644
--- a/include/git2/object.h
+++ b/include/git2/object.h
@@ -186,20 +186,6 @@ GIT_EXTERN(git_object_t) git_object_string2type(const char *str);
GIT_EXTERN(int) git_object_typeisloose(git_object_t type);
/**
- * Get the size in bytes for the structure which
- * acts as an in-memory representation of any given
- * object type.
- *
- * For all the core types, this would the equivalent
- * of calling `sizeof(git_commit)` if the core types
- * were not opaque on the external API.
- *
- * @param type object type to get its size
- * @return size in bytes of the object
- */
-GIT_EXTERN(size_t) git_object_size(git_object_t type);
-
-/**
* Recursively peel an object until an object of the specified type is met.
*
* If the query cannot be satisfied due to the object model,
diff --git a/src/object.c b/src/object.c
index c28629c..8559de1 100644
--- a/src/object.c
+++ b/src/object.c
@@ -21,6 +21,7 @@
bool git_object__strict_input_validation = true;
extern int git_odb_hash(git_oid *out, const void *data, size_t len, git_object_t type);
+size_t git_object__size(git_object_t type);
typedef struct {
const char *str; /* type name string */
@@ -75,7 +76,7 @@ int git_object__from_raw(
return GIT_ENOTFOUND;
}
- if ((object_size = git_object_size(type)) == 0) {
+ if ((object_size = git_object__size(type)) == 0) {
git_error_set(GIT_ERROR_INVALID, "the requested type is invalid");
return GIT_ENOTFOUND;
}
@@ -123,7 +124,7 @@ int git_object__from_odb_object(
return GIT_ENOTFOUND;
}
- if ((object_size = git_object_size(odb_obj->cached.type)) == 0) {
+ if ((object_size = git_object__size(odb_obj->cached.type)) == 0) {
git_error_set(GIT_ERROR_INVALID, "the requested type is invalid");
return GIT_ENOTFOUND;
}
@@ -316,7 +317,7 @@ int git_object_typeisloose(git_object_t type)
return (git_objects_table[type].size > 0) ? 1 : 0;
}
-size_t git_object_size(git_object_t type)
+size_t git_object__size(git_object_t type)
{
if (type < 0 || ((size_t) type) >= ARRAY_SIZE(git_objects_table))
return 0;
@@ -549,10 +550,3 @@ bool git_object__is_valid(
return true;
}
-
-/* Deprecated functions */
-
-size_t git_object__size(git_object_t type)
-{
- return git_object_size(type);
-}