diff --git a/Bindings/Sophia.hsc b/Bindings/Sophia.hsc --- a/Bindings/Sophia.hsc +++ b/Bindings/Sophia.hsc @@ -36,42 +36,42 @@ type Key = Ptr () type Val = Ptr () -#ccall sp_env , IO Env -#ccall sp_destroy , Handle -> IO ErrorCode -#ccall sp_open , Env -> IO Db -#ccall sp_error , Handle -> IO CString +#ccall_unsafe sp_env , IO Env +#ccall_unsafe sp_destroy , Handle -> IO ErrorCode +#ccall_unsafe sp_open , Env -> IO Db +#ccall_unsafe sp_error , Handle -> IO CString -#ccall sp_set , Db -> Key -> CSize -> Val -> CSize -> IO ErrorCode +#ccall_unsafe sp_set , Db -> Key -> CSize -> Val -> CSize -> IO ErrorCode -- Val output param must be free()'d (-1 for err, 0 not found, 1 found) -#ccall sp_get , Db -> Key -> CSize -> Ptr Val -> Ptr CSize -> IO ErrorCode -#ccall sp_delete , Db -> Key -> CSize -> IO ErrorCode +#ccall_unsafe sp_get , Db -> Key -> CSize -> Ptr Val -> Ptr CSize -> IO ErrorCode +#ccall_unsafe sp_delete , Db -> Key -> CSize -> IO ErrorCode -- Key may or may not be supplied, result must be sp_destroy'd: -#ccall sp_cursor , Db -> -> Key -> CSize -> IO Cursor +#ccall_unsafe sp_cursor , Db -> -> Key -> CSize -> IO Cursor -#ccall sp_fetch , Cursor -> IO CInt +#ccall_unsafe sp_fetch , Cursor -> IO CInt -- Apparently no need to free result key -#ccall sp_key , Cursor -> IO Key +#ccall_unsafe sp_key , Cursor -> IO Key -- 0 size on error: -#ccall sp_keysize , Cursor -> IO CSize +#ccall_unsafe sp_keysize , Cursor -> IO CSize -- Apparently no need to free result value -#ccall sp_value , Cursor -> IO Val +#ccall_unsafe sp_value , Cursor -> IO Val -- 0 size on error: -#ccall sp_valuesize , Cursor -> IO CSize +#ccall_unsafe sp_valuesize , Cursor -> IO CSize -- sp_ctl wrappers from wrappers.c: -#ccall sp_dir , Env -> Flags -> CString -> IO ErrorCode +#ccall_unsafe sp_dir , Env -> Flags -> CString -> IO ErrorCode type SpCmpF = FunPtr (CString -> CSize -> CString -> CSize -> Ptr () -> IO CInt) -#ccall sp_set_key_comparison , Env -> SpCmpF -> Ptr () -> IO ErrorCode +#ccall_unsafe sp_set_key_comparison , Env -> SpCmpF -> Ptr () -> IO ErrorCode -#ccall sp_set_keys_per_page , Env -> Word32 -> IO ErrorCode -#ccall sp_set_gc_enabled , Env -> CInt -> IO ErrorCode -#ccall sp_set_gcf , Env -> CDouble -> IO ErrorCode -#ccall sp_grow , Env -> Word32 -> CDouble -> IO ErrorCode -#ccall sp_set_merge_enabled , Env -> CInt -> IO ErrorCode -#ccall sp_set_merge_watermark , Env -> Word32 -> IO ErrorCode -#ccall sp_get_version , Env -> Ptr Word32 -> Ptr Word32 -> IO ErrorCode +#ccall_unsafe sp_set_keys_per_page , Env -> Word32 -> IO ErrorCode +#ccall_unsafe sp_set_gc_enabled , Env -> CInt -> IO ErrorCode +#ccall_unsafe sp_set_gcf , Env -> CDouble -> IO ErrorCode +#ccall_unsafe sp_grow , Env -> Word32 -> CDouble -> IO ErrorCode +#ccall_unsafe sp_set_merge_enabled , Env -> CInt -> IO ErrorCode +#ccall_unsafe sp_set_merge_watermark , Env -> Word32 -> IO ErrorCode +#ccall_unsafe sp_get_version , Env -> Ptr Word32 -> Ptr Word32 -> IO ErrorCode diff --git a/bindings-sophia.cabal b/bindings-sophia.cabal --- a/bindings-sophia.cabal +++ b/bindings-sophia.cabal @@ -1,5 +1,5 @@ name: bindings-sophia -version: 0.1.0 +version: 0.2.0 category: Database author: Eyal Lotem @@ -45,7 +45,7 @@ build-depends: base < 5, - bindings-DSL == 1.0.* + bindings-DSL >= 1.0.19 include-dirs: sophia/db