X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=dccp_send.c;h=27343fbc0874e96865880eaa5866d1e65a1fa385;hp=e4b508799f8bafe0b8d09aeed03fb9c80841441e;hb=d36f1dae4e1ee0756fdd885c1596fa8df8990491;hpb=5a971472d49afd4a6b5e24df5cb5839beb299830 diff --git a/dccp_send.c b/dccp_send.c index e4b50879..27343fbc 100644 --- a/dccp_send.c +++ b/dccp_send.c @@ -1,19 +1,7 @@ /* * Copyright (C) 2006-2007 Andre Noll * - * 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 */ @@ -91,7 +79,7 @@ static int dccp_open(void) return ret; listen_fd = ret; - bzero(&servaddr, sizeof(servaddr)); + memset(&servaddr, 0, sizeof(servaddr)); servaddr.sin_family = AF_INET; servaddr.sin_addr.s_addr = htonl(INADDR_ANY); servaddr.sin_port = htons(conf.dccp_port_arg); @@ -151,8 +139,9 @@ static void dccp_send(long unsigned current_chunk, __a_unused long unsigned chunks_sent, const char *buf, size_t len) { struct dccp_client *dc, *tmp; - int ret, header_len; + int ret; char *header_buf; + unsigned header_len; if (listen_fd < 0 || !len) return; @@ -171,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/%d (%s)\n", + PARA_ERROR_LOG("header write: %d/%u (%s)\n", ret, header_len, ret < 0? strerror(err) : ""); dccp_shutdown_client(dc);