diff options
Diffstat (limited to 'src/odb.c')
| -rw-r--r-- | src/odb.c | 24 |
1 files changed, 12 insertions, 12 deletions
@@ -485,7 +485,7 @@ int git_odb_exists(git_odb *db, const git_oid *id) int git_odb_read_header(size_t *len_p, git_otype *type_p, git_odb *db, const git_oid *id) { unsigned int i; - int error = GIT_ENOTFOUND; + int error = GIT_NOTFOUND; git_odb_object *object; assert(db && id); @@ -505,7 +505,7 @@ int git_odb_read_header(size_t *len_p, git_otype *type_p, git_odb *db, const git error = b->read_header(len_p, type_p, b, id); } - if (!error || error == GIT_EPASSTHROUGH) + if (!error || error == GIT_PASSTHROUGH) return 0; /* @@ -524,7 +524,7 @@ int git_odb_read_header(size_t *len_p, git_otype *type_p, git_odb *db, const git int git_odb_read(git_odb_object **out, git_odb *db, const git_oid *id) { unsigned int i; - int error = GIT_ENOTFOUND; + int error = GIT_NOTFOUND; git_rawobj raw; assert(out && db && id); @@ -541,11 +541,11 @@ int git_odb_read(git_odb_object **out, git_odb *db, const git_oid *id) error = b->read(&raw.data, &raw.len, &raw.type, b, id); } - /* TODO: If no backends are configured, this returns GIT_ENOTFOUND but + /* TODO: If no backends are configured, this returns GIT_NOTFOUND but * will never have called giterr_set(). */ - if (error && error != GIT_EPASSTHROUGH) + if (error && error != GIT_PASSTHROUGH) return error; *out = git_cache_try_store(&db->cache, new_odb_object(id, &raw)); @@ -556,7 +556,7 @@ int git_odb_read_prefix( git_odb_object **out, git_odb *db, const git_oid *short_id, unsigned int len) { unsigned int i; - int error = GIT_ENOTFOUND; + int error = GIT_NOTFOUND; git_oid found_full_oid = {{0}}; git_rawobj raw; bool found = false; @@ -582,7 +582,7 @@ int git_odb_read_prefix( if (b->read != NULL) { git_oid full_oid; error = b->read_prefix(&full_oid, &raw.data, &raw.len, &raw.type, b, short_id, len); - if (error == GIT_ENOTFOUND || error == GIT_EPASSTHROUGH) + if (error == GIT_NOTFOUND || error == GIT_PASSTHROUGH) continue; if (error) @@ -623,7 +623,7 @@ int git_odb_write( error = b->write(oid, b, data, len, type); } - if (!error || error == GIT_EPASSTHROUGH) + if (!error || error == GIT_PASSTHROUGH) return 0; /* if no backends were able to write the object directly, we try a streaming @@ -662,7 +662,7 @@ int git_odb_open_wstream( error = init_fake_wstream(stream, b, size, type); } - if (error == GIT_EPASSTHROUGH) + if (error == GIT_PASSTHROUGH) error = 0; return error; @@ -683,7 +683,7 @@ int git_odb_open_rstream(git_odb_stream **stream, git_odb *db, const git_oid *oi error = b->readstream(stream, b, oid); } - if (error == GIT_EPASSTHROUGH) + if (error == GIT_PASSTHROUGH) error = 0; return error; @@ -698,12 +698,12 @@ int git_odb__error_notfound(const char *message, const git_oid *oid) } else giterr_set(GITERR_ODB, "Object not found - %s", message); - return GIT_ENOTFOUND; + return GIT_NOTFOUND; } int git_odb__error_ambiguous(const char *message) { giterr_set(GITERR_ODB, "Ambiguous SHA1 prefix - %s", message); - return GIT_EAMBIGUOUS; + return GIT_AMBIGUOUS; } |