luke/magic
1
0
Fork 0
mirror of https://github.com/RTimothyEdwards/magic.git synced 2026-10-06 09:53:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into bplane

Browse Source 
Conflicts:
	VERSION

Changed mallocMagic() argument to size_t to match change in master
branch (essentially an ineffectual change).
This commit is contained in:
Tim Edwards
2020-03-31 09:35:55 -04:00
parent d742550edc f689366553
commit 195bb301ff
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
utils/malloc.c
+3 -3
View File
@@ -92,7 +92,7 @@ static char *freeDelayedItem = NULL;
void *
mallocMagic(nbytes)
unsigned int nbytes;
size_t nbytes;
{
void *p;
@@ -150,12 +150,12 @@ freeMagic(cp)
void *
callocMagic(nbytes)
unsigned int nbytes;
size_t nbytes;
{
void *cp;
cp = mallocMagic(nbytes);
bzero(cp, (int) nbytes);
bzero(cp, (size_t) nbytes);
return (cp);
}
utils/malloc.h
+2 -2
View File
@@ -22,8 +22,8 @@
#ifndef _MALLOC_H
#define _MALLOC_H
extern void *mallocMagic(unsigned int);
extern void *callocMagic(unsigned int);
extern void *mallocMagic(size_t);
extern void *callocMagic(size_t);
extern void freeMagic(void *);
#endif