Commit dff79e27d3d2cdc09790ded80fe2ea8ff5d61034
2008-11-18T00:59:36
Rename "git_sobj" "git_obj" The 's' never really made sense, since it's not a "small" object at all, but rather a plain object. As such, it should have a "plain" object name. Signed-off-by: Andreas Ericsson <ae@op5.se> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
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
diff --git a/include/git/odb.h b/include/git/odb.h
index 33f0f5c..6a840eb 100644
--- a/include/git/odb.h
+++ b/include/git/odb.h
@@ -75,7 +75,7 @@ typedef struct {
void *data; /**< Raw, decompressed object data. */
size_t len; /**< Total number of bytes in data. */
git_otype type; /**< Type of this object. */
-} git_sobj;
+} git_obj;
/**
* Read a small object from the database.
@@ -89,7 +89,7 @@ typedef struct {
* - GIT_SUCCESS if the object was read;
* - GIT_ENOTFOUND if the object is not in the database.
*/
-GIT_EXTERN(int) git_odb_read(git_sobj *out, git_odb *db, const git_oid *id);
+GIT_EXTERN(int) git_odb_read(git_obj *out, git_odb *db, const git_oid *id);
/**
* Read a small object from the database using only pack files.
@@ -103,7 +103,7 @@ GIT_EXTERN(int) git_odb_read(git_sobj *out, git_odb *db, const git_oid *id);
* - GIT_SUCCESS if the object was read.
* - GIT_ENOTFOUND if the object is not in the database.
*/
-GIT_EXTERN(int) git_odb__read_packed(git_sobj *out, git_odb *db, const git_oid *id);
+GIT_EXTERN(int) git_odb__read_packed(git_obj *out, git_odb *db, const git_oid *id);
/**
* Read a small object from the database using only loose object files.
@@ -117,7 +117,7 @@ GIT_EXTERN(int) git_odb__read_packed(git_sobj *out, git_odb *db, const git_oid *
* - GIT_SUCCESS if the object was read.
* - GIT_ENOTFOUND if the object is not in the database.
*/
-GIT_EXTERN(int) git_odb__read_loose(git_sobj *out, git_odb *db, const git_oid *id);
+GIT_EXTERN(int) git_odb__read_loose(git_obj *out, git_odb *db, const git_oid *id);
/**
* Release all memory used by the sobj structure.
@@ -128,7 +128,7 @@ GIT_EXTERN(int) git_odb__read_loose(git_sobj *out, git_odb *db, const git_oid *i
*
* @param obj object descriptor to free.
*/
-GIT_INLINE(void) git_sobj_close(git_sobj *obj)
+GIT_INLINE(void) git_obj_close(git_obj *obj)
{
free(obj->data);
obj->data = NULL;
diff --git a/src/odb.c b/src/odb.c
index 0a42099..64c993e 100644
--- a/src/odb.c
+++ b/src/odb.c
@@ -80,7 +80,7 @@ void git_odb_close(git_odb *db)
}
int git_odb_read(
- git_sobj *out,
+ git_obj *out,
git_odb *db,
const git_oid *id)
{