Commit ffb55c53 by Shawn O. Pearce

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>
parent 4c67e2e9
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
struct git_odb { struct git_odb {
/** Path to the "objects" directory. */ /** Path to the "objects" directory. */
char *path; char *objects_dir;
/** Alternate databases to search. */ /** Alternate databases to search. */
git_odb **alternates; git_odb **alternates;
...@@ -428,8 +428,8 @@ int git_odb_open(git_odb **out, const char *objects_dir) ...@@ -428,8 +428,8 @@ int git_odb_open(git_odb **out, const char *objects_dir)
if (!db) if (!db)
return GIT_ERROR; return GIT_ERROR;
db->path = strdup(objects_dir); db->objects_dir = strdup(objects_dir);
if (!db->path) { if (!db->objects_dir) {
free(db); free(db);
return GIT_ERROR; return GIT_ERROR;
} }
...@@ -452,7 +452,7 @@ void git_odb_close(git_odb *db) ...@@ -452,7 +452,7 @@ void git_odb_close(git_odb *db)
free(db->alternates); free(db->alternates);
} }
free(db->path); free(db->objects_dir);
free(db); free(db);
} }
...@@ -484,7 +484,7 @@ int git_odb__read_loose(git_obj *out, git_odb *db, const git_oid *id) ...@@ -484,7 +484,7 @@ int git_odb__read_loose(git_obj *out, git_odb *db, const git_oid *id)
out->len = 0; out->len = 0;
out->type = GIT_OBJ_BAD; 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 */ return GIT_ENOTFOUND; /* TODO: error handling */
if (gitfo_read_file(&obj, file)) if (gitfo_read_file(&obj, file))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment