diff --git a/Bindings/Libgit2/Attr.hsc b/Bindings/Libgit2/Attr.hsc --- a/Bindings/Libgit2/Attr.hsc +++ b/Bindings/Libgit2/Attr.hsc @@ -13,6 +13,7 @@ #ccall git_attr_get , Ptr (CString) -> Ptr -> CUInt -> CString -> CString -> IO (CInt) #ccall git_attr_get_many , Ptr (CString) -> Ptr -> CUInt -> CString -> CSize -> Ptr (CString) -> IO (CInt) -#ccall git_attr_foreach , Ptr -> CUInt -> CString -> FunPtr (CString -> CString -> Ptr () -> CInt) -> Ptr () -> IO (CInt) +#callback git_attr_foreach_callback , CString -> CString -> Ptr () -> IO CInt +#ccall git_attr_foreach , Ptr -> CUInt -> CString -> -> Ptr () -> IO (CInt) #ccall git_attr_cache_flush , Ptr -> IO () #ccall git_attr_add_macro , Ptr -> CString -> CString -> IO (CInt) diff --git a/Bindings/Libgit2/Config.hsc b/Bindings/Libgit2/Config.hsc --- a/Bindings/Libgit2/Config.hsc +++ b/Bindings/Libgit2/Config.hsc @@ -29,16 +29,26 @@ void * data); void (* free)(struct git_config_file *); }; -} +#callback git_config_open_callback , Ptr -> IO CInt +#callback git_config_get_callback , Ptr -> CString -> Ptr (CString) -> IO CInt +#callback git_config_get_multivar_inner_callback , CString -> Ptr () -> IO CInt +#callback git_config_get_multivar_callback , Ptr -> CString -> CString -> -> Ptr () -> IO CInt +#callback git_config_set_callback , Ptr -> CString -> CString -> IO CInt +#callback git_config_set_multivar_callback , Ptr -> CString -> CString -> CString -> IO CInt +#callback git_config_del_callback , Ptr -> CString -> IO CInt +#callback git_config_foreach_inner_callback , CString -> CString -> Ptr () -> IO CInt +#callback git_config_foreach_callback , Ptr -> -> Ptr () -> IO CInt +#callback git_config_free_callback , Ptr -> IO () #starttype git_config_file #field cfg , Ptr -#field open , FunPtr (Ptr -> CInt) -#field get , FunPtr (Ptr -> CString -> Ptr (CString) -> CInt) -#field get_multivar , FunPtr (Ptr -> CString -> CString -> FunPtr (CString -> Ptr () -> CInt) -> Ptr () -> CInt) -#field set , FunPtr (Ptr -> CString -> CString -> CInt) -#field set_multivar , FunPtr (Ptr -> CString -> CString -> CString -> CInt) -#field del , FunPtr (Ptr -> CString -> CInt) -#field foreach , FunPtr (Ptr -> FunPtr (CString -> CString -> Ptr () -> CInt) -> Ptr () -> CInt) -#field free , FunPtr (Ptr ) +#field open , +#field get , +#field get_multivar , +#field set , +#field set_multivar , +#field del , +#field foreach , +#field free , #stoptype {- typedef enum { GIT_CVAR_FALSE = 0, @@ -72,12 +82,12 @@ #ccall git_config_get_int64 , Ptr CLong -> Ptr -> CString -> IO (CInt) #ccall git_config_get_bool , Ptr CInt -> Ptr -> CString -> IO (CInt) #ccall git_config_get_string , Ptr (CString) -> Ptr -> CString -> IO (CInt) -#ccall git_config_get_multivar , Ptr -> CString -> CString -> FunPtr (CString -> Ptr () -> CInt) -> Ptr () -> IO (CInt) +#ccall git_config_get_multivar , Ptr -> CString -> CString -> -> Ptr () -> IO (CInt) #ccall git_config_set_int32 , Ptr -> CString -> CInt -> IO (CInt) #ccall git_config_set_int64 , Ptr -> CString -> CLong -> IO (CInt) #ccall git_config_set_bool , Ptr -> CString -> CInt -> IO (CInt) #ccall git_config_set_string , Ptr -> CString -> CString -> IO (CInt) #ccall git_config_set_multivar , Ptr -> CString -> CString -> CString -> IO (CInt) #ccall git_config_delete , Ptr -> CString -> IO (CInt) -#ccall git_config_foreach , Ptr -> FunPtr (CString -> CString -> Ptr () -> CInt) -> Ptr () -> IO (CInt) +#ccall git_config_foreach , Ptr -> -> Ptr () -> IO (CInt) #ccall git_config_get_mapped , Ptr CInt -> Ptr -> CString -> Ptr -> CSize -> IO (CInt) diff --git a/Bindings/Libgit2/Notes.hsc b/Bindings/Libgit2/Notes.hsc --- a/Bindings/Libgit2/Notes.hsc +++ b/Bindings/Libgit2/Notes.hsc @@ -19,4 +19,5 @@ #field blob_oid , #field annotated_object_oid , #stoptype -#ccall git_note_foreach , Ptr -> CString -> FunPtr (Ptr -> Ptr () -> CInt) -> Ptr () -> IO (CInt) +#callback git_note_foreach_callback , Ptr -> Ptr () -> IO CInt +#ccall git_note_foreach , Ptr -> CString -> -> Ptr () -> IO (CInt) diff --git a/Bindings/Libgit2/OdbBackend.hsc b/Bindings/Libgit2/OdbBackend.hsc --- a/Bindings/Libgit2/OdbBackend.hsc +++ b/Bindings/Libgit2/OdbBackend.hsc @@ -39,16 +39,24 @@ int (* exists)(struct git_odb_backend *, const git_oid *); void (* free)(struct git_odb_backend *); }; -} +#callback git_odb_backend_read_callback , Ptr (Ptr ()) -> Ptr CSize -> Ptr -> Ptr -> Ptr -> IO CInt +#callback git_odb_backend_read_prefix_callback , Ptr -> Ptr (Ptr ()) -> Ptr CSize -> Ptr -> Ptr -> Ptr -> CUInt -> IO CInt +#callback git_odb_backend_read_header_callback , Ptr CSize -> Ptr -> Ptr -> Ptr -> IO CInt +#callback git_odb_backend_write_callback , Ptr -> Ptr -> Ptr () -> CSize -> -> IO CInt +#callback git_odb_backend_writestream_callback , Ptr (Ptr ) -> Ptr -> CSize -> -> IO CInt +#callback git_odb_backend_readstream_callback , Ptr (Ptr ) -> Ptr -> Ptr -> IO CInt +#callback git_odb_backend_exists_callback , Ptr -> Ptr -> IO CInt +#callback git_odb_backend_free_callback , Ptr -> IO () #starttype git_odb_backend #field odb , Ptr -#field read , FunPtr (Ptr (Ptr ()) -> Ptr CSize -> Ptr -> Ptr -> Ptr -> CInt) -#field read_prefix , FunPtr (Ptr -> Ptr (Ptr ()) -> Ptr CSize -> Ptr -> Ptr -> Ptr -> CUInt -> CInt) -#field read_header , FunPtr (Ptr CSize -> Ptr -> Ptr -> Ptr -> CInt) -#field write , FunPtr (Ptr -> Ptr -> Ptr () -> CSize -> -> CInt) -#field writestream , FunPtr (Ptr (Ptr ) -> Ptr -> CSize -> -> CInt) -#field readstream , FunPtr (Ptr (Ptr ) -> Ptr -> Ptr -> CInt) -#field exists , FunPtr (Ptr -> Ptr -> CInt) -#field free , FunPtr (Ptr ) +#field read , +#field read_prefix , +#field read_header , +#field write , +#field writestream , +#field readstream , +#field exists , +#field free , #stoptype {- enum { GIT_STREAM_RDONLY = 1 << 1, @@ -71,13 +79,17 @@ struct git_odb_stream * stream); void (* free)(struct git_odb_stream * stream); }; -} +#callback git_odb_stream_read_callback , Ptr -> CString -> CSize -> IO CInt +#callback git_odb_stream_write_callback , Ptr -> CString -> CSize -> IO CInt +#callback git_odb_stream_finalize_write_callback , Ptr -> Ptr -> IO CInt +#callback git_odb_stream_free_callback , Ptr -> IO () #starttype git_odb_stream #field backend , Ptr #field mode , CInt -#field read , FunPtr (Ptr -> CString -> CSize -> CInt) -#field write , FunPtr (Ptr -> CString -> CSize -> CInt) -#field finalize_write , FunPtr (Ptr -> Ptr -> CInt) -#field free , FunPtr (Ptr ) +#field read , +#field write , +#field finalize_write , +#field free , #stoptype #ccall git_odb_backend_pack , Ptr (Ptr ) -> CString -> IO (CInt) #ccall git_odb_backend_loose , Ptr (Ptr ) -> CString -> CInt -> CInt -> IO (CInt) diff --git a/Bindings/Libgit2/Refs.hsc b/Bindings/Libgit2/Refs.hsc --- a/Bindings/Libgit2/Refs.hsc +++ b/Bindings/Libgit2/Refs.hsc @@ -22,7 +22,8 @@ #ccall git_reference_delete , Ptr -> IO (CInt) #ccall git_reference_packall , Ptr -> IO (CInt) #ccall git_reference_list , Ptr -> Ptr -> CUInt -> IO (CInt) -#ccall git_reference_foreach , Ptr -> CUInt -> FunPtr (CString -> Ptr () -> CInt) -> Ptr () -> IO (CInt) +#callback git_reference_foreach_callback , CString -> Ptr () -> IO CInt +#ccall git_reference_foreach , Ptr -> CUInt -> -> Ptr () -> IO (CInt) #ccall git_reference_is_packed , Ptr -> IO (CInt) #ccall git_reference_reload , Ptr -> IO (CInt) #ccall git_reference_free , Ptr -> IO () diff --git a/Bindings/Libgit2/Remote.hsc b/Bindings/Libgit2/Remote.hsc --- a/Bindings/Libgit2/Remote.hsc +++ b/Bindings/Libgit2/Remote.hsc @@ -25,7 +25,8 @@ #ccall git_remote_connected , Ptr -> IO (CInt) #ccall git_remote_disconnect , Ptr -> IO () #ccall git_remote_free , Ptr -> IO () -#ccall git_remote_update_tips , Ptr -> FunPtr (CString -> Ptr -> Ptr -> CInt) -> IO (CInt) +#callback git_remote_update_tips_callback , CString -> Ptr -> Ptr -> IO CInt +#ccall git_remote_update_tips , Ptr -> -> IO (CInt) #ccall git_remote_valid_url , CString -> IO (CInt) #ccall git_remote_supported_url , CString -> IO (CInt) #ccall git_remote_list , Ptr -> Ptr -> IO (CInt) diff --git a/Bindings/Libgit2/Status.hsc b/Bindings/Libgit2/Status.hsc --- a/Bindings/Libgit2/Status.hsc +++ b/Bindings/Libgit2/Status.hsc @@ -23,7 +23,8 @@ #num GIT_STATUS_WT_MODIFIED #num GIT_STATUS_WT_DELETED #num GIT_STATUS_IGNORED -#ccall git_status_foreach , Ptr -> FunPtr (CString -> CUInt -> Ptr () -> CInt) -> Ptr () -> IO (CInt) +#callback git_status_foreach_callback , CString -> CUInt -> Ptr () -> IO CInt +#ccall git_status_foreach , Ptr -> -> Ptr () -> IO (CInt) {- typedef enum { GIT_STATUS_SHOW_INDEX_AND_WORKDIR = 0, GIT_STATUS_SHOW_INDEX_ONLY = 1, @@ -55,6 +56,7 @@ #field flags , CUInt #field pathspec , #stoptype -#ccall git_status_foreach_ext , Ptr -> Ptr -> FunPtr (CString -> CUInt -> Ptr () -> CInt) -> Ptr () -> IO (CInt) +#callback git_status_foreach_ext_callback , CString -> CUInt -> Ptr () -> IO CInt +#ccall git_status_foreach_ext , Ptr -> Ptr -> -> Ptr () -> IO (CInt) #ccall git_status_file , Ptr CUInt -> Ptr -> CString -> IO (CInt) #ccall git_status_should_ignore , Ptr CInt -> Ptr -> CString -> IO (CInt) diff --git a/Bindings/Libgit2/Submodule.hsc b/Bindings/Libgit2/Submodule.hsc --- a/Bindings/Libgit2/Submodule.hsc +++ b/Bindings/Libgit2/Submodule.hsc @@ -46,5 +46,6 @@ #field fetch_recurse , CInt #field refcount , CInt #stoptype -#ccall git_submodule_foreach , Ptr -> FunPtr (CString -> Ptr () -> CInt) -> Ptr () -> IO (CInt) +#callback git_submodule_foreach_callback , CString -> Ptr () -> IO CInt +#ccall git_submodule_foreach , Ptr -> -> Ptr () -> IO (CInt) #ccall git_submodule_lookup , Ptr (Ptr ) -> Ptr -> CString -> IO (CInt) diff --git a/Bindings/Libgit2/Tree.hsc b/Bindings/Libgit2/Tree.hsc --- a/Bindings/Libgit2/Tree.hsc +++ b/Bindings/Libgit2/Tree.hsc @@ -27,7 +27,8 @@ #ccall git_treebuilder_get , Ptr -> CString -> IO (Ptr ) #ccall git_treebuilder_insert , Ptr (Ptr ) -> Ptr -> CString -> Ptr -> CUInt -> IO (CInt) #ccall git_treebuilder_remove , Ptr -> CString -> IO (CInt) -#ccall git_treebuilder_filter , Ptr -> FunPtr (Ptr -> Ptr () -> CInt) -> Ptr () -> IO () +#callback git_treebuilder_filter_callback , Ptr -> Ptr () -> IO CInt +#ccall git_treebuilder_filter , Ptr -> -> Ptr () -> IO () #ccall git_treebuilder_write , Ptr -> Ptr -> Ptr -> IO (CInt) #ccall git_tree_get_subtree , Ptr (Ptr ) -> Ptr -> CString -> IO (CInt) {- typedef int (* git_treewalk_cb)(const char * root, diff --git a/hlibgit2.cabal b/hlibgit2.cabal --- a/hlibgit2.cabal +++ b/hlibgit2.cabal @@ -1,5 +1,5 @@ Name: hlibgit2 -Version: 0.17.0.1 +Version: 0.17.0.2 Synopsis: Low-level bindings to libgit2. Description: Bindings to libgit2 v0.17.0 License-file: LICENSE