diff options
author | Edward Thomson <ethomson@edwardthomson.com> | 2020-01-18 18:00:39 +0000 |
---|---|---|
committer | Edward Thomson <ethomson@edwardthomson.com> | 2020-01-24 15:12:56 -0600 |
commit | f78f6bd597bf0207a89d8defd4f0b9582830844c (patch) | |
tree | f9afaeb0c71b4f3e98f87a3ce1b812744f446713 | |
parent | 4b331f020e29bf04525773c058e5015242c71eb5 (diff) | |
download | libgit2-f78f6bd597bf0207a89d8defd4f0b9582830844c.tar.gz |
error functions: return an int
Stop returning a void for functions, future-proofing them to allow them
to fail.
-rw-r--r-- | include/git2/errors.h | 3 | ||||
-rw-r--r-- | src/errors.c | 16 |
2 files changed, 13 insertions, 6 deletions
diff --git a/include/git2/errors.h b/include/git2/errors.h index 370b6ac49..5c85c4d6c 100644 --- a/include/git2/errors.h +++ b/include/git2/errors.h @@ -143,8 +143,9 @@ GIT_EXTERN(void) git_error_clear(void); * @param error_class One of the `git_error_t` enum above describing the * general subsystem that is responsible for the error. * @param string The formatted error message to keep + * @return 0 on success or -1 on failure */ -GIT_EXTERN(void) git_error_set_str(int error_class, const char *string); +GIT_EXTERN(int) git_error_set_str(int error_class, const char *string); /** * Set the error message to a special value for memory allocation failure. diff --git a/src/errors.c b/src/errors.c index c75f6b17a..b34aa3abb 100644 --- a/src/errors.c +++ b/src/errors.c @@ -95,19 +95,25 @@ void git_error_vset(int error_class, const char *fmt, va_list ap) set_error_from_buffer(error_class); } -void git_error_set_str(int error_class, const char *string) +int git_error_set_str(int error_class, const char *string) { git_buf *buf = &GIT_GLOBAL->error_buf; assert(string); - if (!string) - return; + if (!string) { + git_error_set(GIT_ERROR_INVALID, "unspecified caller error"); + return -1; + } git_buf_clear(buf); git_buf_puts(buf, string); - if (!git_buf_oom(buf)) - set_error_from_buffer(error_class); + + if (git_buf_oom(buf)) + return -1; + + set_error_from_buffer(error_class); + return 0; } void git_error_clear(void) |