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

[paraslash.git] / dccp_send.c

diff --git a/dccp_send.c b/dccp_send.c
index 738e9b6c26f212227bad88e9074667fefde75684..6cd7fa4b8ca9d28d3c0b69c4966788a27a0d71a3 100644 (file)
--- a/dccp_send.c
+++ b/dccp_send.c
@@ -1,19 +1,7 @@
 /*
  * Copyright (C) 2006-2007 Andre Noll <maan@systemlinux.org>
  *
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file dccp_send.c paraslash's dccp sender */
@@ -153,7 +141,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 +160,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);