romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-26 04:53:32 +03:00
Code Issues Projects Releases Packages Wiki Activity

lib: rename curlx_strtoofft to Curl_str_numblanks()

Browse source 
The function is no longer used via the curlx shortcut.

Remove the strtoofft.[ch] files.

Closes #16642
This commit is contained in:
Daniel Stenberg 2025-03-10 08:12:05 +01:00
parent fc04eca8f8
commit 09a5b2f2de
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
17 changed files with 53 additions and 160 deletions
Download patch file Download diff file Expand all files Collapse all files

31
lib/vssh/libssh.c
View file

@ -65,7 +65,6 @@
#include "inet_ntop.h"
#include "parsedate.h" /* for the week day and month names */
#include "sockaddr.h" /* required for Curl_sockaddr_storage */
#include "strtoofft.h"
#include "strparse.h"
#include "multiif.h"
#include "select.h"
@ -1603,29 +1602,29 @@ static CURLcode myssh_statemach_act(struct Curl_easy *data, bool *block)
}
if(data->state.use_range) {
curl_off_t from, to;
char *ptr;
char *ptr2;
CURLofft to_t;
CURLofft from_t;
const char *p = data->state.range;
int from_t, to_t;
from_t = curlx_strtoofft(data->state.range, &ptr, 10, &from);
if(from_t == CURL_OFFT_FLOW) {
from_t = Curl_str_number(&p, &from, CURL_OFF_T_MAX);
if(from_t == STRE_OVERFLOW)
return CURLE_RANGE_ERROR;
}
while(*ptr && (ISBLANK(*ptr) || (*ptr == '-')))
ptr++;
to_t = curlx_strtoofft(ptr, &ptr2, 10, &to);
if(to_t == CURL_OFFT_FLOW) {
Curl_str_passblanks(&p);
(void)Curl_str_single(&p, '-');
to_t = Curl_str_numblanks(&p, &to);
if(to_t == STRE_OVERFLOW)
return CURLE_RANGE_ERROR;
}
if((to_t == CURL_OFFT_INVAL) /* no "to" value given */
|| (to >= size)) {
if((to_t == STRE_NO_NUM) || (to >= size)) {
to = size - 1;
to_t = STRE_OK;
}
if(from_t) {
if(from_t == STRE_NO_NUM) {
/* from is relative to end of file */
from = size - to;
to = size - 1;
from_t = STRE_OK;
}
if(from > size) {
failf(data, "Offset (%" FMT_OFF_T ") was beyond file size (%"

22
lib/vssh/libssh2.c
View file

@ -68,7 +68,6 @@
#include "inet_ntop.h"
#include "parsedate.h" /* for the week day and month names */
#include "sockaddr.h" /* required for Curl_sockaddr_storage */
#include "strtoofft.h"
#include "multiif.h"
#include "select.h"
#include "warnless.h"
@ -1474,20 +1473,19 @@ sftp_download_stat(struct Curl_easy *data,
}
if(data->state.use_range) {
curl_off_t from, to;
char *ptr;
char *ptr2;
CURLofft to_t;
CURLofft from_t;
const char *p = data->state.range;
int to_t, from_t;
from_t = curlx_strtoofft(data->state.range, &ptr, 10, &from);
if(from_t == CURL_OFFT_FLOW)
from_t = Curl_str_number(&p, &from, CURL_OFF_T_MAX);
if(from_t == STRE_OVERFLOW)
return CURLE_RANGE_ERROR;
while(*ptr && (ISBLANK(*ptr) || (*ptr == '-')))
ptr++;
to_t = curlx_strtoofft(ptr, &ptr2, 10, &to);
if(to_t == CURL_OFFT_FLOW)
Curl_str_passblanks(&p);
(void)Curl_str_single(&p, '-');
to_t = Curl_str_numblanks(&p, &to);
if(to_t == STRE_OVERFLOW)
return CURLE_RANGE_ERROR;
if((to_t == CURL_OFFT_INVAL) /* no "to" value given */
if((to_t == STRE_NO_NUM) /* no "to" value given */
|| (to >= size)) {
to = size - 1;
}