From cdc1a719f0d30925b0949a9f4f56050f8eae5ea1 Mon Sep 17 00:00:00 2001 From: Julien Chaffraix Date: Sun, 12 Sep 2010 16:41:45 -0700 Subject: [PATCH 12/14] security.c: _sec_send tweaks - Renamed the method to sec_send now that we renamed sec_send to do_sec_send. - Some more variable renaming. --- lib/security.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/lib/security.c b/lib/security.c index cc2fbf1..ac3c689 100644 --- a/lib/security.c +++ b/lib/security.c @@ -349,12 +349,13 @@ int Curl_sec_fflush_fd(struct connectdata *conn, int fd) return 0; } -static ssize_t _sec_send(struct connectdata *conn, int num, - const void *buffer, size_t length, CURLcode *err) +/* Matches Curl_send signature */ +static ssize_t sec_send(struct connectdata *conn, int sockindex, + const void *buffer, size_t len, CURLcode *err) { - curl_socket_t fd = conn->sock[num]; + curl_socket_t fd = conn->sock[sockindex]; *err = CURLE_OK; - return sec_write(conn, fd, buffer, length); + return sec_write(conn, fd, buffer, len); } /* FIXME: |level| should not be an int but a struct protection_level */ @@ -548,9 +549,9 @@ static CURLcode choose_mech(struct connectdata *conn) conn->sec_complete = 1; if (conn->data_prot != prot_clear) { conn->recv[FIRSTSOCKET] = sec_recv; - conn->send[FIRSTSOCKET] = _sec_send; + conn->send[FIRSTSOCKET] = sec_send; conn->recv[SECONDARYSOCKET] = sec_recv; - conn->send[SECONDARYSOCKET] = _sec_send; + conn->send[SECONDARYSOCKET] = sec_send; } conn->command_prot = prot_safe; /* Set the requested protection level */ -- 1.7.0.4