ldb-hs: Properly convert some more C types

[Jelmer Vernooij]

Mon Dec  5 15:15:15 CET 2005  Jelmer Vernooij <jelmer at samba.org>
  * Properly convert some more C types

    M ./LDB.chs -7 +5
    M ./ldb.pkg -1 +1

Mon Dec  5 15:15:15 CET 2005  Jelmer Vernooij <jelmer at samba.org>
  * Properly convert some more C types
diff -rN -u old-ldb-hs/LDB.chs new-ldb-hs/LDB.chs
--- old-ldb-hs/LDB.chs	2008-05-12 01:19:03.000000000 +0200
+++ new-ldb-hs/LDB.chs	2008-05-12 01:19:03.000000000 +0200
@@ -31,10 +31,7 @@
 			rename, parseDn)
 where
 
-import Foreign
-import Foreign.Ptr
-import Foreign.C.String
-import Foreign.C.Types
+import C2HS
 import Monad
 
 {#context lib = "ldb"#}
@@ -107,10 +104,11 @@
 search :: Context -> Dn -> Scope -> String -> [String] -> IO [Message]
 search ctx dn sc expr attrs = do
 	mem <- newCString expr
-	lattrs <- undefined
-	lmsg <- undefined
+	lattrs <- undefined --FIXME
+	pmsg <- undefined -- FIXME
 	ldn <- toLDn dn
-	ret <- {#call unsafe ldb_search#} ctx ldn (fromEnum sc) mem lattrs lmsg
+	ret <- {#call unsafe ldb_search#} ctx ldn (cFromEnum sc) mem lattrs pmsg
+	lmsg <- peekArray (cIntConv ret) pmsg
 	free mem
 	return $ map fromLMessage lmsg
 
diff -rN -u old-ldb-hs/ldb.pkg new-ldb-hs/ldb.pkg
--- old-ldb-hs/ldb.pkg	2008-05-12 01:19:03.000000000 +0200
+++ new-ldb-hs/ldb.pkg	2008-05-12 01:19:03.000000000 +0200
@@ -4,7 +4,7 @@
      import_dirs     = ["${pkglibdir}/imports/ldb"],
      source_dirs     = [],
      library_dirs    = ["${pkglibdir}"],
-     hs_libraries    = [],
+     hs_libraries    = ["HSldb"],
      extra_libraries = ["ldb"],
      include_dirs    = [],
      c_includes      = ["ldb.h"],