pike.git/ src/ builtin.cmod

2008-06-23

2008-06-23 19:04:35 by Martin Stjernholm <mast@lysator.liu.se>

• 8e9a36411b8e10f5674945da09cb12d52e5bbe6d (17 lines) (+7/-10) ^{[ Show | Annotate ]}
  Branch: 7.9

Fixed String.Buffer init size to actually work as described in rev 1.145.

Rev: src/builtin.cmod:1.211

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: builtin.cmod,v 1.210 2008/06/23 16:49:40 mast Exp $ + || $Id: builtin.cmod,v 1.211 2008/06/23 19:04:35 mast Exp $   */      #include "global.h"
1866:    low_backtrace(& Pike_interpreter);   }    - #define INITIAL_BUF_LEN 4096 -  +    /*! @module String    */   
1921:    if( args )    str->initial = MAXIMUM( size->u.integer, 512 );    else -  { +     str->initial = 256; -  push_int(0); +     } -  } +        /*! @decl string _sprintf( int flag, mapping flags )    *! It is possible to @[sprintf] a String.Buffer object
2050:    sum += a->len;    shift |= a->size_shift;    } -  if (sum < str->initial) { -  sum = str->initial * 2; -  } +  if (sum < str->initial) +  sum = str->initial; +  else if (sum > str->initial) +  sum <<= 1;    shift = shift & ~(shift >> 1);       if (shift == Pike_sp[-args].u.string->size_shift &&
2138:    {    struct pike_string *s = finish_string_builder( &str->str );    str->str.malloced = 0; -  str->str.s = 0; +  str->str.s = NULL;    RETURN s;    }    pop_n_elems(args);