From 486b98e472d873a0bd3d151fd69fd1adfc868bf4 Mon Sep 17 00:00:00 2001 From: Julien Chaffraix Date: Sun, 12 Sep 2010 16:32:41 -0700 Subject: [PATCH 10/14] security.c: Curl_sec_fflush_fd tweaks - Use an early return as it makes the code more readable. - Added a FIXME about a conversion. --- lib/security.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/security.c b/lib/security.c index 699be47..d0eccdf 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; } -- 1.7.0.4