summaryrefslogtreecommitdiff
path: root/include/git2
diff options
context:
space:
mode:
authorEdward Thomson <ethomson@edwardthomson.com>2019-02-21 10:33:30 +0000
committerEdward Thomson <ethomson@edwardthomson.com>2019-02-22 11:25:14 +0000
commita1ef995dc03379fb1f5151b5d98d16644218c95e (patch)
treef209958f5f27dfbe3dc2da296c801563a348cce4 /include/git2
parent975d6722a5c203427ab63789d329c00b76461225 (diff)
downloadlibgit2-a1ef995dc03379fb1f5151b5d98d16644218c95e.tar.gz
indexer: use git_indexer_progress throughout
Update internal usage of `git_transfer_progress` to `git_indexer_progreses`.
Diffstat (limited to 'include/git2')
-rw-r--r--include/git2/indexer.h6
-rw-r--r--include/git2/odb.h2
-rw-r--r--include/git2/odb_backend.h4
-rw-r--r--include/git2/pack.h2
-rw-r--r--include/git2/remote.h4
-rw-r--r--include/git2/sys/odb_backend.h2
-rw-r--r--include/git2/sys/transport.h4
7 files changed, 12 insertions, 12 deletions
diff --git a/include/git2/indexer.h b/include/git2/indexer.h
index a65d9d710..094a12b1f 100644
--- a/include/git2/indexer.h
+++ b/include/git2/indexer.h
@@ -64,7 +64,7 @@ typedef struct git_indexer_options {
unsigned int version;
/** progress_cb function to call with progress information */
- git_transfer_progress_cb progress_cb;
+ git_indexer_progress_cb progress_cb;
/** progress_cb_payload payload for the progress callback */
void *progress_cb_payload;
@@ -114,7 +114,7 @@ GIT_EXTERN(int) git_indexer_new(
* @param size the size of the data in bytes
* @param stats stat storage
*/
-GIT_EXTERN(int) git_indexer_append(git_indexer *idx, const void *data, size_t size, git_transfer_progress *stats);
+GIT_EXTERN(int) git_indexer_append(git_indexer *idx, const void *data, size_t size, git_indexer_progress *stats);
/**
* Finalize the pack and index
@@ -123,7 +123,7 @@ GIT_EXTERN(int) git_indexer_append(git_indexer *idx, const void *data, size_t si
*
* @param idx the indexer
*/
-GIT_EXTERN(int) git_indexer_commit(git_indexer *idx, git_transfer_progress *stats);
+GIT_EXTERN(int) git_indexer_commit(git_indexer *idx, git_indexer_progress *stats);
/**
* Get the packfile's hash
diff --git a/include/git2/odb.h b/include/git2/odb.h
index 0008eee20..de6010647 100644
--- a/include/git2/odb.h
+++ b/include/git2/odb.h
@@ -391,7 +391,7 @@ GIT_EXTERN(int) git_odb_open_rstream(
GIT_EXTERN(int) git_odb_write_pack(
git_odb_writepack **out,
git_odb *db,
- git_transfer_progress_cb progress_cb,
+ git_indexer_progress_cb progress_cb,
void *progress_payload);
/**
diff --git a/include/git2/odb_backend.h b/include/git2/odb_backend.h
index 614d0d431..8d1401a49 100644
--- a/include/git2/odb_backend.h
+++ b/include/git2/odb_backend.h
@@ -124,8 +124,8 @@ struct git_odb_stream {
struct git_odb_writepack {
git_odb_backend *backend;
- int GIT_CALLBACK(append)(git_odb_writepack *writepack, const void *data, size_t size, git_transfer_progress *stats);
- int GIT_CALLBACK(commit)(git_odb_writepack *writepack, git_transfer_progress *stats);
+ int GIT_CALLBACK(append)(git_odb_writepack *writepack, const void *data, size_t size, git_indexer_progress *stats);
+ int GIT_CALLBACK(commit)(git_odb_writepack *writepack, git_indexer_progress *stats);
void GIT_CALLBACK(free)(git_odb_writepack *writepack);
};
diff --git a/include/git2/pack.h b/include/git2/pack.h
index beb9f4b9e..de29831c2 100644
--- a/include/git2/pack.h
+++ b/include/git2/pack.h
@@ -165,7 +165,7 @@ GIT_EXTERN(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);
/**
diff --git a/include/git2/remote.h b/include/git2/remote.h
index 0b6e92a9e..df25e04b7 100644
--- a/include/git2/remote.h
+++ b/include/git2/remote.h
@@ -516,7 +516,7 @@ struct git_remote_callbacks {
* called with the current count of progress done by the
* indexer.
*/
- git_transfer_progress_cb transfer_progress;
+ git_indexer_progress_cb transfer_progress;
/**
* Each time a reference is updated locally, this function
@@ -832,7 +832,7 @@ GIT_EXTERN(int) git_remote_push(git_remote *remote,
/**
* Get the statistics structure that is filled in by the fetch operation.
*/
-GIT_EXTERN(const git_transfer_progress *) git_remote_stats(git_remote *remote);
+GIT_EXTERN(const git_indexer_progress *) git_remote_stats(git_remote *remote);
/**
* Retrieve the tag auto-follow setting
diff --git a/include/git2/sys/odb_backend.h b/include/git2/sys/odb_backend.h
index 1a747570d..bc2af120c 100644
--- a/include/git2/sys/odb_backend.h
+++ b/include/git2/sys/odb_backend.h
@@ -82,7 +82,7 @@ struct git_odb_backend {
int GIT_CALLBACK(writepack)(
git_odb_writepack **, git_odb_backend *, git_odb *odb,
- git_transfer_progress_cb progress_cb, void *progress_payload);
+ git_indexer_progress_cb progress_cb, void *progress_payload);
/**
* "Freshens" an already existing object, updating its last-used
diff --git a/include/git2/sys/transport.h b/include/git2/sys/transport.h
index 2a2f3c19a..d7c7313af 100644
--- a/include/git2/sys/transport.h
+++ b/include/git2/sys/transport.h
@@ -98,8 +98,8 @@ struct git_transport {
int GIT_CALLBACK(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);
/** Checks to see if the transport is connected */