[git] GPG-ERROR - branch, master, updated. libgpg-error-1.18-11-g56feff5

by Werner Koch cvs at cvs.gnupg.org
Tue Mar 24 11:25:16 CET 2015


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Error codes used by GnuPG et al.".

The branch, master has been updated
       via  56feff58d4fab92701ae77a1004af820b85e7f6c (commit)
      from  60bd5fa1d2f2911713f679f80601285dc7c372a0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 56feff58d4fab92701ae77a1004af820b85e7f6c
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Mar 24 11:23:35 2015 +0100

    Use assert to print diagnosicts before calling abort.
    
    * src/posix-lock.c: Add assert calls.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/src/posix-lock.c b/src/posix-lock.c
index 7f20347..89be944 100644
--- a/src/posix-lock.c
+++ b/src/posix-lock.c
@@ -33,6 +33,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
+#include <assert.h>
 
 #if USE_POSIX_THREADS
 # include <pthread.h>
@@ -88,7 +89,10 @@ use_pthread_p (void)
           /* Thread creation works.  */
           void *retval;
           if (pthread_join (thread, &retval) != 0)
-            abort ();
+            {
+              assert (!"pthread_join");
+              abort ();
+            }
           result = 1;
         }
       tested = 1;
@@ -106,9 +110,15 @@ get_lock_object (gpgrt_lock_t *lockhd)
   _gpgrt_lock_t *lock = (_gpgrt_lock_t*)lockhd;
 
   if (lock->vers != LOCK_ABI_VERSION)
-    abort ();
+    {
+      assert (!"lock ABI version");
+      abort ();
+    }
   if (sizeof (gpgrt_lock_t) < sizeof (_gpgrt_lock_t))
-    abort ();
+    {
+      assert (!"sizeof lock obj");
+      abort ();
+    }
 
   return lock;
 }
@@ -126,7 +136,10 @@ _gpgrt_lock_init (gpgrt_lock_t *lockhd)
   if (!lock->vers)
     {
       if (sizeof (gpgrt_lock_t) < sizeof (_gpgrt_lock_t))
-        abort ();
+        {
+          assert (!"sizeof lock obj");
+          abort ();
+        }
       lock->vers = LOCK_ABI_VERSION;
     }
   else /* Run the usual check.  */

-----------------------------------------------------------------------

Summary of changes:
 src/posix-lock.c | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Error codes used by GnuPG et al.
http://git.gnupg.org




More information about the Gnupg-commits mailing list