romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-04-14 22:01:41 +03:00
Code Issues Projects Releases Packages Wiki Activity

tidy-up: rename Curl_safefree()/tool_safefree() to curlx_safefree()

Browse source 
To sync names for the same macro logic between lib and src, and to move
it to the curlx namespace, to match `curlx_free()` that it's calling.

Closes #21151
This commit is contained in:
Viktor Szakats 2026-03-30 01:54:10 +02:00
parent 2b3dfb4ad4
commit 0df6c01db3
No known key found for this signature in database
72 changed files with 494 additions and 500 deletions
Download patch file Download diff file Expand all files Collapse all files

20
lib/ftp.c
View file

@ -175,9 +175,9 @@ static CURLcode getftpresponse(struct Curl_easy *data, size_t *nreadp,
static void freedirs(struct ftp_conn *ftpc)
{
Curl_safefree(ftpc->dirs);
curlx_safefree(ftpc->dirs);
ftpc->dirdepth = 0;
Curl_safefree(ftpc->rawpath);
curlx_safefree(ftpc->rawpath);
ftpc->file = NULL;
}
@ -4026,7 +4026,7 @@ fail:
Curl_ftp_parselist_data_free(&ftpwc->parser);
curlx_free(ftpwc);
}
Curl_safefree(wildcard->pattern);
curlx_safefree(wildcard->pattern);
wildcard->dtor = ZERO_NULL;
wildcard->ftpwc = NULL;
return result;
@ -4361,7 +4361,7 @@ static void ftp_easy_dtor(void *key, size_t klen, void *entry)
struct FTP *ftp = entry;
(void)key;
(void)klen;
Curl_safefree(ftp->pathalloc);
curlx_safefree(ftp->pathalloc);
curlx_free(ftp);
}
@ -4371,11 +4371,11 @@ static void ftp_conn_dtor(void *key, size_t klen, void *entry)
(void)key;
(void)klen;
freedirs(ftpc);
Curl_safefree(ftpc->account);
Curl_safefree(ftpc->alternative_to_user);
Curl_safefree(ftpc->entrypath);
Curl_safefree(ftpc->prevpath);
Curl_safefree(ftpc->server_os);
curlx_safefree(ftpc->account);
curlx_safefree(ftpc->alternative_to_user);
curlx_safefree(ftpc->entrypath);
curlx_safefree(ftpc->prevpath);
curlx_safefree(ftpc->server_os);
Curl_pp_disconnect(&ftpc->pp);
curlx_free(ftpc);
}
@ -4438,7 +4438,7 @@ static CURLcode ftp_setup_connection(struct Curl_easy *data,
ftpc->alternative_to_user =
curlx_strdup(data->set.str[STRING_FTP_ALTERNATIVE_TO_USER]);
if(!ftpc->alternative_to_user) {
Curl_safefree(ftpc->account);
curlx_safefree(ftpc->account);
Curl_conn_meta_remove(conn, CURL_META_FTP_CONN);
return CURLE_OUT_OF_MEMORY;
}