From: Julien Chaffraix <julien.chaffraix@gmail.com>
Date: Sun, 12 Sep 2010 23:32:41 +0000 (-0700)
Subject: security.c: Curl_sec_fflush_fd tweaks
X-Git-Tag: curl-7_21_2~59
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5ea9e78bd7ddc725a8056fdcc3d830fa5ff49fb1;p=thirdparty%2Fcurl.git

security.c: Curl_sec_fflush_fd tweaks

- Use an early return as it makes the code more readable.
- Added a FIXME about a conversion.
---

diff --git a/lib/security.c b/lib/security.c
index 699be47a34..d0eccdf7f0 100644
--- a/lib/security.c
+++ b/lib/security.c
@@ -336,12 +336,14 @@ static ssize_t sec_write(struct connectdata *conn, int fd,
   return tx;
 }
 
-int
-Curl_sec_fflush_fd(struct connectdata *conn, int fd)
+/* FIXME: fd should be a curl_socket_t */
+int Curl_sec_fflush_fd(struct connectdata *conn, int fd)
 {
-  if(conn->data_prot != prot_clear) {
-    do_sec_send(conn, fd, NULL, 0);
-  }
+  if(conn->data_prot == prot_clear)
+    return 0;
+
+  /* Force a flush by trying to send no data */
+  do_sec_send(conn, fd, NULL, 0);
   return 0;
 }