Branch: Tag:

2000-02-15

2000-02-15 02:41:18 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Some minor fixes.

Rev: src/mapping.c:1.66

5:   \*/   /**/   #include "global.h" - RCSID("$Id: mapping.c,v 1.65 2000/02/09 23:49:17 hubbe Exp $"); + RCSID("$Id: mapping.c,v 1.66 2000/02/15 02:41:18 grubba Exp $");   #include "main.h"   #include "object.h"   #include "mapping.h"
226:    /* unlink */    k=md->free_list;   #ifdef PIKE_DEBUG -  if(!k) fatal("Error in rehash: not enough kehypairs.\n"); +  if(!k) fatal("Error in rehash: not enough keypairs.\n");   #endif    md->free_list=k->next;   
258:    /* unlink */    k=md->free_list;   #ifdef PIKE_DEBUG -  if(!k) fatal("Error in rehash: not enough kehypairs.\n"); +  if(!k) fatal("Error in rehash: not enough keypairs.\n");   #endif    md->free_list=k->next;   
292:    INT32 e;       md=m->data; +  debug_malloc_touch(md);   #ifdef PIKE_DEBUG    if(md->refs <=0)    fatal("Zero refs in mapping->data\n");
1295:    cv=array_zip(av,b,zipper); /* b must not be used */    break;    default: -  fatal("merge_mapping_array on other then AND or SUB\n"); +  fatal("merge_mapping_array on other than AND or SUB\n");    }       free_array(ai);
1878:    if(gc_do_free(m))    {    add_ref(m); -  unlink_mapping_data(m->data); +  md = m->data; +  /* Protect against unlink_mapping_data() recursing too far. */    m->data=&empty_data;    m->data->refs++; -  +  +  unlink_mapping_data(md);    next=m->next;   #ifdef PIKE_DEBUG    m->debug_size=0;