diff options
| author | Jakob Pfender <jpfender@elegosoft.com> | 2011-05-19 15:17:06 +0200 |
|---|---|---|
| committer | Vicent Marti <tanoku@gmail.com> | 2011-05-23 21:38:40 +0300 |
| commit | 43a0bc01ceb000a5d4392cbaff2135c15a04d4ec (patch) | |
| tree | e8c9beede531f2d36d5fe2bcfb4674eedcb11f4e /src/backends | |
| parent | 33b1d19e76518fabde0ccbb1020ab793e44a4637 (diff) | |
| download | libgit2-43a0bc01ceb000a5d4392cbaff2135c15a04d4ec.tar.gz | |
backends/hiredis.c: Move to new error handling mechanism
Diffstat (limited to 'src/backends')
| -rw-r--r-- | src/backends/hiredis.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/backends/hiredis.c b/src/backends/hiredis.c index 2533a16da..f0c5da234 100644 --- a/src/backends/hiredis.c +++ b/src/backends/hiredis.c @@ -67,7 +67,7 @@ int hiredis_backend__read_header(size_t *len_p, git_otype *type_p, git_odb_backe } freeReplyObject(reply); - return error; + return error == GIT_SUCCESS ? GIT_SUCCESS : git__rethrow(error, "Failed to read header"); } int hiredis_backend__read(void **data_p, size_t *len_p, git_otype *type_p, git_odb_backend *_backend, const git_oid *oid) { @@ -104,7 +104,7 @@ int hiredis_backend__read(void **data_p, size_t *len_p, git_otype *type_p, git_o } freeReplyObject(reply); - return error; + return error == GIT_SUCCESS ? GIT_SUCCESS : git__rethrow(error, "Failed to read backend"); } int hiredis_backend__exists(git_odb_backend *_backend, const git_oid *oid) { @@ -137,7 +137,7 @@ int hiredis_backend__write(git_oid *id, git_odb_backend *_backend, const void *d error = GIT_ERROR; if ((error = git_odb_hash(id, data, len, type)) < 0) - return error; + return git__rethrow(error, "Failed to write backend"); reply = redisCommand(backend->db, "HMSET %b " "type %d " @@ -148,7 +148,7 @@ int hiredis_backend__write(git_oid *id, git_odb_backend *_backend, const void *d error = (reply == NULL || reply->type == REDIS_REPLY_ERROR) ? GIT_ERROR : GIT_SUCCESS; freeReplyObject(reply); - return error; + return error == GIT_SUCCESS ? GIT_SUCCESS : git__rethrow(error, "Failed to write backend"); } void hiredis_backend__free(git_odb_backend *_backend) { @@ -184,7 +184,7 @@ int git_odb_backend_hiredis(git_odb_backend **backend_out, const char *host, int return GIT_SUCCESS; cleanup: free(backend); - return GIT_ERROR; + return git__throw(GIT_ERROR, "Failed to get ODB backend"); } #else @@ -194,7 +194,7 @@ int git_odb_backend_hiredis(git_odb_backend ** GIT_UNUSED(backend_out), GIT_UNUSED_ARG(backend_out); GIT_UNUSED_ARG(host); GIT_UNUSED_ARG(port); - return GIT_ENOTIMPLEMENTED; + return git__throw(GIT_ENOTIMPLEMENTED, "Failed to get ODB backend. Feature not yet implemented"); } |