Factor out ldif2* intialization to ldif2common.c

[openldap] / servers / slapd / back-bdb2 / porter.c

diff --git a/servers/slapd/back-bdb2/porter.c b/servers/slapd/back-bdb2/porter.c
index ce1518f239987a0f5ef9f54cc6e6e3a7f4085948..26e36107730912ae4a10bae3266ddbfe3005505d 100644 (file)
--- a/servers/slapd/back-bdb2/porter.c
+++ b/servers/slapd/back-bdb2/porter.c
@@ -3,7 +3,7 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <errno.h>
+#include <ac/errno.h>
 
 #include <ac/string.h>
 
@@ -61,11 +61,11 @@ bdb2i_enter_backend_rw( DB_LOCK *lock, int writer )
                                                writer ? "write" : "read", 0, 0 );
                                        break;
 
-                               default:
+                               default: 
+                                       ret = errno;
                                        Debug( LDAP_DEBUG_ANY,
                                                "bdb2i_enter_backend() -- %s lock returned ERROR: %s\n",
-                                               writer ? "write" : "read", strerror( errno ), 0 );
-                                       ret = errno;
+                                               writer ? "write" : "read", strerror( ret ), 0 );
                                        break;
 
                        }
@@ -91,7 +91,6 @@ bdb2i_leave_backend_rw( DB_LOCK lock, int writer )
                we must have several return codes that are or'ed at the end  */
        int   ret_transaction = 0;
        int   ret_lock        = 0;
-       int   ret_chkp        = 0;
 
        /*  if we are a writer, finish the transaction  */
        if ( writer ) {
@@ -131,10 +130,10 @@ bdb2i_leave_backend_rw( DB_LOCK lock, int writer )
                                        break;
 
                                default:
+                                       ret_lock = errno;
                                        Debug( LDAP_DEBUG_ANY,
                                                "bdb2i_leave_backend() -- %s lock returned ERROR: %s\n",
-                                               writer ? "write" : "read", strerror( errno ), 0 );
-                                       ret_lock = errno;
+                                               writer ? "write" : "read", strerror( ret_lock ), 0 );
                                        break;
                        
                        }