This is a live mirror of the Perl 5 development currently hosted at
https://github.com/perl/perl5
https://perl5.git.perl.org
/
perl5.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Silence warnings in Pod::Man
[perl5.git]
/
malloc.c
diff --git
a/malloc.c
b/malloc.c
index
4ec2174
..
988c905
100644
(file)
--- a/
malloc.c
+++ b/
malloc.c
@@
-1156,11
+1156,11
@@
perl_get_emergency_buffer(IV *size)
dTHX;
/* First offense, give a possibility to recover by dieing. */
/* No malloc involved here: */
dTHX;
/* First offense, give a possibility to recover by dieing. */
/* No malloc involved here: */
- GV **gvp = (GV**)hv_fetch(PL_defstash, "^M", 2, 0);
SV *sv;
char *pv;
SV *sv;
char *pv;
+ GV **gvp = (GV**)hv_fetchs(PL_defstash, "^M", FALSE);
- if (!gvp) gvp = (GV**)hv_fetch
(PL_defstash, "\015", 1, 0
);
+ if (!gvp) gvp = (GV**)hv_fetch
s(PL_defstash, "\015", FALSE
);
if (!gvp || !(sv = GvSV(*gvp)) || !SvPOK(sv)
|| (SvLEN(sv) < (1<<LOG_OF_MIN_ARENA) - M_OVERHEAD))
return NULL; /* Now die die die... */
if (!gvp || !(sv = GvSV(*gvp)) || !SvPOK(sv)
|| (SvLEN(sv) < (1<<LOG_OF_MIN_ARENA) - M_OVERHEAD))
return NULL; /* Now die die die... */
@@
-1173,7
+1173,7
@@
perl_get_emergency_buffer(IV *size)
}
SvPOK_off(sv);
}
SvPOK_off(sv);
- SvPV_set(sv, N
ullch
);
+ SvPV_set(sv, N
ULL
);
SvCUR_set(sv, 0);
SvLEN_set(sv, 0);
*size = malloced_size(pv) + M_OVERHEAD;
SvCUR_set(sv, 0);
SvLEN_set(sv, 0);
*size = malloced_size(pv) + M_OVERHEAD;
@@
-1249,7
+1249,7
@@
emergency_sbrk(MEM_SIZE size)
if (emergency_buffer_size) {
add_to_chain(emergency_buffer, emergency_buffer_size, 0);
emergency_buffer_size = 0;
if (emergency_buffer_size) {
add_to_chain(emergency_buffer, emergency_buffer_size, 0);
emergency_buffer_size = 0;
- emergency_buffer = N
ullch
;
+ emergency_buffer = N
ULL
;
have = 1;
}
have = 1;
}
@@
-1276,7
+1276,7
@@
emergency_sbrk(MEM_SIZE size)
MALLOC_UNLOCK;
emergency_sbrk_croak("Out of memory during request for %"UVuf" bytes, total sbrk() is %"UVuf" bytes", (UV)size, (UV)(goodsbrk + sbrk_slack));
/* NOTREACHED */
MALLOC_UNLOCK;
emergency_sbrk_croak("Out of memory during request for %"UVuf" bytes, total sbrk() is %"UVuf" bytes", (UV)size, (UV)(goodsbrk + sbrk_slack));
/* NOTREACHED */
- return N
ullch
;
+ return N
ULL
;
}
#else /* !defined(PERL_EMERGENCY_SBRK) */
}
#else /* !defined(PERL_EMERGENCY_SBRK) */
@@
-1295,6
+1295,7
@@
write2(char *mess)
static void
botch(char *diag, char *s, char *file, int line)
{
static void
botch(char *diag, char *s, char *file, int line)
{
+ dVAR;
if (!(PERL_MAYBE_ALIVE && PERL_GET_THX))
goto do_write;
else {
if (!(PERL_MAYBE_ALIVE && PERL_GET_THX))
goto do_write;
else {
@@
-1408,6
+1409,7
@@
cmp_pat_4bytes(unsigned char *s, size_t nbytes, const unsigned char *fill)
Malloc_t
Perl_malloc(register size_t nbytes)
{
Malloc_t
Perl_malloc(register size_t nbytes)
{
+ dVAR;
register union overhead *p;
register int bucket;
register MEM_SIZE shiftr;
register union overhead *p;
register int bucket;
register MEM_SIZE shiftr;
@@
-1665,6
+1667,7
@@
get_from_bigger_buckets(int bucket, MEM_SIZE size)
static union overhead *
getpages(MEM_SIZE needed, int *nblksp, int bucket)
{
static union overhead *
getpages(MEM_SIZE needed, int *nblksp, int bucket)
{
+ dVAR;
/* Need to do (possibly expensive) system call. Try to
optimize it for rare calling. */
MEM_SIZE require = needed - sbrked_remains;
/* Need to do (possibly expensive) system call. Try to
optimize it for rare calling. */
MEM_SIZE require = needed - sbrked_remains;
@@
-1865,6
+1868,7
@@
getpages_adjacent(MEM_SIZE require)
static void
morecore(register int bucket)
{
static void
morecore(register int bucket)
{
+ dVAR;
register union overhead *ovp;
register int rnu; /* 2^rnu bytes will be requested */
int nblks; /* become nblks blocks of the desired size */
register union overhead *ovp;
register int rnu; /* 2^rnu bytes will be requested */
int nblks; /* become nblks blocks of the desired size */
@@
-1997,11
+2001,12
@@
morecore(register int bucket)
}
Free_t
}
Free_t
-Perl_mfree(
void *mp
)
+Perl_mfree(
Malloc_t where
)
{
{
+ dVAR;
register MEM_SIZE size;
register union overhead *ovp;
register MEM_SIZE size;
register union overhead *ovp;
- char *cp = (char*)
mp
;
+ char *cp = (char*)
where
;
#ifdef PACK_MALLOC
u_char bucket;
#endif
#ifdef PACK_MALLOC
u_char bucket;
#endif
@@
-2103,6
+2108,7
@@
Perl_mfree(void *mp)
Malloc_t
Perl_realloc(void *mp, size_t nbytes)
{
Malloc_t
Perl_realloc(void *mp, size_t nbytes)
{
+ dVAR;
register MEM_SIZE onb;
union overhead *ovp;
char *res;
register MEM_SIZE onb;
union overhead *ovp;
char *res;
@@
-2141,7
+2147,7
@@
Perl_realloc(void *mp, size_t nbytes)
bad_free_warn = (pbf) ? atoi(pbf) : 1;
}
if (!bad_free_warn)
bad_free_warn = (pbf) ? atoi(pbf) : 1;
}
if (!bad_free_warn)
- return N
ullch
;
+ return N
ULL
;
#ifdef RCHECK
#ifdef PERL_CORE
{
#ifdef RCHECK
#ifdef PERL_CORE
{
@@
-2169,7
+2175,7
@@
Perl_realloc(void *mp, size_t nbytes)
warn("%s", "Bad realloc() ignored");
#endif
#endif
warn("%s", "Bad realloc() ignored");
#endif
#endif
- return N
ullch;
/* sanity */
+ return N
ULL;
/* sanity */
}
onb = BUCKET_SIZE_REAL(bucket);
}
onb = BUCKET_SIZE_REAL(bucket);
@@
-2318,7
+2324,7
@@
Perl_strdup(const char *s)
MEM_SIZE l = strlen(s);
char *s1 = (char *)Perl_malloc(l+1);
MEM_SIZE l = strlen(s);
char *s1 = (char *)Perl_malloc(l+1);
- return CopyD(s, s1, (MEM_SIZE)(l+1), char);
+ return
(char *)
CopyD(s, s1, (MEM_SIZE)(l+1), char);
}
#ifdef PERL_CORE
}
#ifdef PERL_CORE
@@
-2341,7
+2347,7
@@
Perl_putenv(char *a)
if (l < sizeof(buf))
var = buf;
else
if (l < sizeof(buf))
var = buf;
else
- var = Perl_malloc(l + 1);
+ var =
(char *)
Perl_malloc(l + 1);
Copy(a, var, l, char);
var[l + 1] = 0;
my_setenv(var, val+1);
Copy(a, var, l, char);
var[l + 1] = 0;
my_setenv(var, val+1);
@@
-2354,7
+2360,7
@@
Perl_putenv(char *a)
MEM_SIZE
Perl_malloced_size(void *p)
{
MEM_SIZE
Perl_malloced_size(void *p)
{
- union overhead *ovp = (union overhead *)
+ union overhead *
const
ovp = (union overhead *)
((caddr_t)p - sizeof (union overhead) * CHUNK_SHIFT);
const int bucket = OV_INDEX(ovp);
#ifdef RCHECK
((caddr_t)p - sizeof (union overhead) * CHUNK_SHIFT);
const int bucket = OV_INDEX(ovp);
#ifdef RCHECK