Commit 98020d3a by Jacques Germishuys

Rename progress callback to sideband_progress

parent 4f62163e
...@@ -457,7 +457,7 @@ struct git_remote_callbacks { ...@@ -457,7 +457,7 @@ struct git_remote_callbacks {
* progress side-band will be passed to this function (this is * progress side-band will be passed to this function (this is
* the 'counting objects' output. * 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 * Completion is called when different parts of the download
......
...@@ -663,7 +663,7 @@ int git_remote_connect(git_remote *remote, git_direction direction) ...@@ -663,7 +663,7 @@ int git_remote_connect(git_remote *remote, git_direction direction)
return error; return error;
if (t->set_callbacks && 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; goto on_error;
if (!remote->check_cert) if (!remote->check_cert)
...@@ -1246,7 +1246,7 @@ int git_remote_set_callbacks(git_remote *remote, const git_remote_callbacks *cal ...@@ -1246,7 +1246,7 @@ int git_remote_set_callbacks(git_remote *remote, const git_remote_callbacks *cal
if (remote->transport && remote->transport->set_callbacks) if (remote->transport && remote->transport->set_callbacks)
return remote->transport->set_callbacks(remote->transport, return remote->transport->set_callbacks(remote->transport,
remote->callbacks.progress, remote->callbacks.sideband_progress,
NULL, NULL,
remote->callbacks.payload); remote->callbacks.payload);
......
...@@ -153,7 +153,7 @@ static int data_pkt(git_pkt **out, const char *line, size_t len) ...@@ -153,7 +153,7 @@ static int data_pkt(git_pkt **out, const char *line, size_t len)
return 0; 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; git_pkt_progress *pkt;
...@@ -403,7 +403,7 @@ int git_pkt_parse_line( ...@@ -403,7 +403,7 @@ int git_pkt_parse_line(
if (*line == GIT_SIDE_BAND_DATA) if (*line == GIT_SIDE_BAND_DATA)
ret = data_pkt(head, line, len); ret = data_pkt(head, line, len);
else if (*line == GIT_SIDE_BAND_PROGRESS) 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) else if (*line == GIT_SIDE_BAND_ERROR)
ret = sideband_error_pkt(head, line, len); ret = sideband_error_pkt(head, line, len);
else if (!git__prefixcmp(line, "ACK")) else if (!git__prefixcmp(line, "ACK"))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment