[Spread-cvs] cvs commit: spread/daemon memory.c

[jonathan at spread.org]

jonathan    02/09/17 23:45:14

  Modified:    daemon   memory.c
  Log:
  Reorder length fields in calloc calls to match layout in memory.
  Suggested by Daniel Rall.
  
  Revision  Changes    Path
  1.5       +3 -3      spread/daemon/memory.c
  
  Index: memory.c
  ===================================================================
  RCS file: /storage/cvsroot/spread/daemon/memory.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- memory.c	29 Aug 2002 15:43:01 -0000	1.4
  +++ memory.c	17 Sep 2002 23:45:14 -0000	1.5
  @@ -328,7 +328,7 @@
                   void  ** body_ptr;
                   for(i = initial; i > 0; i--)
                   {
  -                        head_ptr = (mem_header *) calloc(1, sizeobj(obj_type) + sizeof(mem_header));
  +                        head_ptr = (mem_header *) calloc(1, sizeof(mem_header) + sizeobj(obj_type) );
                           if (head_ptr == NULL) 
                           {
                                   Alarm(MEMORY, "mem_init_object: Failure to calloc an initial object. Returning with existant buffers\n");
  @@ -429,7 +429,7 @@
           {
                   mem_header *    head_ptr;
                   
  -                head_ptr = (mem_header *) calloc(1, sizeobj(obj_type) + sizeof(mem_header));
  +                head_ptr = (mem_header *) calloc(1, sizeof(mem_header) + sizeobj(obj_type) );
                   if (head_ptr == NULL) 
                   {
                           Alarm(MEMORY, "mem_alloc_object: Failure to calloc an object. Returning NULL object\n");
  @@ -532,7 +532,7 @@
           }
   
           
  -        head_ptr = (mem_header *) calloc(1, length + sizeof(mem_header));
  +        head_ptr = (mem_header *) calloc(1, sizeof(mem_header) + length);
           if (head_ptr == NULL) 
           {
                   Alarm(MEMORY, "mem_alloc: Failure to calloc a block. Returning NULL block\n");