summaryrefslogtreecommitdiff
path: root/script
diff options
context:
space:
mode:
authorEdward Thomson <ethomson@edwardthomson.com>2019-01-22 22:52:06 +0000
committerGitHub <noreply@github.com>2019-01-22 22:52:06 +0000
commit635693d3bc55770ec7a6640ba3f2f0ee434a6042 (patch)
tree9156b0eae8ff19b7e2e0bb8eb76d38ce35baac5c /script
parent6b2cd0ed599aec32444166b7ad5b0c9fdd88b498 (diff)
parenta27a4de6f8003961d38958893c6c637395c7cc04 (diff)
downloadlibgit2-635693d3bc55770ec7a6640ba3f2f0ee434a6042.tar.gz
Merge pull request #4917 from libgit2/ethomson/giterr
Move `giterr` to `git_error`
Diffstat (limited to 'script')
-rw-r--r--script/user_nodefs.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/script/user_nodefs.h b/script/user_nodefs.h
index 3c06a706d..b6e2df312 100644
--- a/script/user_nodefs.h
+++ b/script/user_nodefs.h
@@ -5,8 +5,8 @@
* a Linking Exception. For full terms see the included COPYING file.
*/
-#nodef GITERR_CHECK_ALLOC(ptr) if (ptr == NULL) { __coverity_panic__(); }
-#nodef GITERR_CHECK_ALLOC_BUF(buf) if (buf == NULL || git_buf_oom(buf)) { __coverity_panic__(); }
+#nodef GIT_ERROR_CHECK_ALLOC(ptr) if (ptr == NULL) { __coverity_panic__(); }
+#nodef GIT_ERROR_CHECK_ALLOC_BUF(buf) if (buf == NULL || git_buf_oom(buf)) { __coverity_panic__(); }
#nodef GITERR_CHECK_ALLOC_ADD(out, one, two) \
if (GIT_ADD_SIZET_OVERFLOW(out, one, two)) { __coverity_panic__(); }
@@ -23,7 +23,7 @@
#nodef GITERR_CHECK_ALLOC_MULTIPLY(out, nelem, elsize) \
if (GIT_MULTIPLY_SIZET_OVERFLOW(out, nelem, elsize)) { __coverity_panic__(); }
-#nodef GITERR_CHECK_VERSION(S,V,N) if (giterr__check_version(S,V,N) < 0) { __coverity_panic__(); }
+#nodef GIT_ERROR_CHECK_VERSION(S,V,N) if (git_error__check_version(S,V,N) < 0) { __coverity_panic__(); }
#nodef LOOKS_LIKE_DRIVE_PREFIX(S) (strlen(S) >= 2 && git__isalpha((S)[0]) && (S)[1] == ':')