luke
/
magic
mirror of https://github.com/RTimothyEdwards/magic.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into magic-8.2

This commit is contained in:
Tim Edwards 2020-04-01 03:00:05 -04:00
parent 7f6571f621 f689366553
commit aecda68370
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
8.2.206 8.2.207

6
utils/malloc.c
View File

@ -92,7 +92,7 @@ static char *freeDelayedItem = NULL;
void * void *
mallocMagic(nbytes) mallocMagic(nbytes)
unsigned int nbytes; size_t nbytes;
{ {
void *p; void *p;
@ -150,12 +150,12 @@ freeMagic(cp)
void * void *
callocMagic(nbytes) callocMagic(nbytes)
unsigned int nbytes; size_t nbytes;
{ {
void *cp; void *cp;
cp = mallocMagic(nbytes); cp = mallocMagic(nbytes);
bzero(cp, (int) nbytes); bzero(cp, (size_t) nbytes);
return (cp); return (cp);
} }

4
utils/malloc.h
View File

@ -22,8 +22,8 @@
#ifndef _MALLOC_H #ifndef _MALLOC_H
#define _MALLOC_H #define _MALLOC_H
extern void *mallocMagic(unsigned int); extern void *mallocMagic(size_t);
extern void *callocMagic(unsigned int); extern void *callocMagic(size_t);
extern void freeMagic(void *); extern void freeMagic(void *);
#endif #endif