Commit ffb55c532ccc1cb3c47eeeaac6c64240ab88fe29
2008-12-30T22:29:04
Rename the path of the objects directory to be more specific We're likely to add additional path data, like the path of the refs or the path to the config file into the git_odb structure, as it may grow into the repository wrapper. Changing the name of the objects directory reference makes it more clear should we later add something else. 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
diff --git a/src/odb.c b/src/odb.c
index f57c220..e96aa1e 100644
--- a/src/odb.c
+++ b/src/odb.c
@@ -32,7 +32,7 @@
struct git_odb {
/** Path to the "objects" directory. */
- char *path;
+ char *objects_dir;
/** Alternate databases to search. */
git_odb **alternates;
@@ -428,8 +428,8 @@ int git_odb_open(git_odb **out, const char *objects_dir)
if (!db)
return GIT_ERROR;
- db->path = strdup(objects_dir);
- if (!db->path) {
+ db->objects_dir = strdup(objects_dir);
+ if (!db->objects_dir) {
free(db);
return GIT_ERROR;
}
@@ -452,7 +452,7 @@ void git_odb_close(git_odb *db)
free(db->alternates);
}
- free(db->path);
+ free(db->objects_dir);
free(db);
}
@@ -484,7 +484,7 @@ int git_odb__read_loose(git_obj *out, git_odb *db, const git_oid *id)
out->len = 0;
out->type = GIT_OBJ_BAD;
- if (object_file_name(file, sizeof(file), db->path, id))
+ if (object_file_name(file, sizeof(file), db->objects_dir, id))
return GIT_ENOTFOUND; /* TODO: error handling */
if (gitfo_read_file(&obj, file))