diff --git a/src/netops.c b/src/netops.c
index 7291ba639..b5251925e 100644
--- a/src/netops.c
+++ b/src/netops.c
@@ -40,7 +40,7 @@
 #include "common.h"
 #include "netops.h"
 
-void gitno_buffer_setup(gitno_buffer *buf, char *data,  unsigned int len, int fd)
+void gitno_buffer_setup(gitno_buffer *buf, char *data, unsigned int len, int fd)
 {
 	memset(buf, 0x0, sizeof(gitno_buffer));
 	memset(data, 0x0, len);
@@ -68,8 +68,9 @@ int gitno_recv(gitno_buffer *buf)
 /* Consume up to ptr and move the rest of the buffer to the beginning */
 void gitno_consume(gitno_buffer *buf, const char *ptr)
 {
-	int consumed;
+	size_t consumed;
 
+	assert(ptr - buf->data >= 0);
 	assert(ptr - buf->data <= (int) buf->len);
 
 	consumed = ptr - buf->data;
@@ -80,7 +81,7 @@ void gitno_consume(gitno_buffer *buf, const char *ptr)
 }
 
 /* Consume const bytes and move the rest of the buffer to the beginning */
-void gitno_consume_n(gitno_buffer *buf, unsigned int cons)
+void gitno_consume_n(gitno_buffer *buf, size_t cons)
 {
 	memmove(buf->data, buf->data + cons, buf->len - buf->offset);
 	memset(buf->data + cons, 0x0, buf->len - buf->offset);
@@ -130,9 +131,10 @@ cleanup:
 	return error;
 }
 
-int gitno_send(int s, const char *msg, int len, int flags)
+int gitno_send(int s, const char *msg, size_t len, int flags)
 {
-	int ret, off = 0;
+	int ret;
+	size_t off = 0;
 
 	while (off < len) {
 		ret = send(s, msg + off, len - off, flags);
diff --git a/src/netops.h b/src/netops.h
index d18116f34..a1460743d 100644
--- a/src/netops.h
+++ b/src/netops.h
@@ -12,18 +12,18 @@ typedef unsigned int GIT_SOCKET;
 
 typedef struct gitno_buffer {
 	char *data;
-	unsigned int len;
-	unsigned int offset;
+	size_t len;
+	size_t offset;
 	GIT_SOCKET fd;
 } gitno_buffer;
 
 void gitno_buffer_setup(gitno_buffer *buf, char *data, unsigned int len, int fd);
 int gitno_recv(gitno_buffer *buf);
 void gitno_consume(gitno_buffer *buf, const char *ptr);
-void gitno_consume_n(gitno_buffer *buf, unsigned int cons);
+void gitno_consume_n(gitno_buffer *buf, size_t cons);
 
 int gitno_connect(const char *host, const char *port);
-int gitno_send(int s, const char *msg, int len, int flags);
+int gitno_send(int s, const char *msg, size_t len, int flags);
 int gitno_select_in(gitno_buffer *buf, long int sec, long int usec);
 
 #endif