summaryrefslogtreecommitdiff
path: root/include/git2
diff options
context:
space:
mode:
authorCarlos Martín Nieto <cmn@dwim.me>2013-10-23 15:45:29 +0200
committerCarlos Martín Nieto <cmn@dwim.me>2013-10-23 15:45:29 +0200
commit5cb136705d7db2822357582d5b726c91ca044b24 (patch)
tree8e8e7a3a55169266e7eaf6f5034c68aebe1c3951 /include/git2
parent1c74686e05c41c30944173bacec3a8312f08cbb5 (diff)
downloadlibgit2-5cb136705d7db2822357582d5b726c91ca044b24.tar.gz
transport: let the progress output return an error
There are any number of issues that can come up in the progress callback, and we should let the user cancel at that point as well.
Diffstat (limited to 'include/git2')
-rw-r--r--include/git2/remote.h2
-rw-r--r--include/git2/transport.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/git2/remote.h b/include/git2/remote.h
index 9858634cc..f4cd1cbfa 100644
--- a/include/git2/remote.h
+++ b/include/git2/remote.h
@@ -410,7 +410,7 @@ struct git_remote_callbacks {
* progress side-band will be passed to this function (this is
* the 'counting objects' output.
*/
- void (*progress)(const char *str, int len, void *data);
+ int (*progress)(const char *str, int len, void *data);
/**
* Completion is called when different parts of the download
diff --git a/include/git2/transport.h b/include/git2/transport.h
index 065b31820..b9fda80ba 100644
--- a/include/git2/transport.h
+++ b/include/git2/transport.h
@@ -170,7 +170,7 @@ typedef enum {
GIT_TRANSPORTFLAGS_NO_CHECK_CERT = 1
} git_transport_flags_t;
-typedef void (*git_transport_message_cb)(const char *str, int len, void *data);
+typedef int (*git_transport_message_cb)(const char *str, int len, void *data);
typedef struct git_transport git_transport;