diff options
| author | Jacques Germishuys <jacquesg@striata.com> | 2014-04-21 11:23:29 +0200 |
|---|---|---|
| committer | Jacques Germishuys <jacquesg@striata.com> | 2014-04-21 11:28:49 +0200 |
| commit | 48e60ae75e78bc58aeb3c7ecf6be4653152182f4 (patch) | |
| tree | 87c8911d80712458e49565c9250aa5e84e085060 /src/transports | |
| parent | 98020d3a73743d79c6acd380339b1d743205a86b (diff) | |
| download | libgit2-48e60ae75e78bc58aeb3c7ecf6be4653152182f4.tar.gz | |
Don't redefine the same callback types, their signatures may change
Diffstat (limited to 'src/transports')
| -rw-r--r-- | src/transports/local.c | 4 | ||||
| -rw-r--r-- | src/transports/smart.h | 2 | ||||
| -rw-r--r-- | src/transports/smart_protocol.c | 4 |
3 files changed, 5 insertions, 5 deletions
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; |