diff options
Diffstat (limited to 'include/git2')
| -rw-r--r-- | include/git2/clone.h | 4 | ||||
| -rw-r--r-- | include/git2/indexer.h | 22 | ||||
| -rw-r--r-- | include/git2/remote.h | 4 |
3 files changed, 15 insertions, 15 deletions
diff --git a/include/git2/clone.h b/include/git2/clone.h index 847295a21..7d8d32118 100644 --- a/include/git2/clone.h +++ b/include/git2/clone.h @@ -42,7 +42,7 @@ GIT_EXTERN(int) git_clone( git_repository **out, const char *origin_url, const char *workdir_path, - git_indexer_progress_callback fetch_progress_cb, + git_transfer_progress_callback fetch_progress_cb, void *fetch_progress_payload, git_checkout_opts *checkout_opts); @@ -62,7 +62,7 @@ GIT_EXTERN(int) git_clone_bare( git_repository **out, const char *origin_url, const char *dest_path, - git_indexer_progress_callback fetch_progress_cb, + git_transfer_progress_callback fetch_progress_cb, void *fetch_progress_payload); /** @} */ diff --git a/include/git2/indexer.h b/include/git2/indexer.h index ae01fd61d..a2a155473 100644 --- a/include/git2/indexer.h +++ b/include/git2/indexer.h @@ -16,18 +16,18 @@ GIT_BEGIN_DECL * This is passed as the first argument to the callback to allow the * user to see the progress. */ -typedef struct git_indexer_stats { - unsigned int total; - unsigned int processed; - unsigned int received; - size_t bytes; -} git_indexer_stats; +typedef struct git_transfer_progress { + unsigned int total_objects; + unsigned int indexed_objects; + unsigned int received_objects; + size_t received_bytes; +} git_transfer_progress; /** * Type for progress callbacks during indexing */ -typedef void (*git_indexer_progress_callback)(const git_indexer_stats *stats, void *payload); +typedef void (*git_transfer_progress_callback)(const git_transfer_progress *stats, void *payload); typedef struct git_indexer git_indexer; typedef struct git_indexer_stream git_indexer_stream; @@ -43,7 +43,7 @@ typedef struct git_indexer_stream git_indexer_stream; GIT_EXTERN(int) git_indexer_stream_new( git_indexer_stream **out, const char *path, - git_indexer_progress_callback progress_cb, + git_transfer_progress_callback progress_cb, void *progress_callback_payload); /** @@ -54,7 +54,7 @@ GIT_EXTERN(int) git_indexer_stream_new( * @param size the size of the data * @param stats stat storage */ -GIT_EXTERN(int) git_indexer_stream_add(git_indexer_stream *idx, const void *data, size_t size, git_indexer_stats *stats); +GIT_EXTERN(int) git_indexer_stream_add(git_indexer_stream *idx, const void *data, size_t size, git_transfer_progress *stats); /** * Finalize the pack and index @@ -63,7 +63,7 @@ GIT_EXTERN(int) git_indexer_stream_add(git_indexer_stream *idx, const void *data * * @param idx the indexer */ -GIT_EXTERN(int) git_indexer_stream_finalize(git_indexer_stream *idx, git_indexer_stats *stats); +GIT_EXTERN(int) git_indexer_stream_finalize(git_indexer_stream *idx, git_transfer_progress *stats); /** * Get the packfile's hash @@ -100,7 +100,7 @@ GIT_EXTERN(int) git_indexer_new(git_indexer **out, const char *packname); * @param idx the indexer instance * @param stats storage for the running state */ -GIT_EXTERN(int) git_indexer_run(git_indexer *idx, git_indexer_stats *stats); +GIT_EXTERN(int) git_indexer_run(git_indexer *idx, git_transfer_progress *stats); /** * Write the index file to disk. diff --git a/include/git2/remote.h b/include/git2/remote.h index e23997d9a..897dfde8f 100644 --- a/include/git2/remote.h +++ b/include/git2/remote.h @@ -194,7 +194,7 @@ GIT_EXTERN(int) git_remote_ls(git_remote *remote, git_headlist_cb list_cb, void GIT_EXTERN(int) git_remote_download( git_remote *remote, git_off_t *bytes, - git_indexer_progress_callback progress_cb, + git_transfer_progress_callback progress_cb, void *progress_payload); /** @@ -325,7 +325,7 @@ GIT_EXTERN(void) git_remote_set_callbacks(git_remote *remote, git_remote_callbac /** * Get the statistics structure that is filled in by the fetch operation. */ -GIT_EXTERN(const git_indexer_stats *) git_remote_stats(git_remote *remote); +GIT_EXTERN(const git_transfer_progress *) git_remote_stats(git_remote *remote); enum { GIT_REMOTE_DOWNLOAD_TAGS_UNSET, |