/[emacs]/emacs/src/gmalloc.c
ViewVC logotype

Diff of /emacs/src/gmalloc.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.12 by rms, Sat Nov 3 15:08:36 2001 UTC revision 1.12.4.1 by miles, Fri Apr 4 06:20:58 2003 UTC
# Line 420  protect_malloc_state (protect_p) Line 420  protect_malloc_state (protect_p)
420    
421    last_state_size = _heaplimit * sizeof *_heapinfo;    last_state_size = _heaplimit * sizeof *_heapinfo;
422    last_heapinfo   = _heapinfo;    last_heapinfo   = _heapinfo;
423      
424    if (protect_p != state_protected_p)    if (protect_p != state_protected_p)
425      {      {
426        state_protected_p = protect_p;        state_protected_p = protect_p;
# Line 992  _free_internal (ptr) Line 992  _free_internal (ptr)
992      return;      return;
993    
994    PROTECT_MALLOC_STATE (0);    PROTECT_MALLOC_STATE (0);
995      
996    for (l = _aligned_blocks; l != NULL; l = l->next)    for (l = _aligned_blocks; l != NULL; l = l->next)
997      if (l->aligned == ptr)      if (l->aligned == ptr)
998        {        {
# Line 1214  _free_internal (ptr) Line 1214  _free_internal (ptr)
1214          }          }
1215        break;        break;
1216      }      }
1217      
1218    PROTECT_MALLOC_STATE (1);    PROTECT_MALLOC_STATE (1);
1219  }  }
1220    
# Line 1380  _realloc_internal (ptr, size) Line 1380  _realloc_internal (ptr, size)
1380    block = BLOCK (ptr);    block = BLOCK (ptr);
1381    
1382    PROTECT_MALLOC_STATE (0);    PROTECT_MALLOC_STATE (0);
1383      
1384    type = _heapinfo[block].busy.type;    type = _heapinfo[block].busy.type;
1385    switch (type)    switch (type)
1386      {      {
# Line 1843  freehook (ptr) Line 1843  freehook (ptr)
1843       __ptr_t ptr;       __ptr_t ptr;
1844  {  {
1845    struct hdr *hdr;    struct hdr *hdr;
1846        
1847    if (ptr)    if (ptr)
1848      {      {
1849        hdr = ((struct hdr *) ptr) - 1;        hdr = ((struct hdr *) ptr) - 1;
# Line 1853  freehook (ptr) Line 1853  freehook (ptr)
1853      }      }
1854    else    else
1855      hdr = NULL;      hdr = NULL;
1856      
1857    __free_hook = old_free_hook;    __free_hook = old_free_hook;
1858    free (hdr);    free (hdr);
1859    __free_hook = freehook;    __free_hook = freehook;
# Line 1887  reallochook (ptr, size) Line 1887  reallochook (ptr, size)
1887  {  {
1888    struct hdr *hdr = NULL;    struct hdr *hdr = NULL;
1889    __malloc_size_t osize = 0;    __malloc_size_t osize = 0;
1890        
1891    if (ptr)    if (ptr)
1892      {      {
1893        hdr = ((struct hdr *) ptr) - 1;        hdr = ((struct hdr *) ptr) - 1;
# Line 1897  reallochook (ptr, size) Line 1897  reallochook (ptr, size)
1897        if (size < osize)        if (size < osize)
1898          flood ((char *) ptr + size, FREEFLOOD, osize - size);          flood ((char *) ptr + size, FREEFLOOD, osize - size);
1899      }      }
1900      
1901    __free_hook = old_free_hook;    __free_hook = old_free_hook;
1902    __malloc_hook = old_malloc_hook;    __malloc_hook = old_malloc_hook;
1903    __realloc_hook = old_realloc_hook;    __realloc_hook = old_realloc_hook;

Legend:
Removed from v.1.12  
changed lines
  Added in v.1.12.4.1

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26