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 128d45b74c271aaeca10abacb5ef50ef197b55a6..e4b508799f8bafe0b8d09aeed03fb9c80841441e 100644 (file)
--- 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;