diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/fetch.c | 2 | ||||
| -rw-r--r-- | src/indexer.c | 16 | ||||
| -rw-r--r-- | src/odb.c | 2 | ||||
| -rw-r--r-- | src/odb_pack.c | 6 | ||||
| -rw-r--r-- | src/pack-objects.c | 6 | ||||
| -rw-r--r-- | src/remote.c | 2 | ||||
| -rw-r--r-- | src/remote.h | 2 | ||||
| -rw-r--r-- | src/transports/local.c | 10 | ||||
| -rw-r--r-- | src/transports/smart.h | 4 | ||||
| -rw-r--r-- | src/transports/smart_protocol.c | 22 |
10 files changed, 36 insertions, 36 deletions
diff --git a/src/fetch.c b/src/fetch.c index d29341b94..ea499dd41 100644 --- a/src/fetch.c +++ b/src/fetch.c @@ -134,7 +134,7 @@ int git_fetch_negotiate(git_remote *remote, const git_fetch_options *opts) int git_fetch_download_pack(git_remote *remote, const git_remote_callbacks *callbacks) { git_transport *t = remote->transport; - git_transfer_progress_cb progress = NULL; + git_indexer_progress_cb progress = NULL; void *payload = NULL; if (!remote->need_pack) diff --git a/src/indexer.c b/src/indexer.c index 6153cc2fe..0f6249aa7 100644 --- a/src/indexer.c +++ b/src/indexer.c @@ -58,7 +58,7 @@ struct git_indexer { unsigned int fanout[256]; git_hash_ctx hash_ctx; git_oid hash; - git_transfer_progress_cb progress_cb; + git_indexer_progress_cb progress_cb; void *progress_payload; char objbuf[8*1024]; @@ -544,7 +544,7 @@ on_error: return -1; } -static int do_progress_callback(git_indexer *idx, git_transfer_progress *stats) +static int do_progress_callback(git_indexer *idx, git_indexer_progress *stats) { if (idx->progress_cb) return git_error_set_after_callback_function( @@ -652,7 +652,7 @@ static int append_to_pack(git_indexer *idx, const void *data, size_t size) return write_at(idx, data, idx->pack->mwf.size, size); } -static int read_stream_object(git_indexer *idx, git_transfer_progress *stats) +static int read_stream_object(git_indexer *idx, git_indexer_progress *stats) { git_packfile_stream *stream = &idx->stream; git_off_t entry_start = idx->off; @@ -741,7 +741,7 @@ static int read_stream_object(git_indexer *idx, git_transfer_progress *stats) return 0; } -int git_indexer_append(git_indexer *idx, const void *data, size_t size, git_transfer_progress *stats) +int git_indexer_append(git_indexer *idx, const void *data, size_t size, git_indexer_progress *stats) { int error = -1; struct git_pack_header *hdr = &idx->hdr; @@ -925,7 +925,7 @@ cleanup: return error; } -static int fix_thin_pack(git_indexer *idx, git_transfer_progress *stats) +static int fix_thin_pack(git_indexer *idx, git_indexer_progress *stats) { int error, found_ref_delta = 0; unsigned int i; @@ -987,7 +987,7 @@ static int fix_thin_pack(git_indexer *idx, git_transfer_progress *stats) return 0; } -static int resolve_deltas(git_indexer *idx, git_transfer_progress *stats) +static int resolve_deltas(git_indexer *idx, git_indexer_progress *stats) { unsigned int i; int error; @@ -1044,7 +1044,7 @@ static int resolve_deltas(git_indexer *idx, git_transfer_progress *stats) return 0; } -static int update_header_and_rehash(git_indexer *idx, git_transfer_progress *stats) +static int update_header_and_rehash(git_indexer *idx, git_indexer_progress *stats) { void *ptr; size_t chunk = 1024*1024; @@ -1085,7 +1085,7 @@ static int update_header_and_rehash(git_indexer *idx, git_transfer_progress *sta return 0; } -int git_indexer_commit(git_indexer *idx, git_transfer_progress *stats) +int git_indexer_commit(git_indexer *idx, git_indexer_progress *stats) { git_mwindow *w = NULL; unsigned int i, long_offsets = 0, left; @@ -1468,7 +1468,7 @@ int git_odb_open_rstream( return error; } -int git_odb_write_pack(struct git_odb_writepack **out, git_odb *db, git_transfer_progress_cb progress_cb, void *progress_payload) +int git_odb_write_pack(struct git_odb_writepack **out, git_odb *db, git_indexer_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 beab37b7f..bd760dbe1 100644 --- a/src/odb_pack.c +++ b/src/odb_pack.c @@ -485,7 +485,7 @@ static int pack_backend__foreach(git_odb_backend *_backend, git_odb_foreach_cb c return 0; } -static int pack_backend__writepack_append(struct git_odb_writepack *_writepack, const void *data, size_t size, git_transfer_progress *stats) +static int pack_backend__writepack_append(struct git_odb_writepack *_writepack, const void *data, size_t size, git_indexer_progress *stats) { struct pack_writepack *writepack = (struct pack_writepack *)_writepack; @@ -494,7 +494,7 @@ static int pack_backend__writepack_append(struct git_odb_writepack *_writepack, return git_indexer_append(writepack->indexer, data, size, stats); } -static int pack_backend__writepack_commit(struct git_odb_writepack *_writepack, git_transfer_progress *stats) +static int pack_backend__writepack_commit(struct git_odb_writepack *_writepack, git_indexer_progress *stats) { struct pack_writepack *writepack = (struct pack_writepack *)_writepack; @@ -516,7 +516,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_cb progress_cb, + git_indexer_progress_cb progress_cb, void *progress_payload) { git_indexer_options opts = GIT_INDEXER_OPTIONS_INIT; diff --git a/src/pack-objects.c b/src/pack-objects.c index b2e2457d1..32f51a3fd 100644 --- a/src/pack-objects.c +++ b/src/pack-objects.c @@ -38,7 +38,7 @@ struct tree_walk_context { struct pack_write_context { git_indexer *indexer; - git_transfer_progress *stats; + git_indexer_progress *stats; }; struct walk_object { @@ -1379,12 +1379,12 @@ int git_packbuilder_write( git_packbuilder *pb, const char *path, unsigned int mode, - git_transfer_progress_cb progress_cb, + git_indexer_progress_cb progress_cb, void *progress_cb_payload) { git_indexer_options opts = GIT_INDEXER_OPTIONS_INIT; git_indexer *indexer; - git_transfer_progress stats; + git_indexer_progress stats; struct pack_write_context ctx; int t; diff --git a/src/remote.c b/src/remote.c index 2f0b8c5ee..3d5555658 100644 --- a/src/remote.c +++ b/src/remote.c @@ -1770,7 +1770,7 @@ int git_remote_list(git_strarray *remotes_list, git_repository *repo) return 0; } -const git_transfer_progress* git_remote_stats(git_remote *remote) +const git_indexer_progress *git_remote_stats(git_remote *remote) { assert(remote); return &remote->stats; diff --git a/src/remote.h b/src/remote.h index 62bd1d2ae..15f8d3012 100644 --- a/src/remote.h +++ b/src/remote.h @@ -29,7 +29,7 @@ struct git_remote { git_transport *transport; git_repository *repo; git_push *push; - git_transfer_progress stats; + git_indexer_progress stats; unsigned int need_pack; git_remote_autotag_option_t download_tags; int prune_refs; diff --git a/src/transports/local.c b/src/transports/local.c index b544491ef..c8b4291f0 100644 --- a/src/transports/local.c +++ b/src/transports/local.c @@ -325,7 +325,7 @@ static int local_push_update_remote_ref( return error; } -static int transfer_to_push_transfer(const git_transfer_progress *stats, void *payload) +static int transfer_to_push_transfer(const git_indexer_progress *stats, void *payload) { const git_remote_callbacks *cbs = payload; @@ -460,8 +460,8 @@ on_error: } typedef struct foreach_data { - git_transfer_progress *stats; - git_transfer_progress_cb progress_cb; + git_indexer_progress *stats; + git_indexer_progress_cb progress_cb; void *progress_payload; git_odb_writepack *writepack; } foreach_data; @@ -533,8 +533,8 @@ static int foreach_reference_cb(git_reference *reference, void *payload) static int local_download_pack( git_transport *transport, git_repository *repo, - git_transfer_progress *stats, - git_transfer_progress_cb progress_cb, + git_indexer_progress *stats, + git_indexer_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 abf80286b..53e9773e1 100644 --- a/src/transports/smart.h +++ b/src/transports/smart.h @@ -177,8 +177,8 @@ int git_smart__negotiate_fetch( int git_smart__download_pack( git_transport *transport, git_repository *repo, - git_transfer_progress *stats, - git_transfer_progress_cb progress_cb, + git_indexer_progress *stats, + git_indexer_progress_cb progress_cb, void *progress_payload); /* smart.c */ diff --git a/src/transports/smart_protocol.c b/src/transports/smart_protocol.c index 2d8a1d83f..a7add0227 100644 --- a/src/transports/smart_protocol.c +++ b/src/transports/smart_protocol.c @@ -492,7 +492,7 @@ on_error: return error; } -static int no_sideband(transport_smart *t, struct git_odb_writepack *writepack, gitno_buffer *buf, git_transfer_progress *stats) +static int no_sideband(transport_smart *t, struct git_odb_writepack *writepack, gitno_buffer *buf, git_indexer_progress *stats) { int recvd; @@ -519,9 +519,9 @@ static int no_sideband(transport_smart *t, struct git_odb_writepack *writepack, struct network_packetsize_payload { - git_transfer_progress_cb callback; + git_indexer_progress_cb callback; void *payload; - git_transfer_progress *stats; + git_indexer_progress *stats; size_t last_fired_bytes; }; @@ -546,8 +546,8 @@ static int network_packetsize(size_t received, void *payload) int git_smart__download_pack( git_transport *transport, git_repository *repo, - git_transfer_progress *stats, - git_transfer_progress_cb transfer_progress_cb, + git_indexer_progress *stats, + git_indexer_progress_cb progress_cb, void *progress_payload) { transport_smart *t = (transport_smart *)transport; @@ -557,10 +557,10 @@ int git_smart__download_pack( int error = 0; struct network_packetsize_payload npp = {0}; - memset(stats, 0, sizeof(git_transfer_progress)); + memset(stats, 0, sizeof(git_indexer_progress)); - if (transfer_progress_cb) { - npp.callback = transfer_progress_cb; + if (progress_cb) { + npp.callback = progress_cb; npp.payload = progress_payload; npp.stats = stats; t->packetsize_cb = &network_packetsize; @@ -573,7 +573,7 @@ int git_smart__download_pack( } if ((error = git_repository_odb__weakptr(&odb, repo)) < 0 || - ((error = git_odb_write_pack(&writepack, odb, transfer_progress_cb, progress_payload)) != 0)) + ((error = git_odb_write_pack(&writepack, odb, progress_cb, progress_payload)) != 0)) goto done; /* @@ -626,7 +626,7 @@ int git_smart__download_pack( } while (1); /* - * Trailing execution of transfer_progress_cb, if necessary... + * Trailing execution of progress_cb, if necessary... * Only the callback through the npp datastructure currently * updates the last_fired_bytes value. It is possible that * progress has already been reported with the correct @@ -645,7 +645,7 @@ int git_smart__download_pack( done: if (writepack) writepack->free(writepack); - if (transfer_progress_cb) { + if (progress_cb) { t->packetsize_cb = NULL; t->packetsize_payload = NULL; } |