d51d19bd06
Daniel Stenberg
2025-10-22
Subject
ftp: remove the retr_size_saved struct field
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
lib/ftp.c+9 -11
| @@ -548,7 +548,7 @@ static CURLcode ftp_initiate_transfer(struct Curl_easy *data, | |
| } | |
| else { | |
| /* FTP download, shutdown, do not ignore errors */ | |
| - | Curl_xfer_setup_recv(data, SECONDARYSOCKET, ftpc->retr_size_saved); |
| + | Curl_xfer_setup_recv(data, SECONDARYSOCKET, data->req.size); |
| Curl_xfer_set_shutdown(data, TRUE, FALSE); | |
| } | |
| @@ -2486,7 +2486,7 @@ static CURLcode ftp_state_get_resp(struct Curl_easy *data, | |
| E: | |
| 125 Data connection already open; Transfer starting. */ | |
| - | curl_off_t size = -1; /* default unknown size */ |
| + | data->req.size = -1; /* default unknown size */ |
| /* | |
| @@ -2519,27 +2519,25 @@ static CURLcode ftp_state_get_resp(struct Curl_easy *data, | |
| if(!curlx_str_number(&c, &what, CURL_OFF_T_MAX) && | |
| !curlx_str_single(&c, ' ') && | |
| !strncmp(c, "bytes", 5)) { | |
| - | size = what; |
| + | data->req.size = what; |
| break; | |
| } | |
| } | |
| } | |
| } | |
| else if(ftp->downloadsize > -1) | |
| - | size = ftp->downloadsize; |
| + | data->req.size = ftp->downloadsize; |
| - | if(size > data->req.maxdownload && data->req.maxdownload > 0) |
| - | size = data->req.size = data->req.maxdownload; |
| + | if(data->req.size > data->req.maxdownload && data->req.maxdownload > 0) |
| + | data->req.size = data->req.maxdownload; |
| else if((instate != FTP_LIST) && (data->state.prefer_ascii)) | |
| - | size = -1; /* kludge for servers that understate ASCII mode file size */ |
| + | data->req.size = -1; /* for servers that understate ASCII mode file |
| + | size */ |
| infof(data, "Maxdownload = %" FMT_OFF_T, data->req.maxdownload); | |
| if(instate != FTP_LIST) | |
| - | infof(data, "Getting file with size: %" FMT_OFF_T, size); |
| - | |
| - | /* FTP download: */ |
| - | ftpc->retr_size_saved = size; |
| + | infof(data, "Getting file with size: %" FMT_OFF_T, data->req.size); |
| if(data->set.ftp_use_port) { | |
| bool connected; | |
lib/ftp.h+0 -1
| @@ -136,7 +136,6 @@ struct ftp_conn { | |
| char *prevpath; /* url-decoded conn->path from the previous transfer */ | |
| char transfertype; /* set by ftp_transfertype for use by Curl_client_write()a | |
| and others (A/I or zero) */ | |
| - | curl_off_t retr_size_saved; /* Size of retrieved file saved */ |
| char *server_os; /* The target server operating system. */ | |
| curl_off_t known_filesize; /* file size is different from -1, if wildcard | |
| LIST parsing was done and wc_statemach set | |