mirror/perl
1
0
Fork 0
mirror of https://github.com/Perl/perl5.git synced 2026-01-26 08:38:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

eliminate more trivial format strings ("%s", "...")

Browse Source 
As a follow-up to commit 71d1d453e7, turn more trivial format strings
(i.e. "%s" followed by a string literal) into just that string literal.

- dump.c: String literals are more efficiently appended using sv_catpvs;
  C strings using sv_patv. No need to invoke the entire sv_catpvf
  machinery to parse a static "format string" of length 1.
- malloc.c: Disentangle some warning messages and make them properly
  match their (previously orphaned) perldiag entries again.
- os2/perlrexx.c: Turn sprintf(x, "...") into strcpy(x, "...").
This commit is contained in:
Lukas Mai 2025-03-18 10:44:01 +01:00 committed by mauke
parent 79ae12aeb4
commit a5ccef6909
5 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dump.c
View File

@ -540,14 +540,14 @@ Perl_sv_peek(pTHX_ SV *sv)
}
}
if (is_tmp || SvREFCNT(sv) > 1 || SvPADTMP(sv)) {
sv_catpvf(t, "<");
sv_catpvs(t, "<");
if (SvREFCNT(sv) > 1)
sv_catpvf(t, "%" UVuf, (UV)SvREFCNT(sv));
if (SvPADTMP(sv))
sv_catpvf(t, "%s", "P");
sv_catpvs(t, "P");
if (is_tmp)
sv_catpvf(t, "%s", SvTEMP(t) ? "T" : "t");
sv_catpvf(t, ">");
sv_catpv(t, SvTEMP(t) ? "T" : "t");
sv_catpvs(t, ">");
}
}

30
malloc.c
View File

@ -1704,7 +1704,7 @@ morecore(int bucket)
#endif
if (bucket == sizeof(MEM_SIZE)*8*BUCKETS_PER_POW2) {
MALLOC_UNLOCK;
croak2("%s", "Out of memory during ridiculously large request");
croak2("Out of memory during ridiculously large request");
}
if (bucket > max_bucket)
max_bucket = bucket;
@ -1842,16 +1842,20 @@ Perl_mfree(Malloc_t where)
#ifdef RCHECK
{
dTHX;
if (!PERL_IS_ALIVE || !PL_curcop)
Perl_ck_warner_d(aTHX_ packWARN(WARN_MALLOC), "%s free() ignored (RMAGIC, PERL_CORE)",
ovp->ov_rmagic == RMAGIC - 1 ?
"Duplicate" : "Bad");
if (!PERL_IS_ALIVE || !PL_curcop) {
if (ovp->ov_rmagic == RMAGIC - 1)
Perl_ck_warner_d(aTHX_ packWARN(WARN_MALLOC),
"Duplicate free() ignored (%s)", "RMAGIC, PERL_CORE");
else
Perl_ck_warner_d(aTHX_ packWARN(WARN_MALLOC),
"Bad free() ignored (%s)", "RMAGIC, PERL_CORE");
}
}
#else
{
dTHX;
if (!PERL_IS_ALIVE || !PL_curcop)
Perl_ck_warner_d(aTHX_ packWARN(WARN_MALLOC), "%s", "Bad free() ignored (PERL_CORE)");
Perl_ck_warner_d(aTHX_ packWARN(WARN_MALLOC), "Bad free() ignored (%s)", "PERL_CORE");
}
#endif
return; /* sanity */
@ -1947,18 +1951,18 @@ Perl_realloc(void *mp, size_t nbytes)
#ifdef RCHECK
{
dTHX;
if (!PERL_IS_ALIVE || !PL_curcop)
Perl_ck_warner_d(aTHX_ packWARN(WARN_MALLOC), "%srealloc() %signored",
(ovp->ov_rmagic == RMAGIC - 1 ? "" : "Bad "),
ovp->ov_rmagic == RMAGIC - 1
? "of freed memory " : "");
if (!PERL_IS_ALIVE || !PL_curcop) {
if (ovp->ov_rmagic == RMAGIC - 1)
Perl_ck_warner_d(aTHX_ packWARN(WARN_MALLOC), "realloc() of freed memory ignored");
else
Perl_ck_warner_d(aTHX_ packWARN(WARN_MALLOC), "Bad realloc() ignored");
}
}
#else
{
dTHX;
if (!PERL_IS_ALIVE || !PL_curcop)
Perl_ck_warner_d(aTHX_ packWARN(WARN_MALLOC), "%s",
"Bad realloc() ignored");
Perl_ck_warner_d(aTHX_ packWARN(WARN_MALLOC), "Bad realloc() ignored");
}
#endif
return NULL; /* sanity */

6
os2/perlrexx.c
View File

@ -135,7 +135,7 @@ ULONG PERL (PCSZ name, LONG rargc, const RXSTRING *rargv,
ret = 1;
else {
ret = 0;
sprintf(retstr->strptr, "%s", "ok");
strcpy(retstr->strptr, "ok");
retstr->strlength = strlen (retstr->strptr);
}
PERL_SYS_TERM1(0);
@ -162,7 +162,7 @@ ULONG PERLTERM (PCSZ name, LONG rargc, const RXSTRING *rargv,
perl_free(my_perl);
my_perl = 0;
sprintf(retstr->strptr, "%s", "ok");
strcpy(retstr->strptr, "ok");
retstr->strlength = strlen (retstr->strptr);
return 0;
}
@ -176,7 +176,7 @@ ULONG PERLINIT (PCSZ name, LONG rargc, const RXSTRING *rargv,
if (!init_perl(1))
return 1;
sprintf(retstr->strptr, "%s", "ok");
strcpy(retstr->strptr, "ok");
retstr->strlength = strlen (retstr->strptr);
return 0;
}

4
pod/perldiag.pod
View File

@ -476,7 +476,7 @@ most likely an unexpected right brace '}'.
symbol has no filehandle associated with it. Perhaps you didn't do an
open(), or did it in another package.
=item Bad free() ignored
=item Bad free() ignored (%s)
(S malloc) An internal routine called free() on something that had never
been malloc()ed in the first place. Mandatory, but can be disabled by
@ -2324,7 +2324,7 @@ See L<perlfunc/dump>.
(F) Your machine doesn't support dump/undump.
=item Duplicate free() ignored
=item Duplicate free() ignored (%s)
(S malloc) An internal routine called free() on something that had
already been freed.

2
t/porting/diag.t
View File

@ -701,7 +701,6 @@ setnetent not implemented!
setprotoent not implemented!
set %s %p %p %p
setservent not implemented!
%s free() ignored (RMAGIC, PERL_CORE)
%s has too many errors.
SIG%s handler "%s" not defined.
%s in %s
@ -709,7 +708,6 @@ Size magic not implemented
%s: name `%s' too long
%s not implemented!
%s number > %s non-portable
%srealloc() %signored
%s on %s %s
%s: %s
Starting Full Screen process with flag=%d, mytype=%d