Merge /fml/ag-raetsch/home/maan/scm/paraslash_meins/paraslash

diff --git a/command.c b/command.c
index 2bd101919eafa22136926ff244d12d13866fabac..69983c3f13ac155909d2e4fb84ce53b62a51711d 100644 (file)
--- a/command.c
+++ b/command.c
@@ -876,7 +876,7 @@ int handle_connect(int fd, struct sockaddr_in *addr)
        if (ret <= 0)
                goto err_out;
        numbytes = ret;
-       PARA_DEBUG_LOG("sending %d byte challenge\n", numbytes);
+       PARA_DEBUG_LOG("sending %zu byte challenge\n", numbytes);
        /* We can't use send_buffer here since buf may contain null bytes */
        ret = send_bin_buffer(fd,(char *) crypt_buf, numbytes);
        if (ret < 0)

diff --git a/dccp_send.c b/dccp_send.c
index 738e9b6c26f212227bad88e9074667fefde75684..4599dd36163b6583db50ab136352195ab8501b3d 100644 (file)
--- a/dccp_send.c
+++ b/dccp_send.c
@@ -153,7 +153,7 @@ static void dccp_send(long unsigned current_chunk,
        struct dccp_client *dc, *tmp;
        int ret;
        char *header_buf;
-       size_t header_len;
+       unsigned header_len;
 
        if (listen_fd < 0 || !len)
                return;
@@ -172,7 +172,7 @@ static void dccp_send(long unsigned current_chunk,
                                ret = dccp_write(dc->fd, header_buf, header_len);
                                if (ret != header_len) {
                                        int err = errno;
-                                       PARA_ERROR_LOG("header write: %d/%zu (%s)\n",
+                                       PARA_ERROR_LOG("header write: %d/%u (%s)\n",
                                                ret, header_len, ret < 0?
                                                strerror(err) : "");
                                        dccp_shutdown_client(dc);