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
Remove generated test files from CPANPLUS
[perl5.git]
/
malloc.c
diff --git
a/malloc.c
b/malloc.c
index
a9245e8
..
ce406d2
100644
(file)
--- a/
malloc.c
+++ b/
malloc.c
@@
-1291,7
+1291,8
@@
write2(char *mess)
#ifdef DEBUGGING
#undef ASSERT
#ifdef DEBUGGING
#undef ASSERT
-#define ASSERT(p,diag) if (!(p)) botch(diag,STRINGIFY(p),__FILE__,__LINE__); else
+#define ASSERT(p,diag) if (!(p)) botch(diag,STRINGIFY(p),__FILE__,__LINE__);
+
static void
botch(char *diag, char *s, char *file, int line)
{
static void
botch(char *diag, char *s, char *file, int line)
{
@@
-2001,12
+2002,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;
{
dVAR;
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
@@
-2324,7
+2325,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
@@
-2347,7
+2348,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);