Branch: Tag:

2004-09-16

2004-09-16 17:37:34 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Backported more flag fixes from Pike 7.7.

Rev: src/array.c:1.160

2:   || This file is part of Pike. For copyright information see COPYRIGHT.   || Pike is distributed under GPL, LGPL and MPL. See the file COPYING   || for more information. - || $Id: array.c,v 1.159 2004/09/16 12:04:57 grubba Exp $ + || $Id: array.c,v 1.160 2004/09/16 17:37:34 grubba Exp $   */      #include "global.h"
27:   #include "multiset.h"   #include "mapping.h"    - RCSID("$Id: array.c,v 1.159 2004/09/16 12:04:57 grubba Exp $"); + RCSID("$Id: array.c,v 1.160 2004/09/16 17:37:34 grubba Exp $");      PMOD_EXPORT struct array empty_array=   {
382:    }else{    struct array *ret;    -  ret=allocate_array_no_init(v->size+1, (v->size >> 3) + 1); +  ret = array_set_flags(allocate_array_no_init(v->size+1, (v->size >> 3) + 1), +  v->flags);    ret->type_field = v->type_field;       MEMCPY(ITEM(ret), ITEM(v), sizeof(struct svalue) * index);
2117:    if(d_flag > 1) array_check_type_field(a);   #endif    +  if (!a->size) { +  add_ref(&empty_array); +  return array_set_flags(&empty_array, a->flags & ~ARRAY_LVALUE); +  } +     doing.next=p;    doing.pointer_a=(void *)a;    for(;p;p=p->next)