X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=dccp_send.c;h=738e9b6c26f212227bad88e9074667fefde75684;hp=128d45b74c271aaeca10abacb5ef50ef197b55a6;hb=c4ecbd8f75be7847f7332dd64f11a0ba54233891;hpb=dc4030458f9af07d5719cfbff0a47cd16f1847f7

diff --git a/dccp_send.c b/dccp_send.c
index 128d45b7..738e9b6c 100644
--- a/dccp_send.c
+++ b/dccp_send.c
@@ -120,7 +120,8 @@ static void dccp_shutdown_client(struct dccp_client *dc)
 	free(dc);
 }
 
-#define DCCP_RETRIES 100
+/** give up if write would block that many times */
+#define DCCP_WRITE_RETRIES 100
 
 static int dccp_write(int fd, const char *buf, size_t len)
 {
@@ -130,7 +131,7 @@ again:
 	size = PARA_MIN(1024, len - written);
 	ret = write(fd, buf + written, size);
 	if (ret < 0) {
-		if (errno != EAGAIN || !retries++ > DCCP_RETRIES)
+		if (errno != EAGAIN || retries++ > DCCP_WRITE_RETRIES)
 			goto err_out;
 		PARA_DEBUG_LOG("EAGAIN #%d@%zd/%zd\n", retries, written, len);
 		goto again;
@@ -150,8 +151,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;
+	size_t header_len;
 
 	if (listen_fd < 0 || !len)
 		return;
@@ -170,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/%d (%s)\n",
+					PARA_ERROR_LOG("header write: %d/%zu (%s)\n",
 						ret, header_len, ret < 0?
 						strerror(err) : "");
 					dccp_shutdown_client(dc);