ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/common/bmalloc.c
(Generate patch)

Comparing ray/src/common/bmalloc.c (file contents):
Revision 2.6 by schorsch, Fri Nov 14 17:22:06 2003 UTC vs.
Revision 2.9 by schorsch, Sat Oct 23 18:55:52 2004 UTC

# Line 27 | Line 27 | static const char      RCSid[] = "$Id$";
27   #define  BYTES_WORD     sizeof(ALIGNT)
28  
29   static char  *bposition = NULL;
30 < static unsigned int  nremain = 0;
30 > static size_t  nremain = 0;
31  
32  
33 < char *
33 > void *
34   bmalloc(                /* allocate a block of n bytes */
35 < register unsigned int  n
35 > register size_t  n
36   )
37   {
38          if (n > nremain && (n > MBLKSIZ || nremain > MBLKSIZ/WASTEFRAC))
# Line 40 | Line 40 | register unsigned int  n
40  
41          n = (n+(BYTES_WORD-1))&~(BYTES_WORD-1);         /* word align */
42  
43 <        if (n > nremain && (bposition = (char *)malloc(nremain = MBLKSIZ)) == NULL) {
43 >        if (n > nremain && (bposition = malloc(nremain = MBLKSIZ)) == NULL) {
44                  nremain = 0;
45                  return(NULL);
46          }
# Line 52 | Line 52 | register unsigned int  n
52  
53   void
54   bfree(                  /* free random memory */
55 < register char   *p,
56 < register unsigned int   n
55 > register void   *pp,
56 > register size_t n
57   )
58   {
59 <        register unsigned int   bsiz;
59 >        register char *p = pp;
60 >        register size_t bsiz;
61                                          /* check alignment */
62 <        bsiz = BYTES_WORD - ((unsigned int)p&(BYTES_WORD-1));
62 >        bsiz = BYTES_WORD - ((size_t)p&(BYTES_WORD-1));
63          if (bsiz < BYTES_WORD) {
64                  p += bsiz;
65                  n -= bsiz;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines