diff options
| -rw-r--r-- | include/git2/remote.h | 2 | ||||
| -rw-r--r-- | src/remote.c | 4 | ||||
| -rw-r--r-- | src/transports/smart_pkt.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/include/git2/remote.h b/include/git2/remote.h index d57321f03..06fc8e90d 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 (*progress)(const char *str, int len, void *data); + int (*sideband_progress)(const char *str, int len, void *data); /** * Completion is called when different parts of the download diff --git a/src/remote.c b/src/remote.c index 243086bf9..17104836b 100644 --- a/src/remote.c +++ b/src/remote.c @@ -663,7 +663,7 @@ int git_remote_connect(git_remote *remote, git_direction direction) return error; if (t->set_callbacks && - (error = t->set_callbacks(t, remote->callbacks.progress, NULL, remote->callbacks.payload)) < 0) + (error = t->set_callbacks(t, remote->callbacks.sideband_progress, NULL, remote->callbacks.payload)) < 0) goto on_error; if (!remote->check_cert) @@ -1246,7 +1246,7 @@ int git_remote_set_callbacks(git_remote *remote, const git_remote_callbacks *cal if (remote->transport && remote->transport->set_callbacks) return remote->transport->set_callbacks(remote->transport, - remote->callbacks.progress, + remote->callbacks.sideband_progress, NULL, remote->callbacks.payload); diff --git a/src/transports/smart_pkt.c b/src/transports/smart_pkt.c index 2bb09c750..e9376ae6f 100644 --- a/src/transports/smart_pkt.c +++ b/src/transports/smart_pkt.c @@ -153,7 +153,7 @@ static int data_pkt(git_pkt **out, const char *line, size_t len) return 0; } -static int progress_pkt(git_pkt **out, const char *line, size_t len) +static int sideband_progress_pkt(git_pkt **out, const char *line, size_t len) { git_pkt_progress *pkt; @@ -403,7 +403,7 @@ int git_pkt_parse_line( if (*line == GIT_SIDE_BAND_DATA) ret = data_pkt(head, line, len); else if (*line == GIT_SIDE_BAND_PROGRESS) - ret = progress_pkt(head, line, len); + ret = sideband_progress_pkt(head, line, len); else if (*line == GIT_SIDE_BAND_ERROR) ret = sideband_error_pkt(head, line, len); else if (!git__prefixcmp(line, "ACK")) |