inline static void
php_sprintf_appendstring(char **buffer, int *pos, int *size, char *add,
int min_width, int max_width, char padding,
- int alignment, int len, int sign, int expprec)
+ int alignment, int len, int neg, int expprec, int always_sign)
{
register int npad;
int req_size;
*buffer = erealloc(*buffer, *size);
}
if (alignment == ALIGN_RIGHT) {
- if (sign && padding=='0') {
- (*buffer)[(*pos)++] = '-';
+ if ((neg || always_sign) && padding=='0') {
+ (*buffer)[(*pos)++] = (neg) ? '-' : '+';
add++;
len--;
copy_len--;
number, &numbuf[i], i));
php_sprintf_appendstring(buffer, pos, size, &numbuf[i], width, 0,
padding, alignment, (NUM_BUF_SIZE - 1) - i,
- neg, 0);
+ neg, 0, always_sign);
}
inline static void
php_sprintf_appenduint(char **buffer, int *pos, int *size,
unsigned long number,
- int width, char padding, int alignment, int always_sign)
+ int width, char padding, int alignment)
{
char numbuf[NUM_BUF_SIZE];
register unsigned long magn, nmagn;
magn = nmagn;
} while (magn > 0 && i > 0);
- if (always_sign)
- numbuf[--i] = '+';
PRINTF_DEBUG(("sprintf: appending %d as \"%s\", i=%d\n", number, &numbuf[i], i));
php_sprintf_appendstring(buffer, pos, size, &numbuf[i], width, 0,
- padding, alignment, (NUM_BUF_SIZE - 1) - i, 0, 0);
+ padding, alignment, (NUM_BUF_SIZE - 1) - i, 0, 0, 0);
}
inline static void
if (zend_isnan(number)) {
sign = (number<0);
php_sprintf_appendstring(buffer, pos, size, "NaN", 3, 0, padding,
- alignment, precision, sign, 0);
+ alignment, precision, sign, 0, always_sign);
return;
}
if (zend_isinf(number)) {
sign = (number<0);
php_sprintf_appendstring(buffer, pos, size, "INF", 3, 0, padding,
- alignment, precision, sign, 0);
+ alignment, precision, sign, 0, always_sign);
return;
}
width += (precision + 1);
}
php_sprintf_appendstring(buffer, pos, size, numbuf, width, 0, padding,
- alignment, i, sign, 0);
+ alignment, i, sign, 0, always_sign);
}
php_sprintf_appendstring(buffer, pos, size, &numbuf[i], width, 0,
padding, alignment, (NUM_BUF_SIZE - 1) - i,
- 0, expprec);
+ 0, expprec, 0);
}
width, precision, padding,
alignment,
Z_STRLEN_P(tmp),
- 0, expprec);
+ 0, expprec, 0);
break;
case 'd':
convert_to_long(tmp);
php_sprintf_appenduint(&result, &outpos, &size,
Z_LVAL_P(tmp),
- width, padding, alignment,
- always_sign);
+ width, padding, alignment);
break;
case 'e':