From 46d8b885bd65158e8cb53266ba4b627b5991bce8 Mon Sep 17 00:00:00 2001 From: "Shawn O. Pearce" Date: Fri, 31 Oct 2008 10:43:20 -0700 Subject: [PATCH] Rename git_odb_sread to just git_odb_read Most read calls will use the small object format, as the majority of the content within the database is very small objects (under 20 KB when inflated). Signed-off-by: Shawn O. Pearce --- src/git_odb.c | 6 +++--- src/git_odb.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/git_odb.c b/src/git_odb.c index f2ee83a04..3f88988aa 100644 --- a/src/git_odb.c +++ b/src/git_odb.c @@ -35,9 +35,9 @@ #include "git_odb.h" -git_result git_odb_sread(git_sobj *out, git_odb *db, const git_oid *id) +git_result git_odb_read(git_sobj *out, git_odb *db, const git_oid *id) { - if (!git_odb__sread_packed(out, db, id)) + if (!git_odb__read_packed(out, db, id)) return GIT_SUCCESS; - return git_odb__sread_loose(out, db, id); + return git_odb__read_loose(out, db, id); } diff --git a/src/git_odb.h b/src/git_odb.h index c994bb473..556c36fd1 100644 --- a/src/git_odb.h +++ b/src/git_odb.h @@ -106,7 +106,7 @@ typedef struct { * @return GIT_SUCCESS if the object was read; * GIT_ENOTFOUND if the object is not in the database. */ -GIT_EXTERN(git_result) git_odb_sread(git_sobj *out, git_odb *db, const git_oid *id); +GIT_EXTERN(git_result) git_odb_read(git_sobj *out, git_odb *db, const git_oid *id); /** * Read a small object from the database using only pack files. @@ -116,7 +116,7 @@ GIT_EXTERN(git_result) git_odb_sread(git_sobj *out, git_odb *db, const git_oid * * @return GIT_SUCCESS if the object was read; * GIT_ENOTFOUND if the object is not in the database. */ -GIT_EXTERN(git_result) git_odb__sread_packed(git_sobj *out, git_odb *db, const git_oid *id); +GIT_EXTERN(git_result) git_odb__read_packed(git_sobj *out, git_odb *db, const git_oid *id); /** * Read a small object from the database using only loose object files. @@ -126,7 +126,7 @@ GIT_EXTERN(git_result) git_odb__sread_packed(git_sobj *out, git_odb *db, const g * @return GIT_SUCCESS if the object was read; * GIT_ENOTFOUND if the object is not in the database. */ -GIT_EXTERN(git_result) git_odb__sread_loose(git_sobj *out, git_odb *db, const git_oid *id); +GIT_EXTERN(git_result) git_odb__read_loose(git_sobj *out, git_odb *db, const git_oid *id); /** @} */ GIT_END_DECL