X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=net.c;h=6248de5506eb131828bc4a63f5a55a88c4bc30b4;hp=6a8eea3b261c3dadb8df2c73d25626150cd5ad00;hb=34762fdc56d5294c15e03fda433ecfccdc6c5fb2;hpb=6703c9a063a61320294aa2cc519a911a4e76d49b

diff --git a/net.c b/net.c
index 6a8eea3b..6248de55 100644
--- a/net.c
+++ b/net.c
@@ -120,8 +120,7 @@ void init_sockaddr(struct sockaddr_in *addr, int port, const struct hostent *he)
  */
 static int sendall(int fd, const char *buf, size_t *len)
 {
-	int total = 0;        /* how many bytes we've sent */
-	int bytesleft = *len; /* how many we have left to send */
+	size_t total = 0, bytesleft = *len; /* how many we have left to send */
 	int n = -1;
 
 	while (total < *len) {
@@ -222,9 +221,9 @@ __printf_2_3 int send_va_buffer(int fd, const char *fmt, ...)
  *
  * \sa recv(2)
  */
-__must_check int recv_bin_buffer(int fd, char *buf, ssize_t size)
+__must_check int recv_bin_buffer(int fd, char *buf, size_t size)
 {
-	int n;
+	ssize_t n;
 	crypt_function *cf = NULL;
 
 	if (fd + 1 <= cda_size)
@@ -233,8 +232,11 @@ __must_check int recv_bin_buffer(int fd, char *buf, ssize_t size)
 		unsigned char *tmp = para_malloc(size);
 		void *private = crypt_data_array[fd].private_data;
 		n = recv(fd, tmp, size, 0);
-		if (n > 0)
-			(*cf)(n, tmp, (unsigned char *)buf, private);
+		if (n > 0) {
+			size_t numbytes = n;
+			unsigned char *b = (unsigned char *)buf;
+			(*cf)(numbytes, tmp, b, private);
+		}
 		free(tmp);
 	} else
 		n = recv(fd, buf, size, 0);
@@ -257,10 +259,12 @@ __must_check int recv_bin_buffer(int fd, char *buf, ssize_t size)
  *
  * \sa recv_bin_buffer()
  */
-int recv_buffer(int fd, char *buf, ssize_t size)
+int recv_buffer(int fd, char *buf, size_t size)
 {
 	int n;
 
+	if (!size)
+		return -E_RECV;
 	n = recv_bin_buffer(fd, buf, size - 1);
 	if (n >= 0)
 		buf[n] = '\0';
@@ -397,7 +401,8 @@ int init_unix_addr(struct sockaddr_un *u, const char *name)
  * \sa bind(2)
  * \sa chmod(2)
  */
-int create_pf_socket(const char *name, struct sockaddr_un *unix_addr, int mode)
+int create_pf_socket(const char *name, struct sockaddr_un *unix_addr,
+		mode_t mode)
 {
 	int fd, ret;
 
@@ -471,7 +476,7 @@ ssize_t send_cred_buffer(int sock, char *buf)
 	return ret;
 }
 
-static void dispose_fds(int *fds, int num)
+static void dispose_fds(int *fds, unsigned num)
 {
 	int i;