summaryrefslogtreecommitdiff
path: root/util.c
diff options
context:
space:
mode:
authorTony Cook <tony@develop-help.com>2013-07-23 11:36:01 +1000
committerTony Cook <tony@develop-help.com>2013-07-24 11:43:19 +1000
commitd1decf2be1b14ef34c794d5aa26039a5d0fd5ccd (patch)
tree7a08e88b861b35c2ae32c71e847b50fbaa3946d5 /util.c
parent4a8dd740b55a404b1284797635911b22a8dd7013 (diff)
downloadperl-d1decf2be1b14ef34c794d5aa26039a5d0fd5ccd.tar.gz
Revert "Remove the non-inline function S_croak_memory_wrap from inline.h."
This reverts commit 43387ee1abcd83c3c7586b7f7aa86e838d239aac. Which reverted parts of f019c49e380f764c1ead36fe3602184804292711, but that reversion may no longer be necessary. See [perl #116989]
Diffstat (limited to 'util.c')
-rw-r--r--util.c14
1 files changed, 3 insertions, 11 deletions
diff --git a/util.c b/util.c
index f09cd92c1d..be75796eda 100644
--- a/util.c
+++ b/util.c
@@ -297,12 +297,12 @@ Perl_safesyscalloc(MEM_SIZE count, MEM_SIZE size)
#endif
}
else
- Perl_croak_memory_wrap();
+ croak_memory_wrap();
#ifdef PERL_TRACK_MEMPOOL
if (sTHX <= MEM_SIZE_MAX - (MEM_SIZE)total_size)
total_size += sTHX;
else
- Perl_croak_memory_wrap();
+ croak_memory_wrap();
#endif
#ifdef HAS_64K_LIMIT
if (total_size > 0xffff) {
@@ -1614,14 +1614,6 @@ Perl_croak_no_mem()
my_exit(1);
}
-/* saves machine code for a common noreturn idiom typically used in Newx*() */
-void
-Perl_croak_memory_wrap(void)
-{
- Perl_croak_nocontext("%s",PL_memory_wrap);
-}
-
-
/* does not return, used only in POPSTACK */
void
Perl_croak_popstack(void)
@@ -2928,7 +2920,7 @@ Perl_repeatcpy(char *to, const char *from, I32 len, IV count)
assert(len >= 0);
if (count < 0)
- Perl_croak_memory_wrap();
+ croak_memory_wrap();
if (len == 1)
memset(to, *from, count);