From 48e60ae75e78bc58aeb3c7ecf6be4653152182f4 Mon Sep 17 00:00:00 2001 From: Jacques Germishuys Date: Mon, 21 Apr 2014 11:23:29 +0200 Subject: [PATCH] Don't redefine the same callback types, their signatures may change --- examples/network/fetch.c | 2 +- include/git2/indexer.h | 2 +- include/git2/odb.h | 2 +- include/git2/pack.h | 2 +- include/git2/remote.h | 6 +++--- include/git2/sys/odb_backend.h | 2 +- include/git2/transport.h | 2 +- include/git2/types.h | 2 +- src/fetch.h | 2 +- src/indexer.c | 4 ++-- src/odb.c | 2 +- src/odb_pack.c | 2 +- src/pack-objects.c | 2 +- src/transports/local.c | 4 ++-- src/transports/smart.h | 2 +- src/transports/smart_protocol.c | 4 ++-- 16 files changed, 21 insertions(+), 21 deletions(-) diff --git a/examples/network/fetch.c b/examples/network/fetch.c index fdd82a1f7..03f1541a4 100644 --- a/examples/network/fetch.c +++ b/examples/network/fetch.c @@ -97,7 +97,7 @@ int fetch(git_repository *repo, int argc, char **argv) // Set up the callbacks (only update_tips for now) callbacks.update_tips = &update_cb; - callbacks.progress = &progress_cb; + callbacks.sideband_progress = &progress_cb; callbacks.credentials = cred_acquire_cb; git_remote_set_callbacks(remote, &callbacks); diff --git a/include/git2/indexer.h b/include/git2/indexer.h index e4c03ad06..d2d315e47 100644 --- a/include/git2/indexer.h +++ b/include/git2/indexer.h @@ -32,7 +32,7 @@ GIT_EXTERN(int) git_indexer_new( const char *path, unsigned int mode, git_odb *odb, - git_transfer_progress_callback progress_cb, + git_transfer_progress_cb progress_cb, void *progress_cb_payload); /** diff --git a/include/git2/odb.h b/include/git2/odb.h index c71e30648..114f6b317 100644 --- a/include/git2/odb.h +++ b/include/git2/odb.h @@ -338,7 +338,7 @@ GIT_EXTERN(int) git_odb_open_rstream(git_odb_stream **out, git_odb *db, const gi GIT_EXTERN(int) git_odb_write_pack( git_odb_writepack **out, git_odb *db, - git_transfer_progress_callback progress_cb, + git_transfer_progress_cb progress_cb, void *progress_payload); /** diff --git a/include/git2/pack.h b/include/git2/pack.h index 29c926c65..e7f060d12 100644 --- a/include/git2/pack.h +++ b/include/git2/pack.h @@ -140,7 +140,7 @@ GIT_EXTERN(int) git_packbuilder_write( git_packbuilder *pb, const char *path, unsigned int mode, - git_transfer_progress_callback progress_cb, + git_transfer_progress_cb progress_cb, void *progress_cb_payload); /** diff --git a/include/git2/remote.h b/include/git2/remote.h index 06fc8e90d..ebd83c05a 100644 --- a/include/git2/remote.h +++ b/include/git2/remote.h @@ -457,7 +457,7 @@ struct git_remote_callbacks { * progress side-band will be passed to this function (this is * the 'counting objects' output. */ - int (*sideband_progress)(const char *str, int len, void *data); + git_transport_message_cb sideband_progress; /** * Completion is called when different parts of the download @@ -469,14 +469,14 @@ struct git_remote_callbacks { * This will be called if the remote host requires * authentication in order to connect to it. */ - int (*credentials)(git_cred **cred, const char *url, const char *username_from_url, unsigned int allowed_types, void *data); + git_cred_acquire_cb credentials; /** * During the download of new data, this will be regularly * called with the current count of progress done by the * indexer. */ - int (*transfer_progress)(const git_transfer_progress *stats, void *data); + git_transfer_progress_cb transfer_progress; /** * Each time a reference is updated locally, this function diff --git a/include/git2/sys/odb_backend.h b/include/git2/sys/odb_backend.h index 81bb082e6..77fe0dd31 100644 --- a/include/git2/sys/odb_backend.h +++ b/include/git2/sys/odb_backend.h @@ -81,7 +81,7 @@ struct git_odb_backend { int (* writepack)( git_odb_writepack **, git_odb_backend *, git_odb *odb, - git_transfer_progress_callback progress_cb, void *progress_payload); + git_transfer_progress_cb progress_cb, void *progress_payload); void (* free)(git_odb_backend *); }; diff --git a/include/git2/transport.h b/include/git2/transport.h index 1665f97b3..a33146ca8 100644 --- a/include/git2/transport.h +++ b/include/git2/transport.h @@ -287,7 +287,7 @@ struct git_transport { git_transport *transport, git_repository *repo, git_transfer_progress *stats, - git_transfer_progress_callback progress_cb, + git_transfer_progress_cb progress_cb, void *progress_payload); /* Checks to see if the transport is connected */ diff --git a/include/git2/types.h b/include/git2/types.h index 9db59b16b..1b6f4cca1 100644 --- a/include/git2/types.h +++ b/include/git2/types.h @@ -241,7 +241,7 @@ typedef struct git_transfer_progress { * @param stats Structure containing information about the state of the transfer * @param payload Payload provided by caller */ -typedef int (*git_transfer_progress_callback)(const git_transfer_progress *stats, void *payload); +typedef int (*git_transfer_progress_cb)(const git_transfer_progress *stats, void *payload); /** * Opaque structure representing a submodule. diff --git a/src/fetch.h b/src/fetch.h index 9605da1b5..f66e44663 100644 --- a/src/fetch.h +++ b/src/fetch.h @@ -17,7 +17,7 @@ int git_fetch__download_pack( git_transport *t, git_repository *repo, git_transfer_progress *stats, - git_transfer_progress_callback progress_cb, + git_transfer_progress_cb progress_cb, void *progress_payload); int git_fetch_setup_walk(git_revwalk **out, git_repository *repo); diff --git a/src/indexer.c b/src/indexer.c index 346870faa..adf5ceaa7 100644 --- a/src/indexer.c +++ b/src/indexer.c @@ -45,7 +45,7 @@ struct git_indexer { unsigned int fanout[256]; git_hash_ctx hash_ctx; git_oid hash; - git_transfer_progress_callback progress_cb; + git_transfer_progress_cb progress_cb; void *progress_payload; char objbuf[8*1024]; @@ -120,7 +120,7 @@ int git_indexer_new( const char *prefix, unsigned int mode, git_odb *odb, - git_transfer_progress_callback progress_cb, + git_transfer_progress_cb progress_cb, void *progress_payload) { git_indexer *idx; diff --git a/src/odb.c b/src/odb.c index 72d150658..00740d2e2 100644 --- a/src/odb.c +++ b/src/odb.c @@ -1051,7 +1051,7 @@ int git_odb_open_rstream(git_odb_stream **stream, git_odb *db, const git_oid *oi return error; } -int git_odb_write_pack(struct git_odb_writepack **out, git_odb *db, git_transfer_progress_callback progress_cb, void *progress_payload) +int git_odb_write_pack(struct git_odb_writepack **out, git_odb *db, git_transfer_progress_cb progress_cb, void *progress_payload) { size_t i, writes = 0; int error = GIT_ERROR; diff --git a/src/odb_pack.c b/src/odb_pack.c index 9ab683882..3750da37f 100644 --- a/src/odb_pack.c +++ b/src/odb_pack.c @@ -563,7 +563,7 @@ static void pack_backend__writepack_free(struct git_odb_writepack *_writepack) static int pack_backend__writepack(struct git_odb_writepack **out, git_odb_backend *_backend, git_odb *odb, - git_transfer_progress_callback progress_cb, + git_transfer_progress_cb progress_cb, void *progress_payload) { struct pack_backend *backend; diff --git a/src/pack-objects.c b/src/pack-objects.c index c881e6d99..7e5f667f4 100644 --- a/src/pack-objects.c +++ b/src/pack-objects.c @@ -1288,7 +1288,7 @@ int git_packbuilder_write( git_packbuilder *pb, const char *path, unsigned int mode, - git_transfer_progress_callback progress_cb, + git_transfer_progress_cb progress_cb, void *progress_cb_payload) { git_indexer *indexer; diff --git a/src/transports/local.c b/src/transports/local.c index f8d511ed6..2c17e6271 100644 --- a/src/transports/local.c +++ b/src/transports/local.c @@ -472,7 +472,7 @@ on_error: typedef struct foreach_data { git_transfer_progress *stats; - git_transfer_progress_callback progress_cb; + git_transfer_progress_cb progress_cb; void *progress_payload; git_odb_writepack *writepack; } foreach_data; @@ -489,7 +489,7 @@ static int local_download_pack( git_transport *transport, git_repository *repo, git_transfer_progress *stats, - git_transfer_progress_callback progress_cb, + git_transfer_progress_cb progress_cb, void *progress_payload) { transport_local *t = (transport_local*)transport; diff --git a/src/transports/smart.h b/src/transports/smart.h index 32f0be7f2..a2b6b2a71 100644 --- a/src/transports/smart.h +++ b/src/transports/smart.h @@ -167,7 +167,7 @@ int git_smart__download_pack( git_transport *transport, git_repository *repo, git_transfer_progress *stats, - git_transfer_progress_callback progress_cb, + git_transfer_progress_cb progress_cb, void *progress_payload); /* smart.c */ diff --git a/src/transports/smart_protocol.c b/src/transports/smart_protocol.c index 6f935173a..cf67f9078 100644 --- a/src/transports/smart_protocol.c +++ b/src/transports/smart_protocol.c @@ -450,7 +450,7 @@ static int no_sideband(transport_smart *t, struct git_odb_writepack *writepack, struct network_packetsize_payload { - git_transfer_progress_callback callback; + git_transfer_progress_cb callback; void *payload; git_transfer_progress *stats; size_t last_fired_bytes; @@ -478,7 +478,7 @@ int git_smart__download_pack( git_transport *transport, git_repository *repo, git_transfer_progress *stats, - git_transfer_progress_callback transfer_progress_cb, + git_transfer_progress_cb transfer_progress_cb, void *progress_payload) { transport_smart *t = (transport_smart *)transport;