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

src: stop overriding system printf symbols

Browse source 
Also:
- tool_operate: use the socket printf mask, drop cast.

Follow-up to 4deea9396b #18814

Closes #18844
This commit is contained in:
Viktor Szakats 2025-10-04 12:24:57 +02:00
parent 34ad78da89
commit db98daab05
No known key found for this signature in database
GPG key ID: B5ABD165E2AEF201
25 changed files with 203 additions and 207 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/tool_easysrc.c
View file

@ -109,7 +109,7 @@ CURLcode easysrc_addf(struct slist_wc **plist, const char *fmt, ...)
char *bufp;
va_list ap;
va_start(ap, fmt);
bufp = vaprintf(fmt, ap);
bufp = curl_mvaprintf(fmt, ap);
va_end(ap);
if(!bufp) {
ret = CURLE_OUT_OF_MEMORY;
@ -190,41 +190,41 @@ void dumpeasysrc(void)
const char *c;
for(i = 0; ((c = srchead[i]) != NULL); i++)
fprintf(out, "%s\n", c);
curl_mfprintf(out, "%s\n", c);
/* Declare variables used for complex setopt values */
if(easysrc_decl) {
for(ptr = easysrc_decl->first; ptr; ptr = ptr->next)
fprintf(out, " %s\n", ptr->data);
curl_mfprintf(out, " %s\n", ptr->data);
}
/* Set up complex values for setopt calls */
if(easysrc_data) {
fprintf(out, "\n");
curl_mfprintf(out, "\n");
for(ptr = easysrc_data->first; ptr; ptr = ptr->next)
fprintf(out, " %s\n", ptr->data);
curl_mfprintf(out, " %s\n", ptr->data);
}
fprintf(out, "\n");
curl_mfprintf(out, "\n");
if(easysrc_code) {
for(ptr = easysrc_code->first; ptr; ptr = ptr->next) {
if(ptr->data[0]) {
fprintf(out, " %s\n", ptr->data);
curl_mfprintf(out, " %s\n", ptr->data);
}
else {
fprintf(out, "\n");
curl_mfprintf(out, "\n");
}
}
}
if(easysrc_clean) {
for(ptr = easysrc_clean->first; ptr; ptr = ptr->next)
fprintf(out, " %s\n", ptr->data);
curl_mfprintf(out, " %s\n", ptr->data);
}
for(i = 0; ((c = srcend[i]) != NULL); i++)
fprintf(out, "%s\n", c);
curl_mfprintf(out, "%s\n", c);
if(fopened)
curlx_fclose(out);