diff options
| author | Vicent Marti <tanoku@gmail.com> | 2012-08-02 03:38:30 +0400 |
|---|---|---|
| committer | Vicent Marti <tanoku@gmail.com> | 2012-08-02 03:38:30 +0400 |
| commit | e25dda51c4dc47ed99f95dae6486c6275b119484 (patch) | |
| tree | 183114622aa2dfeb224b550a07050f26cd9a0732 /src/netops.c | |
| parent | 95a1d876148ff2e09c13537c60e1dc7e10ea9295 (diff) | |
| parent | b8457baae24269c9fb777591e2a0e1b425ba31b6 (diff) | |
Merge remote-tracking branch 'nulltoken/topic/amd64-compat' into development
Conflicts:
src/netops.c
src/netops.h
src/oid.c
Diffstat (limited to 'src/netops.c')
| -rw-r--r-- | src/netops.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/netops.c b/src/netops.c index 72c1757f2..49a0308bb 100644 --- a/src/netops.c +++ b/src/netops.c @@ -99,7 +99,12 @@ int gitno__recv(gitno_buffer *buf) return ret; } -void gitno_buffer_setup_callback(git_transport *t, gitno_buffer *buf, char *data, unsigned int len, int (*recv)(gitno_buffer *buf), void *cb_data) +void gitno_buffer_setup_callback( + git_transport *t, + gitno_buffer *buf, + char *data, + size_t len, + int (*recv)(gitno_buffer *buf), void *cb_data) { memset(buf, 0x0, sizeof(gitno_buffer)); memset(data, 0x0, len); @@ -111,7 +116,7 @@ void gitno_buffer_setup_callback(git_transport *t, gitno_buffer *buf, char *data buf->cb_data = cb_data; } -void gitno_buffer_setup(git_transport *t, gitno_buffer *buf, char *data, unsigned int len) +void gitno_buffer_setup(git_transport *t, gitno_buffer *buf, char *data, size_t len) { #ifdef GIT_SSL if (t->use_ssl) { |