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

lib: use STRCONST() when possible in curlx_strcopy() calls

Browse source 
Follow-up to a535be4ea0

Closes #20335
This commit is contained in:
Daniel Stenberg 2026-01-16 10:36:07 +01:00
parent 493e3d6166
commit af274feabf
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
5 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/hsts.c
View file

@ -294,7 +294,7 @@ static CURLcode hsts_push(struct Curl_easy *data,
stamp.tm_hour, stamp.tm_min, stamp.tm_sec);
}
else
curlx_strcopy(e.expire, sizeof(e.expire), UNLIMITED, strlen(UNLIMITED));
curlx_strcopy(e.expire, sizeof(e.expire), STRCONST(UNLIMITED));
sc = data->set.hsts_write(data, &e, i, data->set.hsts_write_userp);
*stop = (sc != CURLSTS_OK);

2
lib/imap.c
View file

@ -1966,7 +1966,7 @@ static CURLcode imap_connect(struct Curl_easy *data, bool *done)
imap_state(data, imapc, IMAP_SERVERGREET);
/* Start off with an response id of '*' */
curlx_strcopy(imapc->resptag, sizeof(imapc->resptag), "*", 1);
curlx_strcopy(imapc->resptag, sizeof(imapc->resptag), STRCONST("*"));
result = imap_multi_statemach(data, done);

2
lib/mime.c
View file

@ -573,7 +573,7 @@ static size_t encoder_qp_read(char *buffer, size_t size, bool ateof,
}
}
if(softlinebreak) {
curlx_strcopy(buf, sizeof(buf), "\x3D\x0D\x0A", 3); /* "=\r\n" */
curlx_strcopy(buf, sizeof(buf), STRCONST("\x3D\x0D\x0A")); /* =\r\n */
len = 3;
consumed = 0;
}

4
lib/progress.c
View file

@ -43,7 +43,7 @@ UNITTEST void time2str(char *r, size_t rsize, curl_off_t seconds)
{
curl_off_t h;
if(seconds <= 0) {
curlx_strcopy(r, rsize, " ", 7);
curlx_strcopy(r, rsize, STRCONST(" "));
return;
}
h = seconds / 3600;
@ -76,7 +76,7 @@ UNITTEST void time2str(char *r, size_t rsize, curl_off_t seconds)
if(y <= 99999)
curl_msnprintf(r, rsize, "%6" FMT_OFF_T "y", y);
else
curlx_strcopy(r, rsize, ">99999y", 7);
curlx_strcopy(r, rsize, STRCONST(">99999y"));
}
}
}

8
lib/strerror.c
View file

@ -656,12 +656,12 @@ const char *Curl_sspi_strerror(SECURITY_STATUS err, char *buf, size_t buflen)
else
curl_msnprintf(buf, buflen, "%s (0x%08lx)", txt, err);
}
#else
#else /* !CURL_DISABLE_VERBOSE_STRINGS */
(void)txt;
if(err == SEC_E_OK)
txt = "No error";
curlx_strcopy(buf, buflen, STRCONST("No error"));
else
txt = "Error";
curlx_strcopy(buf, buflen, txt, strlen(txt));
curlx_strcopy(buf, buflen, STRCONST("Error"));
#endif
if(errno != old_errno)