remove gcc warnings and cleanup inline mess

[netatalk.git] / libatalk / cnid / db3 / cnid_db3_open.c

diff --git a/libatalk/cnid/db3/cnid_db3_open.c b/libatalk/cnid/db3/cnid_db3_open.c
index c4aed39d152618de8955fce8d72e3a1ab51e98d0..c7c1eb1b210b7d9af63613117ceeac935d4a3f74 100644 (file)
--- a/libatalk/cnid/db3/cnid_db3_open.c
+++ b/libatalk/cnid/db3/cnid_db3_open.c
@@ -1,6 +1,6 @@
 
 /*
- * $Id: cnid_db3_open.c,v 1.1.4.3 2004-01-10 06:25:18 bfernhomberg Exp $
+ * $Id: cnid_db3_open.c,v 1.1.4.4.2.1 2008-11-25 15:16:34 didg Exp $
  *
  * Copyright (c) 1999. Adrian Sun (asun@zoology.washington.edu)
  * All Rights Reserved. See COPYRIGHT.
@@ -142,7 +142,7 @@ static int my_open(DB * p, const char *f, const char *d, DBTYPE t, u_int32_t fla
 /* --------------- */
 
 /* the first compare that's always done. */
-static __inline__ int compare_did(const DBT * a, const DBT * b)
+static int compare_did(const DBT * a, const DBT * b)
 {
     u_int32_t dida, didb;
 
@@ -322,6 +322,9 @@ struct _cnid_db *cnid_db3_open(const char *dir, mode_t mask)
     path[len + DBHOMELEN] = '\0';
     open_flag = DB_CREATE;
 
+    /* Print out the version of BDB we're linked against. */
+    LOG(log_info, logtype_default, "CNID DB initializing using %s", db_version(NULL, NULL, NULL));
+
     /* We need to be able to open the database environment with full
      * transaction, logging, and locking support if we ever hope to 
      * be a true multi-acess file server. */
@@ -471,8 +474,6 @@ struct _cnid_db *cnid_db3_open(const char *dir, mode_t mask)
         goto fail_appinit;
     }
 
-    /* Print out the version of BDB we're linked against. */
-    LOG(log_info, logtype_default, "CNID DB initialized using %s", db_version(NULL, NULL, NULL));
 #if 0
     db_env_set_func_yield(my_yield);
 #endif