=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/Attic/monitor_mm.c,v retrieving revision 1.4.4.3 retrieving revision 1.5 diff -u -r1.4.4.3 -r1.5 --- src/usr.bin/ssh/Attic/monitor_mm.c 2002/10/11 14:53:06 1.4.4.3 +++ src/usr.bin/ssh/Attic/monitor_mm.c 2002/05/28 16:45:27 1.5 @@ -24,7 +24,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: monitor_mm.c,v 1.4.4.3 2002/10/11 14:53:06 miod Exp $"); +RCSID("$OpenBSD: monitor_mm.c,v 1.5 2002/05/28 16:45:27 stevesk Exp $"); #include @@ -36,14 +36,7 @@ static int mm_compare(struct mm_share *a, struct mm_share *b) { - long diff = (char *)a->address - (char *)b->address; - - if (diff == 0) - return (0); - else if (diff < 0) - return (-1); - else - return (1); + return ((char *)a->address - (char *)b->address); } RB_GENERATE(mmtree, mm_share, next, mm_compare) @@ -146,7 +139,7 @@ address = mm_malloc(mm, size); if (address == NULL) - fatal("%s: mm_malloc(%lu)", __func__, (u_long)size); + fatal("%s: mm_malloc(%lu)", __FUNCTION__, (u_long)size); return (address); } @@ -160,10 +153,8 @@ if (size == 0) fatal("mm_malloc: try to allocate 0 space"); - if (size > SIZE_T_MAX - MM_MINSIZE + 1) - fatal("mm_malloc: size too big"); - size = ((size + (MM_MINSIZE - 1)) / MM_MINSIZE) * MM_MINSIZE; + size = ((size + MM_MINSIZE - 1) / MM_MINSIZE) * MM_MINSIZE; RB_FOREACH(mms, mmtree, &mm->rb_free) { if (mms->size >= size) @@ -297,7 +288,7 @@ struct mm_master *mmold; struct mmtree rb_free, rb_allocated; - debug3("%s: Share sync", __func__); + debug3("%s: Share sync", __FUNCTION__); mm = *pmm; mmold = mm->mmalloc; @@ -322,7 +313,7 @@ *pmm = mm; *pmmalloc = mmalloc; - debug3("%s: Share sync end", __func__); + debug3("%s: Share sync end", __FUNCTION__); } void