Branch: Tag:

2013-08-25

2013-08-25 07:49:18 by Arne Goedeke <el@laramies.com>

Revert "propagate CLEAR_ON_EXIT flag in string operations"

This reverts commit c39be4e9c6787f7a03bdb7ab7f1506fdacaf972c.

1778:    if(!r)    {    r=begin_wide_shared_string(size, a->size_shift); -  /* we keep both content information and the clear flags */ -  r->flags |= a->flags & (STRING_CONTENT_MASK|STRING_CLEAR_ON_EXIT); +  r->flags |= a->flags & ~15;    r->min = a->min;    r->max = a->max;    if (a->len <= size) {
1807:    }else{    r=begin_wide_shared_string(size,a->size_shift);    MEMCPY(r->str, a->str, a->len<<a->size_shift); -  /* we keep both content information and the clear flags */ -  r->flags |= a->flags & (STRING_CONTENT_MASK|STRING_CLEAR_ON_EXIT); +  r->flags |= a->flags & ~15;    r->min = a->min;    r->max = a->max;    free_string(a);
1823:       r=begin_wide_shared_string(size,shift);    pike_string_cpy(MKPCHARP_STR(r),a); -  r->flags |= (a->flags & (STRING_CONTENT_MASK|STRING_CLEAR_ON_EXIT)); +  r->flags |= (a->flags & ~15);    r->min = a->min;    r->max = a->max;    free_string(a);
1996:    struct pike_string *b)   {    if( !b->len ) { -  ret->flags |= aflags & (STRING_CONTENT_MASK|STRING_CLEAR_ON_EXIT); +  ret->flags |= aflags & ~15;    ret->min = amin;    ret->max = amax;    return;
2012:       ret->flags &= ~(STRING_IS_LOWERCASE | STRING_IS_UPPERCASE);    ret->flags |= (aflags & b->flags & (STRING_IS_LOWERCASE | STRING_IS_UPPERCASE)); -  ret->flags |= (aflags | b->flags) & STRING_CLEAR_ON_EXIT; +    }      PMOD_EXPORT void update_flags_for_add( struct pike_string *a, struct pike_string *b)
2030:    }       a->flags &= ~(STRING_IS_LOWERCASE | STRING_IS_UPPERCASE) | b->flags; -  a->flags |= b->flags & STRING_CLEAR_ON_EXIT; +    }      /*** Add strings ***/