[elephant-cvs] CVS elephant/src/db-bdb

[ieslick]

Update of /project/elephant/cvsroot/elephant/src/db-bdb
In directory clnet:/tmp/cvs-serv12829/src/db-bdb

Modified Files:
	sleepycat.lisp 
Log Message:
Minor edits only, checkpointing after unrolling some experiments.


--- /project/elephant/cvsroot/elephant/src/db-bdb/sleepycat.lisp	2006/09/05 03:23:16	1.7
+++ /project/elephant/cvsroot/elephant/src/db-bdb/sleepycat.lisp	2006/11/10 01:48:49	1.8
@@ -50,40 +50,28 @@
 ;;
 
 (eval-when (:compile-toplevel :load-toplevel)
-
-  ;;
-  ;; Under Linux we need pthreads!
-  ;;
-
   #+linux
-  (unless 
-      (uffi:load-foreign-library 
+  (unless
+      (uffi:load-foreign-library
        elephant::*sleepycat-pthreads-path*
        :module "pthread")
-    (error "Couldn't load libpthread!"))
-
-  ;; 
-  ;; Our interface library requires that the main Berkeley DB library be loaded
-  ;;
+    (error "Couldn't load pthread"))
 
   (unless
       (uffi:load-foreign-library 
        elephant::*sleepycat-foreign-library-path*
        :module "sleepycat")
-    (error "Couldn't load libdb (Sleepycat)!"))
-
-  ;; 
-  ;; Our local interface library
-  ;;
+     (error "Couldn't load libdb (Sleepycat)!"))
 
   (unless
       (uffi:load-foreign-library 
-       (merge-pathnames 
+       (merge-pathnames
 	(make-pathname :name "libsleepycat" :type *c-library-extension*)
-	(merge-pathnames "src/db-bdb/"
+	(merge-pathnames "src/db-bdb/" 
 			 (asdf:component-pathname (asdf:find-system 'elephant))))
        :module "libsleepycat")
-    (error "Couldn't load src/db-bdb/libsleepycat.~A!" elephant-memutil::*c-library-extension*))
+     (error "Couldn't load libdb (Sleepycat)!")))
+
 
   ;; Error handling 
   ;; I put this here so we could validate that the library was loaded
@@ -104,7 +92,6 @@
        (format stream "Berkeley DB error: ~A"
 	       (db-strerror (db-error-errno condition)))))
     (:documentation "Berkeley DB / Sleepycat errors."))
-  )
 
 ;;
 ;; Constants and Flags