cvs: php4 /ext/standard math.c

rasmus Fri Jul 14 11:46:13 2000 EDT Modified files: /php4/ext/standard math.c Log: Make it possible to specify an empty string as a thousands-seperator in number_format() @ Make it possible to specify an empty string as a thousands-seperator @ in number_format() Index: php4/ext/standard/math.c diff -u php4/ext/standard/math.c:1.32 php4/ext/standard/math.c:1.33 --- php4/ext/standard/math.c:1.32 Sun Jul 9 07:14:51 2000 +++ php4/ext/standard/math.c Fri Jul 14 11:46:13 2000 @@ -637,9 +637,9 @@ } if (dec) { - reslen = dec+1 + (tmplen-dec-1) + (tmplen-1-dec-1)/3; + reslen = dec+1 + (tmplen-dec-1) + ((thousand_sep) ? (tmplen-1-dec-1)/3 : 0); } else { - reslen = tmplen+(tmplen-1)/3; + reslen = tmplen+((thousand_sep) ? (tmplen-1)/3 : 0); } if (is_negative) { reslen++; @@ -660,7 +660,7 @@ while(s>=tmpbuf) { *t-- = *s--; - if ((++count%3)==0 && s>=tmpbuf) { + if (thousand_sep && (++count%3)==0 && s>=tmpbuf) { *t-- = thousand_sep; } } @@ -709,6 +709,8 @@ } if ((*t_s)->value.str.len==1) { thousand_sep=(*t_s)->value.str.val[0]; + } else if((*t_s)->value.str.len==0) { + thousand_sep=0; } RETURN_STRING(_php_math_number_format((*num)->value.dval,(*dec)->value.lval,dec_point,thousand_sep),0); break;