From 00c66dfd3b531c63e6e5ec99fe94a7ceedc89173 Mon Sep 17 00:00:00 2001
From: Edward Thomson <ethomson@edwardthomson.com>
Date: Thu, 10 Jan 2019 22:43:59 +0000
Subject: [PATCH] errors: update static analysis tools for giterr

Update GITERR and giterr usages in the static code analysis tools to use
the new names.
---
 libgit2_clar.supp    | 4 ++--
 script/user_nodefs.h | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libgit2_clar.supp b/libgit2_clar.supp
index abd111790..b74791974 100644
--- a/libgit2_clar.supp
+++ b/libgit2_clar.supp
@@ -5,10 +5,10 @@
 }
 
 {
-	ignore-giterr-set-leak
+	ignore-giterror-set-leak
 	Memcheck:Leak
 	...
-	fun:giterr_set
+	fun:giterror_set
 }
 
 {
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] == ':')