summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Chaffraix <julien.chaffraix@gmail.com>2010-09-12 16:41:45 -0700
committerDaniel Stenberg <daniel@haxx.se>2010-09-22 23:34:36 +0200
commit612832e4c029a558d84cfa769401aa061500570f (patch)
tree07555440dd6d0a8079899e8332df4b4554825887
parent3c69a08e3bd51e62da00bb0596b438f01c6f1afb (diff)
downloadcurl-612832e4c029a558d84cfa769401aa061500570f.tar.gz
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.
-rw-r--r--lib/security.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/lib/security.c b/lib/security.c
index cc2fbf140..ac3c689f4 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 */