diff options
| author | George Hazan <ghazan@miranda.im> | 2019-09-17 12:36:24 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2019-09-17 12:36:24 +0300 |
| commit | fe2500aa99137c9ce35907c118745d65a0c0c07e (patch) | |
| tree | 5b4024359b5344b1490f7568bfb6dec897cd1aae /libs/libcurl/src/smb.c | |
| parent | adbda1ab567b2baf45c80a62a6aa4c3171a5c2e3 (diff) | |
libcurl updated to 7.66
Diffstat (limited to 'libs/libcurl/src/smb.c')
| -rw-r--r-- | libs/libcurl/src/smb.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/libs/libcurl/src/smb.c b/libs/libcurl/src/smb.c index 870244cb72..f66c05ca42 100644 --- a/libs/libcurl/src/smb.c +++ b/libs/libcurl/src/smb.c @@ -6,7 +6,7 @@ * \___|\___/|_| \_\_____| * * Copyright (C) 2014, Bill Nagel <wnagel@tycoint.com>, Exacq Technologies - * Copyright (C) 2016-2018, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 2016-2019, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -64,8 +64,7 @@ static CURLcode smb_request_state(struct connectdata *conn, bool *done); static CURLcode smb_done(struct connectdata *conn, CURLcode status, bool premature); static CURLcode smb_disconnect(struct connectdata *conn, bool dead); -static int smb_getsock(struct connectdata *conn, curl_socket_t *socks, - int numsocks); +static int smb_getsock(struct connectdata *conn, curl_socket_t *socks); static CURLcode smb_parse_url_path(struct connectdata *conn); /* @@ -607,6 +606,7 @@ static CURLcode smb_send_and_recv(struct connectdata *conn, void **msg) { struct smb_conn *smbc = &conn->proto.smbc; CURLcode result; + *msg = NULL; /* if it returns early */ /* Check if there is data in the transfer buffer */ if(!smbc->send_size && smbc->upload_size) { @@ -936,12 +936,8 @@ static CURLcode smb_disconnect(struct connectdata *conn, bool dead) return CURLE_OK; } -static int smb_getsock(struct connectdata *conn, curl_socket_t *socks, - int numsocks) +static int smb_getsock(struct connectdata *conn, curl_socket_t *socks) { - if(!numsocks) - return GETSOCK_BLANK; - socks[0] = conn->sock[FIRSTSOCKET]; return GETSOCK_READSOCK(0) | GETSOCK_WRITESOCK(0); } |