diff options
Diffstat (limited to 'src/common.h')
| -rw-r--r-- | src/common.h | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/src/common.h b/src/common.h index cb980c107..6e1eac834 100644 --- a/src/common.h +++ b/src/common.h @@ -89,30 +89,30 @@ /** * Check a pointer allocation result, returning -1 if it failed. */ -#define GITERR_CHECK_ALLOC(ptr) if (ptr == NULL) { return -1; } +#define GIT_ERROR_CHECK_ALLOC(ptr) if (ptr == NULL) { return -1; } /** * Check a buffer allocation result, returning -1 if it failed. */ -#define GITERR_CHECK_ALLOC_BUF(buf) if ((void *)(buf) == NULL || git_buf_oom(buf)) { return -1; } +#define GIT_ERROR_CHECK_ALLOC_BUF(buf) if ((void *)(buf) == NULL || git_buf_oom(buf)) { return -1; } /** * Check a return value and propagate result if non-zero. */ -#define GITERR_CHECK_ERROR(code) \ +#define GIT_ERROR_CHECK_ERROR(code) \ do { int _err = (code); if (_err) return _err; } while (0) /** * Set the error message for this thread, formatting as needed. */ -void giterr_set(int error_class, const char *string, ...) GIT_FORMAT_PRINTF(2, 3); +void git_error_set(int error_class, const char *string, ...) GIT_FORMAT_PRINTF(2, 3); /** * Set the error message for a regex failure, using the internal regex * error code lookup and return a libgit error code. */ -int giterr_set_regex(const regex_t *regex, int error_code); +int git_error_set_regex(const regex_t *regex, int error_code); /** * Set error message for user callback if needed. @@ -122,35 +122,35 @@ int giterr_set_regex(const regex_t *regex, int error_code); * * @return This always returns the `error_code` parameter. */ -GIT_INLINE(int) giterr_set_after_callback_function( +GIT_INLINE(int) git_error_set_after_callback_function( int error_code, const char *action) { if (error_code) { - const git_error *e = giterr_last(); + const git_error *e = git_error_last(); if (!e || !e->message) - giterr_set(e ? e->klass : GITERR_CALLBACK, + git_error_set(e ? e->klass : GIT_ERROR_CALLBACK, "%s callback returned %d", action, error_code); } return error_code; } #ifdef GIT_WIN32 -#define giterr_set_after_callback(code) \ - giterr_set_after_callback_function((code), __FUNCTION__) +#define git_error_set_after_callback(code) \ + git_error_set_after_callback_function((code), __FUNCTION__) #else -#define giterr_set_after_callback(code) \ - giterr_set_after_callback_function((code), __func__) +#define git_error_set_after_callback(code) \ + git_error_set_after_callback_function((code), __func__) #endif /** * Gets the system error code for this thread. */ -int giterr_system_last(void); +int git_error_system_last(void); /** * Sets the system error code for this thread. */ -void giterr_system_set(int code); +void git_error_system_set(int code); /** * Structure to preserve libgit2 error state @@ -166,20 +166,20 @@ typedef struct { * If `error_code` is zero, this does not clear the current error state. * You must either restore this error state, or free it. */ -extern int giterr_state_capture(git_error_state *state, int error_code); +extern int git_error_state_capture(git_error_state *state, int error_code); /** * Restore error state to a previous value, returning saved error code. */ -extern int giterr_state_restore(git_error_state *state); +extern int git_error_state_restore(git_error_state *state); /** Free an error state. */ -extern void giterr_state_free(git_error_state *state); +extern void git_error_state_free(git_error_state *state); /** * Check a versioned structure for validity */ -GIT_INLINE(int) giterr__check_version(const void *structure, unsigned int expected_max, const char *name) +GIT_INLINE(int) git_error__check_version(const void *structure, unsigned int expected_max, const char *name) { unsigned int actual; @@ -190,10 +190,10 @@ GIT_INLINE(int) giterr__check_version(const void *structure, unsigned int expect if (actual > 0 && actual <= expected_max) return 0; - giterr_set(GITERR_INVALID, "invalid version %d on %s", actual, name); + git_error_set(GIT_ERROR_INVALID, "invalid version %d on %s", actual, name); return -1; } -#define GITERR_CHECK_VERSION(S,V,N) if (giterr__check_version(S,V,N) < 0) return -1 +#define GIT_ERROR_CHECK_VERSION(S,V,N) if (git_error__check_version(S,V,N) < 0) return -1 /** * Initialize a structure with a version. @@ -207,42 +207,42 @@ GIT_INLINE(void) git__init_structure(void *structure, size_t len, unsigned int v #define GIT_INIT_STRUCTURE_FROM_TEMPLATE(PTR,VERSION,TYPE,TPL) do { \ TYPE _tmpl = TPL; \ - GITERR_CHECK_VERSION(&(VERSION), _tmpl.version, #TYPE); \ + GIT_ERROR_CHECK_VERSION(&(VERSION), _tmpl.version, #TYPE); \ memcpy((PTR), &_tmpl, sizeof(_tmpl)); } while (0) /** Check for additive overflow, setting an error if would occur. */ #define GIT_ADD_SIZET_OVERFLOW(out, one, two) \ - (git__add_sizet_overflow(out, one, two) ? (giterr_set_oom(), 1) : 0) + (git__add_sizet_overflow(out, one, two) ? (git_error_set_oom(), 1) : 0) /** Check for additive overflow, setting an error if would occur. */ #define GIT_MULTIPLY_SIZET_OVERFLOW(out, nelem, elsize) \ - (git__multiply_sizet_overflow(out, nelem, elsize) ? (giterr_set_oom(), 1) : 0) + (git__multiply_sizet_overflow(out, nelem, elsize) ? (git_error_set_oom(), 1) : 0) /** Check for additive overflow, failing if it would occur. */ -#define GITERR_CHECK_ALLOC_ADD(out, one, two) \ +#define GIT_ERROR_CHECK_ALLOC_ADD(out, one, two) \ if (GIT_ADD_SIZET_OVERFLOW(out, one, two)) { return -1; } -#define GITERR_CHECK_ALLOC_ADD3(out, one, two, three) \ +#define GIT_ERROR_CHECK_ALLOC_ADD3(out, one, two, three) \ if (GIT_ADD_SIZET_OVERFLOW(out, one, two) || \ GIT_ADD_SIZET_OVERFLOW(out, *(out), three)) { return -1; } -#define GITERR_CHECK_ALLOC_ADD4(out, one, two, three, four) \ +#define GIT_ERROR_CHECK_ALLOC_ADD4(out, one, two, three, four) \ if (GIT_ADD_SIZET_OVERFLOW(out, one, two) || \ GIT_ADD_SIZET_OVERFLOW(out, *(out), three) || \ GIT_ADD_SIZET_OVERFLOW(out, *(out), four)) { return -1; } -#define GITERR_CHECK_ALLOC_ADD5(out, one, two, three, four, five) \ +#define GIT_ERROR_CHECK_ALLOC_ADD5(out, one, two, three, four, five) \ if (GIT_ADD_SIZET_OVERFLOW(out, one, two) || \ GIT_ADD_SIZET_OVERFLOW(out, *(out), three) || \ GIT_ADD_SIZET_OVERFLOW(out, *(out), four) || \ GIT_ADD_SIZET_OVERFLOW(out, *(out), five)) { return -1; } /** Check for multiplicative overflow, failing if it would occur. */ -#define GITERR_CHECK_ALLOC_MULTIPLY(out, nelem, elsize) \ +#define GIT_ERROR_CHECK_ALLOC_MULTIPLY(out, nelem, elsize) \ if (GIT_MULTIPLY_SIZET_OVERFLOW(out, nelem, elsize)) { return -1; } -/* NOTE: other giterr functions are in the public errors.h header file */ +/* NOTE: other git_error functions are in the public errors.h header file */ #include "util.h" |