archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

snprintf() -> slprintf()

Browse source 
# Part 1
This commit is contained in:
Ilia Alshanetsky 2007-02-27 03:04:40 +00:00
parent 1d08a8d157
commit cc04404b28
8 changed files with 76 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

70
ext/date/php_date.c
View file

@ -748,66 +748,66 @@ static char *date_format(char *format, int format_len, timelib_time *t, int loca
for (i = 0; i < format_len; i++) { for (i = 0; i < format_len; i++) {
switch (format[i]) { switch (format[i]) {
/* day */ /* day */
case 'd': length = snprintf(buffer, 32, "%02d", (int) t->d); break; case 'd': length = slprintf(buffer, 32, "%02d", (int) t->d); break;
case 'D': length = snprintf(buffer, 32, "%s", php_date_short_day_name(t->y, t->m, t->d)); break; case 'D': length = slprintf(buffer, 32, "%s", php_date_short_day_name(t->y, t->m, t->d)); break;
case 'j': length = snprintf(buffer, 32, "%d", (int) t->d); break; case 'j': length = slprintf(buffer, 32, "%d", (int) t->d); break;
case 'l': length = snprintf(buffer, 32, "%s", php_date_full_day_name(t->y, t->m, t->d)); break; case 'l': length = slprintf(buffer, 32, "%s", php_date_full_day_name(t->y, t->m, t->d)); break;
case 'S': length = snprintf(buffer, 32, "%s", english_suffix(t->d)); break; case 'S': length = slprintf(buffer, 32, "%s", english_suffix(t->d)); break;
case 'w': length = snprintf(buffer, 32, "%d", (int) timelib_day_of_week(t->y, t->m, t->d)); break; case 'w': length = slprintf(buffer, 32, "%d", (int) timelib_day_of_week(t->y, t->m, t->d)); break;
case 'N': length = snprintf(buffer, 32, "%d", (int) timelib_iso_day_of_week(t->y, t->m, t->d)); break; case 'N': length = slprintf(buffer, 32, "%d", (int) timelib_iso_day_of_week(t->y, t->m, t->d)); break;
case 'z': length = snprintf(buffer, 32, "%d", (int) timelib_day_of_year(t->y, t->m, t->d)); break; case 'z': length = slprintf(buffer, 32, "%d", (int) timelib_day_of_year(t->y, t->m, t->d)); break;
/* week */ /* week */
case 'W': length = snprintf(buffer, 32, "%02d", (int) isoweek); break; /* iso weeknr */ case 'W': length = slprintf(buffer, 32, "%02d", (int) isoweek); break; /* iso weeknr */
case 'o': length = snprintf(buffer, 32, "%d", (int) isoyear); break; /* iso year */ case 'o': length = slprintf(buffer, 32, "%d", (int) isoyear); break; /* iso year */
/* month */ /* month */
case 'F': length = snprintf(buffer, 32, "%s", mon_full_names[t->m - 1]); break; case 'F': length = slprintf(buffer, 32, "%s", mon_full_names[t->m - 1]); break;
case 'm': length = snprintf(buffer, 32, "%02d", (int) t->m); break; case 'm': length = slprintf(buffer, 32, "%02d", (int) t->m); break;
case 'M': length = snprintf(buffer, 32, "%s", mon_short_names[t->m - 1]); break; case 'M': length = slprintf(buffer, 32, "%s", mon_short_names[t->m - 1]); break;
case 'n': length = snprintf(buffer, 32, "%d", (int) t->m); break; case 'n': length = slprintf(buffer, 32, "%d", (int) t->m); break;
case 't': length = snprintf(buffer, 32, "%d", (int) timelib_days_in_month(t->y, t->m)); break; case 't': length = slprintf(buffer, 32, "%d", (int) timelib_days_in_month(t->y, t->m)); break;
/* year */ /* year */
case 'L': length = snprintf(buffer, 32, "%d", timelib_is_leap((int) t->y)); break; case 'L': length = slprintf(buffer, 32, "%d", timelib_is_leap((int) t->y)); break;
case 'y': length = snprintf(buffer, 32, "%02d", (int) t->y % 100); break; case 'y': length = slprintf(buffer, 32, "%02d", (int) t->y % 100); break;
case 'Y': length = snprintf(buffer, 32, "%04d", (int) t->y); break; case 'Y': length = slprintf(buffer, 32, "%04d", (int) t->y); break;
/* time */ /* time */
case 'a': length = snprintf(buffer, 32, "%s", t->h >= 12 ? "pm" : "am"); break; case 'a': length = slprintf(buffer, 32, "%s", t->h >= 12 ? "pm" : "am"); break;
case 'A': length = snprintf(buffer, 32, "%s", t->h >= 12 ? "PM" : "AM"); break; case 'A': length = slprintf(buffer, 32, "%s", t->h >= 12 ? "PM" : "AM"); break;
case 'B': { case 'B': {
int retval = (((((long)t->sse)-(((long)t->sse) - ((((long)t->sse) % 86400) + 3600))) * 10) / 864); int retval = (((((long)t->sse)-(((long)t->sse) - ((((long)t->sse) % 86400) + 3600))) * 10) / 864);
while (retval < 0) { while (retval < 0) {
retval += 1000; retval += 1000;
} }
retval = retval % 1000; retval = retval % 1000;
length = snprintf(buffer, 32, "%03d", retval); length = slprintf(buffer, 32, "%03d", retval);
break; break;
} }
case 'g': length = snprintf(buffer, 32, "%d", (t->h % 12) ? (int) t->h % 12 : 12); break; case 'g': length = slprintf(buffer, 32, "%d", (t->h % 12) ? (int) t->h % 12 : 12); break;
case 'G': length = snprintf(buffer, 32, "%d", (int) t->h); break; case 'G': length = slprintf(buffer, 32, "%d", (int) t->h); break;
case 'h': length = snprintf(buffer, 32, "%02d", (t->h % 12) ? (int) t->h % 12 : 12); break; case 'h': length = slprintf(buffer, 32, "%02d", (t->h % 12) ? (int) t->h % 12 : 12); break;
case 'H': length = snprintf(buffer, 32, "%02d", (int) t->h); break; case 'H': length = slprintf(buffer, 32, "%02d", (int) t->h); break;
case 'i': length = snprintf(buffer, 32, "%02d", (int) t->i); break; case 'i': length = slprintf(buffer, 32, "%02d", (int) t->i); break;
case 's': length = snprintf(buffer, 32, "%02d", (int) t->s); break; case 's': length = slprintf(buffer, 32, "%02d", (int) t->s); break;
/* timezone */ /* timezone */
case 'I': length = snprintf(buffer, 32, "%d", localtime ? offset->is_dst : 0); break; case 'I': length = slprintf(buffer, 32, "%d", localtime ? offset->is_dst : 0); break;
case 'P': rfc_colon = 1; /* break intentionally missing */ case 'P': rfc_colon = 1; /* break intentionally missing */
case 'O': length = snprintf(buffer, 32, "%c%02d%s%02d", case 'O': length = slprintf(buffer, 32, "%c%02d%s%02d",
localtime ? ((offset->offset < 0) ? '-' : '+') : '+', localtime ? ((offset->offset < 0) ? '-' : '+') : '+',
localtime ? abs(offset->offset / 3600) : 0, localtime ? abs(offset->offset / 3600) : 0,
rfc_colon ? ":" : "", rfc_colon ? ":" : "",
localtime ? abs((offset->offset % 3600) / 60) : 0 localtime ? abs((offset->offset % 3600) / 60) : 0
); );
break; break;
case 'T': length = snprintf(buffer, 32, "%s", localtime ? offset->abbr : "GMT"); break; case 'T': length = slprintf(buffer, 32, "%s", localtime ? offset->abbr : "GMT"); break;
case 'e': length = snprintf(buffer, 32, "%s", localtime ? t->tz_info->name : "UTC"); break; case 'e': length = slprintf(buffer, 32, "%s", localtime ? t->tz_info->name : "UTC"); break;
case 'Z': length = snprintf(buffer, 32, "%d", localtime ? offset->offset : 0); break; case 'Z': length = slprintf(buffer, 32, "%d", localtime ? offset->offset : 0); break;
/* full date/time */ /* full date/time */
case 'c': length = snprintf(buffer, 32, "%04d-%02d-%02dT%02d:%02d:%02d%c%02d:%02d", case 'c': length = slprintf(buffer, 32, "%04d-%02d-%02dT%02d:%02d:%02d%c%02d:%02d",
(int) t->y, (int) t->m, (int) t->d, (int) t->y, (int) t->m, (int) t->d,
(int) t->h, (int) t->i, (int) t->s, (int) t->h, (int) t->i, (int) t->s,
localtime ? ((offset->offset < 0) ? '-' : '+') : '+', localtime ? ((offset->offset < 0) ? '-' : '+') : '+',
@ -815,7 +815,7 @@ static char *date_format(char *format, int format_len, timelib_time *t, int loca
localtime ? abs((offset->offset % 3600) / 60) : 0 localtime ? abs((offset->offset % 3600) / 60) : 0
); );
break; break;
case 'r': length = snprintf(buffer, 32, "%3s, %02d %3s %04d %02d:%02d:%02d %c%02d%02d", case 'r': length = slprintf(buffer, 32, "%3s, %02d %3s %04d %02d:%02d:%02d %c%02d%02d",
php_date_short_day_name(t->y, t->m, t->d), php_date_short_day_name(t->y, t->m, t->d),
(int) t->d, mon_short_names[t->m - 1], (int) t->d, mon_short_names[t->m - 1],
(int) t->y, (int) t->h, (int) t->i, (int) t->s, (int) t->y, (int) t->h, (int) t->i, (int) t->s,
@ -824,7 +824,7 @@ static char *date_format(char *format, int format_len, timelib_time *t, int loca
localtime ? abs((offset->offset % 3600) / 60) : 0 localtime ? abs((offset->offset % 3600) / 60) : 0
); );
break; break;
case 'U': length = snprintf(buffer, 32, "%lld", (timelib_sll) t->sse); break; case 'U': length = slprintf(buffer, 32, "%lld", (timelib_sll) t->sse); break;
case '\\': if (i < format_len) i++; /* break intentionally missing */ case '\\': if (i < format_len) i++; /* break intentionally missing */

10
ext/exif/exif.c
View file

@ -1032,22 +1032,22 @@ static unsigned char* exif_char_dump(unsigned char * addr, int len, int offset)
static unsigned char tmp[20]; static unsigned char tmp[20];
int c, i, p=0, n = 5+31; int c, i, p=0, n = 5+31;
p += snprintf(buf+p, sizeof(buf)-p, "\nDump Len: %08X (%d)", len, len); p += slprintf(buf+p, sizeof(buf)-p, "\nDump Len: %08X (%d)", len, len);
if (len) { if (len) {
for(i=0; i<len+15 && p+n<=sizeof(buf); i++) { for(i=0; i<len+15 && p+n<=sizeof(buf); i++) {
if (i%16==0) { if (i%16==0) {
p += snprintf(buf+p, sizeof(buf)-p, "\n%08X: ", i+offset); p += slprintf(buf+p, sizeof(buf)-p, "\n%08X: ", i+offset);
} }
if (i<len) { if (i<len) {
c = *addr++; c = *addr++;
p += snprintf(buf+p, sizeof(buf)-p, "%02X ", c); p += slprintf(buf+p, sizeof(buf)-p, "%02X ", c);
tmp[i%16] = c>=32 ? c : '.'; tmp[i%16] = c>=32 ? c : '.';
tmp[(i%16)+1] = '\0'; tmp[(i%16)+1] = '\0';
} else { } else {
p += snprintf(buf+p, sizeof(buf)-p, " "); p += slprintf(buf+p, sizeof(buf)-p, " ");
} }
if (i%16==15) { if (i%16==15) {
p += snprintf(buf+p, sizeof(buf)-p, " %s", tmp); p += slprintf(buf+p, sizeof(buf)-p, " %s", tmp);
if (i>=len) { if (i>=len) {
break; break;
} }

6
ext/imap/php_imap.c
View file

@ -3414,7 +3414,7 @@ int _php_imap_mail(char *to, char *subject, char *message, char *headers, char *
bt_len += strlen(addr->mailbox); bt_len += strlen(addr->mailbox);
bufferTo = safe_erealloc(bufferTo, bt_len, 1, strlen(addr->host)); bufferTo = safe_erealloc(bufferTo, bt_len, 1, strlen(addr->host));
bt_len += strlen(addr->host); bt_len += strlen(addr->host);
offset += snprintf(bufferTo + offset, bt_len - offset, "%s@%s,", addr->mailbox, addr->host); offset += slprintf(bufferTo + offset, bt_len - offset, "%s@%s,", addr->mailbox, addr->host);
} }
addr = addr->next; addr = addr->next;
} }
@ -3443,7 +3443,7 @@ int _php_imap_mail(char *to, char *subject, char *message, char *headers, char *
bt_len += strlen(addr->mailbox); bt_len += strlen(addr->mailbox);
bufferCc = safe_erealloc(bufferCc, bt_len, 1, strlen(addr->host)); bufferCc = safe_erealloc(bufferCc, bt_len, 1, strlen(addr->host));
bt_len += strlen(addr->host); bt_len += strlen(addr->host);
offset += snprintf(bufferCc + offset, bt_len - offset, "%s@%s,", addr->mailbox, addr->host); offset += slprintf(bufferCc + offset, bt_len - offset, "%s@%s,", addr->mailbox, addr->host);
} }
addr = addr->next; addr = addr->next;
} }
@ -3469,7 +3469,7 @@ int _php_imap_mail(char *to, char *subject, char *message, char *headers, char *
bt_len += strlen(addr->mailbox); bt_len += strlen(addr->mailbox);
bufferBcc = safe_erealloc(bufferBcc, bt_len, 1, strlen(addr->host)); bufferBcc = safe_erealloc(bufferBcc, bt_len, 1, strlen(addr->host));
bt_len += strlen(addr->host); bt_len += strlen(addr->host);
offset += snprintf(bufferBcc + offset, bt_len - offset, "%s@%s,", addr->mailbox, addr->host); offset += slprintf(bufferBcc + offset, bt_len - offset, "%s@%s,", addr->mailbox, addr->host);
} }
addr = addr->next; addr = addr->next;
} }

24
ext/interbase/ibase_query.c
View file

@ -1316,17 +1316,17 @@ static int _php_ibase_var_zval(zval *val, void *data, int type, int len, /* {{{
goto _sql_long; goto _sql_long;
#else #else
if (scale == 0) { if (scale == 0) {
l = snprintf(string_data, sizeof(string_data), "%" LL_MASK "d", *(ISC_INT64 *) data); l = slprintf(string_data, sizeof(string_data), "%" LL_MASK "d", *(ISC_INT64 *) data);
ZVAL_STRINGL(val,string_data,l,1); ZVAL_STRINGL(val,string_data,l,1);
} else { } else {
ISC_INT64 n = *(ISC_INT64 *) data, f = scales[-scale]; ISC_INT64 n = *(ISC_INT64 *) data, f = scales[-scale];
if (n >= 0) { if (n >= 0) {
l = snprintf(string_data, sizeof(string_data), "%" LL_MASK "d.%0*" LL_MASK "d", n / f, -scale, n % f); l = slprintf(string_data, sizeof(string_data), "%" LL_MASK "d.%0*" LL_MASK "d", n / f, -scale, n % f);
} else if (n <= -f) { } else if (n <= -f) {
l = snprintf(string_data, sizeof(string_data), "%" LL_MASK "d.%0*" LL_MASK "d", n / f, -scale, -n % f); l = slprintf(string_data, sizeof(string_data), "%" LL_MASK "d.%0*" LL_MASK "d", n / f, -scale, -n % f);
} else { } else {
l = snprintf(string_data, sizeof(string_data), "-0.%0*" LL_MASK "d", -scale, -n % f); l = slprintf(string_data, sizeof(string_data), "-0.%0*" LL_MASK "d", -scale, -n % f);
} }
ZVAL_STRINGL(val,string_data,l,1); ZVAL_STRINGL(val,string_data,l,1);
} }
@ -1341,11 +1341,11 @@ static int _php_ibase_var_zval(zval *val, void *data, int type, int len, /* {{{
long f = (long) scales[-scale]; long f = (long) scales[-scale];
if (n >= 0) { if (n >= 0) {
l = snprintf(string_data, sizeof(string_data), "%ld.%0*ld", n / f, -scale, n % f); l = slprintf(string_data, sizeof(string_data), "%ld.%0*ld", n / f, -scale, n % f);
} else if (n <= -f) { } else if (n <= -f) {
l = snprintf(string_data, sizeof(string_data), "%ld.%0*ld", n / f, -scale, -n % f); l = slprintf(string_data, sizeof(string_data), "%ld.%0*ld", n / f, -scale, -n % f);
} else { } else {
l = snprintf(string_data, sizeof(string_data), "-0.%0*ld", -scale, -n % f); l = slprintf(string_data, sizeof(string_data), "-0.%0*ld", -scale, -n % f);
} }
ZVAL_STRINGL(val,string_data,l,1); ZVAL_STRINGL(val,string_data,l,1);
} }
@ -1385,14 +1385,14 @@ format_date_time:
#else #else
switch (type & ~1) { switch (type & ~1) {
default: default:
l = snprintf(string_data, sizeof(string_data), "%02d/%02d/%4d %02d:%02d:%02d", t.tm_mon+1, t.tm_mday, l = slprintf(string_data, sizeof(string_data), "%02d/%02d/%4d %02d:%02d:%02d", t.tm_mon+1, t.tm_mday,
t.tm_year + 1900, t.tm_hour, t.tm_min, t.tm_sec); t.tm_year + 1900, t.tm_hour, t.tm_min, t.tm_sec);
break; break;
case SQL_TYPE_DATE: case SQL_TYPE_DATE:
l = snprintf(string_data, sizeof(string_data), "%02d/%02d/%4d", t.tm_mon + 1, t.tm_mday, t.tm_year+1900); l = slprintf(string_data, sizeof(string_data), "%02d/%02d/%4d", t.tm_mon + 1, t.tm_mday, t.tm_year+1900);
break; break;
case SQL_TYPE_TIME: case SQL_TYPE_TIME:
l = snprintf(string_data, sizeof(string_data), "%02d:%02d:%02d", t.tm_hour, t.tm_min, t.tm_sec); l = slprintf(string_data, sizeof(string_data), "%02d:%02d:%02d", t.tm_hour, t.tm_min, t.tm_sec);
break; break;
} }
#endif #endif
@ -1937,7 +1937,7 @@ static void _php_ibase_field_info(zval *return_value, XSQLVAR *var) /* {{{ */
add_index_stringl(return_value, 2, var->relname, var->relname_length, 1); add_index_stringl(return_value, 2, var->relname, var->relname_length, 1);
add_assoc_stringl(return_value, "relation", var->relname, var->relname_length, 1); add_assoc_stringl(return_value, "relation", var->relname, var->relname_length, 1);
len = snprintf(buf, 16, "%d", var->sqllen); len = slprintf(buf, 16, "%d", var->sqllen);
add_index_stringl(return_value, 3, buf, len, 1); add_index_stringl(return_value, 3, buf, len, 1);
add_assoc_stringl(return_value, "length", buf, len, 1); add_assoc_stringl(return_value, "length", buf, len, 1);
@ -1956,7 +1956,7 @@ static void _php_ibase_field_info(zval *return_value, XSQLVAR *var) /* {{{ */
precision = 18; precision = 18;
break; break;
} }
len = snprintf(buf, 16, "NUMERIC(%d,%d)", precision, -var->sqlscale); len = slprintf(buf, 16, "NUMERIC(%d,%d)", precision, -var->sqlscale);
add_index_stringl(return_value, 4, s, len, 1); add_index_stringl(return_value, 4, s, len, 1);
add_assoc_stringl(return_value, "type", s, len, 1); add_assoc_stringl(return_value, "type", s, len, 1);
} else { } else {

10
ext/interbase/ibase_service.c
View file

@ -160,7 +160,7 @@ static void _php_ibase_user(INTERNAL_FUNCTION_PARAMETERS, char operation) /* {{{
for (i = 0; i < sizeof(user_flags); ++i) { for (i = 0; i < sizeof(user_flags); ++i) {
if (args[i] != NULL) { if (args[i] != NULL) {
int chunk = snprintf(&buf[spb_len], sizeof(buf) - spb_len, "%c%c%c%s", int chunk = slprintf(&buf[spb_len], sizeof(buf) - spb_len, "%c%c%c%s",
user_flags[i], (char)args_len[i], (char)(args_len[i] >> 8), args[i]); user_flags[i], (char)args_len[i], (char)(args_len[i] >> 8), args[i]);
if ((spb_len + chunk) > sizeof(buf) || chunk <= 0) { if ((spb_len + chunk) > sizeof(buf) || chunk <= 0) {
@ -224,7 +224,7 @@ PHP_FUNCTION(ibase_service_attach)
} }
/* construct the spb, hack the service name into it as well */ /* construct the spb, hack the service name into it as well */
spb_len = snprintf(buf, sizeof(buf), "%c%c%c%c%s%c%c%s" "%s:service_mgr", spb_len = slprintf(buf, sizeof(buf), "%c%c%c%c%s%c%c%s" "%s:service_mgr",
isc_spb_version, isc_spb_current_version, isc_spb_user_name, (char)ulen, isc_spb_version, isc_spb_current_version, isc_spb_user_name, (char)ulen,
user, isc_spb_password, (char)plen, pass, host); user, isc_spb_password, (char)plen, pass, host);
@ -441,7 +441,7 @@ static void _php_ibase_backup_restore(INTERNAL_FUNCTION_PARAMETERS, char operati
"Interbase service manager handle", le_service); "Interbase service manager handle", le_service);
/* fill the param buffer */ /* fill the param buffer */
spb_len = snprintf(buf, sizeof(buf), "%c%c%c%c%s%c%c%c%s%c%c%c%c%c", spb_len = slprintf(buf, sizeof(buf), "%c%c%c%c%s%c%c%c%s%c%c%c%c%c",
operation, isc_spb_dbname, (char)dblen, (char)(dblen >> 8), db, operation, isc_spb_dbname, (char)dblen, (char)(dblen >> 8), db,
isc_spb_bkp_file, (char)bklen, (char)(bklen >> 8), bk, isc_spb_options, isc_spb_bkp_file, (char)bklen, (char)(bklen >> 8), bk, isc_spb_options,
(char)opts,(char)(opts >> 8), (char)(opts >> 16), (char)(opts >> 24)); (char)opts,(char)(opts >> 8), (char)(opts >> 16), (char)(opts >> 24));
@ -544,7 +544,7 @@ options_argument:
case isc_spb_prp_deny_new_transactions: case isc_spb_prp_deny_new_transactions:
case isc_spb_prp_deny_new_attachments: case isc_spb_prp_deny_new_attachments:
case isc_spb_prp_set_sql_dialect: case isc_spb_prp_set_sql_dialect:
spb_len = snprintf(buf, sizeof(buf), "%c%c%c%c%s%c%c%c%c%c", spb_len = slprintf(buf, sizeof(buf), "%c%c%c%c%s%c%c%c%c%c",
svc_action, isc_spb_dbname, (char)dblen, (char)(dblen >> 8), db, svc_action, isc_spb_dbname, (char)dblen, (char)(dblen >> 8), db,
(char)action, (char)argument, (char)(argument >> 8), (char)(argument >> 16), (char)action, (char)argument, (char)(argument >> 8), (char)(argument >> 16),
(char)(argument >> 24)); (char)(argument >> 24));
@ -553,7 +553,7 @@ options_argument:
case isc_spb_prp_reserve_space: case isc_spb_prp_reserve_space:
case isc_spb_prp_write_mode: case isc_spb_prp_write_mode:
case isc_spb_prp_access_mode: case isc_spb_prp_access_mode:
spb_len = snprintf(buf, sizeof(buf), "%c%c%c%c%s%c%c", spb_len = slprintf(buf, sizeof(buf), "%c%c%c%c%s%c%c",
isc_action_svc_properties, isc_spb_dbname, (char)dblen, (char)(dblen >> 8), isc_action_svc_properties, isc_spb_dbname, (char)dblen, (char)(dblen >> 8),
db, (char)action, (char)argument); db, (char)action, (char)argument);
} }

6
ext/interbase/interbase.c
View file

@ -595,19 +595,19 @@ int _php_ibase_attach_db(char **args, int *len, long *largs, isc_db_handle *db T
for (i = 0; i < sizeof(dpb_args); ++i) { for (i = 0; i < sizeof(dpb_args); ++i) {
if (dpb_args[i] && args[i] && len[i] && buf_len > 0) { if (dpb_args[i] && args[i] && len[i] && buf_len > 0) {
dpb_len = snprintf(dpb, buf_len, "%c%c%s", dpb_args[i],(unsigned char)len[i],args[i]); dpb_len = slprintf(dpb, buf_len, "%c%c%s", dpb_args[i],(unsigned char)len[i],args[i]);
dpb += dpb_len; dpb += dpb_len;
buf_len -= dpb_len; buf_len -= dpb_len;
} }
} }
if (largs[BUF] && buf_len > 0) { if (largs[BUF] && buf_len > 0) {
dpb_len = snprintf(dpb, buf_len, "%c\2%c%c", isc_dpb_num_buffers, dpb_len = slprintf(dpb, buf_len, "%c\2%c%c", isc_dpb_num_buffers,
(char)(largs[BUF] >> 8), (char)(largs[BUF] & 0xff)); (char)(largs[BUF] >> 8), (char)(largs[BUF] & 0xff));
dpb += dpb_len; dpb += dpb_len;
buf_len -= dpb_len; buf_len -= dpb_len;
} }
if (largs[SYNC] && buf_len > 0) { if (largs[SYNC] && buf_len > 0) {
dpb_len = snprintf(dpb, buf_len, "%c\1%c", isc_dpb_force_write, largs[SYNC] == isc_spb_prp_wm_sync ? 1 : 0); dpb_len = slprintf(dpb, buf_len, "%c\1%c", isc_dpb_force_write, largs[SYNC] == isc_spb_prp_wm_sync ? 1 : 0);
dpb += dpb_len; dpb += dpb_len;
buf_len -= dpb_len; buf_len -= dpb_len;
} }

18
ext/pdo_firebird/firebird_statement.c
View file

@ -327,13 +327,13 @@ static int firebird_stmt_get_col(pdo_stmt_t *stmt, int colno, char **ptr, /* {{
*ptr = FETCH_BUF(S->fetch_buf[colno], char, CHAR_BUF_LEN, NULL); *ptr = FETCH_BUF(S->fetch_buf[colno], char, CHAR_BUF_LEN, NULL);
if (n >= 0) { if (n >= 0) {
*len = snprintf(*ptr, CHAR_BUF_LEN, "%" LL_MASK "d.%0*" LL_MASK "d", *len = slprintf(*ptr, CHAR_BUF_LEN, "%" LL_MASK "d.%0*" LL_MASK "d",
n / f, -var->sqlscale, n % f); n / f, -var->sqlscale, n % f);
} else if (n < -f) { } else if (n < -f) {
*len = snprintf(*ptr, CHAR_BUF_LEN, "%" LL_MASK "d.%0*" LL_MASK "d", *len = slprintf(*ptr, CHAR_BUF_LEN, "%" LL_MASK "d.%0*" LL_MASK "d",
n / f, -var->sqlscale, -n % f); n / f, -var->sqlscale, -n % f);
} else { } else {
*len = snprintf(*ptr, CHAR_BUF_LEN, "-0.%0*" LL_MASK "d", -var->sqlscale, -n % f); *len = slprintf(*ptr, CHAR_BUF_LEN, "-0.%0*" LL_MASK "d", -var->sqlscale, -n % f);
} }
} else { } else {
switch (var->sqltype & ~1) { switch (var->sqltype & ~1) {
@ -356,23 +356,23 @@ static int firebird_stmt_get_col(pdo_stmt_t *stmt, int colno, char **ptr, /* {{
/* --- cut here --- */ /* --- cut here --- */
case SQL_SHORT: case SQL_SHORT:
*ptr = FETCH_BUF(S->fetch_buf[colno], char, CHAR_BUF_LEN, NULL); *ptr = FETCH_BUF(S->fetch_buf[colno], char, CHAR_BUF_LEN, NULL);
*len = snprintf(*ptr, CHAR_BUF_LEN, "%d", *(short*)var->sqldata); *len = slprintf(*ptr, CHAR_BUF_LEN, "%d", *(short*)var->sqldata);
break; break;
case SQL_LONG: case SQL_LONG:
*ptr = FETCH_BUF(S->fetch_buf[colno], char, CHAR_BUF_LEN, NULL); *ptr = FETCH_BUF(S->fetch_buf[colno], char, CHAR_BUF_LEN, NULL);
*len = snprintf(*ptr, CHAR_BUF_LEN, "%ld", *(ISC_LONG*)var->sqldata); *len = slprintf(*ptr, CHAR_BUF_LEN, "%ld", *(ISC_LONG*)var->sqldata);
break; break;
case SQL_INT64: case SQL_INT64:
*ptr = FETCH_BUF(S->fetch_buf[colno], char, CHAR_BUF_LEN, NULL); *ptr = FETCH_BUF(S->fetch_buf[colno], char, CHAR_BUF_LEN, NULL);
*len = snprintf(*ptr, CHAR_BUF_LEN, "%" LL_MASK "d", *(ISC_INT64*)var->sqldata); *len = slprintf(*ptr, CHAR_BUF_LEN, "%" LL_MASK "d", *(ISC_INT64*)var->sqldata);
break; break;
case SQL_FLOAT: case SQL_FLOAT:
*ptr = FETCH_BUF(S->fetch_buf[colno], char, CHAR_BUF_LEN, NULL); *ptr = FETCH_BUF(S->fetch_buf[colno], char, CHAR_BUF_LEN, NULL);
*len = snprintf(*ptr, CHAR_BUF_LEN, "%F", *(float*)var->sqldata); *len = slprintf(*ptr, CHAR_BUF_LEN, "%F", *(float*)var->sqldata);
break; break;
case SQL_DOUBLE: case SQL_DOUBLE:
*ptr = FETCH_BUF(S->fetch_buf[colno], char, CHAR_BUF_LEN, NULL); *ptr = FETCH_BUF(S->fetch_buf[colno], char, CHAR_BUF_LEN, NULL);
*len = snprintf(*ptr, CHAR_BUF_LEN, "%F" , *(double*)var->sqldata); *len = slprintf(*ptr, CHAR_BUF_LEN, "%F" , *(double*)var->sqldata);
break; break;
/* --- cut here --- */ /* --- cut here --- */
#if abies_0 #if abies_0
@ -394,7 +394,7 @@ static int firebird_stmt_get_col(pdo_stmt_t *stmt, int colno, char **ptr, /* {{
*ptr = var->sqldata; *ptr = var->sqldata;
#else #else
*ptr = FETCH_BUF(S->fetch_buf[colno], char, CHAR_BUF_LEN, NULL); *ptr = FETCH_BUF(S->fetch_buf[colno], char, CHAR_BUF_LEN, NULL);
*len = snprintf(*ptr, CHAR_BUF_LEN, "%" LL_MASK "d", *(ISC_INT64*)var->sqldata); *len = slprintf(*ptr, CHAR_BUF_LEN, "%" LL_MASK "d", *(ISC_INT64*)var->sqldata);
#endif #endif
break; break;
case SQL_FLOAT: case SQL_FLOAT:

8
ext/soap/soap.c
View file

@ -2049,10 +2049,10 @@ static void soap_error_handler(int error_num, const char *error_filename, const
INIT_ZVAL(outbuflen); INIT_ZVAL(outbuflen);
#ifdef va_copy #ifdef va_copy
va_copy(argcopy, args); va_copy(argcopy, args);
buffer_len = vsnprintf(buffer, sizeof(buffer)-1, format, argcopy); buffer_len = vslprintf(buffer, sizeof(buffer)-1, format, argcopy);
va_end(argcopy); va_end(argcopy);
#else #else
buffer_len = vsnprintf(buffer, sizeof(buffer)-1, format, args); buffer_len = vslprintf(buffer, sizeof(buffer)-1, format, args);
#endif #endif
buffer[sizeof(buffer)-1]=0; buffer[sizeof(buffer)-1]=0;
if (buffer_len > sizeof(buffer) - 1 || buffer_len < 0) { if (buffer_len > sizeof(buffer) - 1 || buffer_len < 0) {
@ -2109,10 +2109,10 @@ static void soap_error_handler(int error_num, const char *error_filename, const
#ifdef va_copy #ifdef va_copy
va_copy(argcopy, args); va_copy(argcopy, args);
buffer_len = vsnprintf(buffer, sizeof(buffer)-1, format, argcopy); buffer_len = vslprintf(buffer, sizeof(buffer)-1, format, argcopy);
va_end(argcopy); va_end(argcopy);
#else #else
buffer_len = vsnprintf(buffer, sizeof(buffer)-1, format, args); buffer_len = vslprintf(buffer, sizeof(buffer)-1, format, args);
#endif #endif
buffer[sizeof(buffer)-1]=0; buffer[sizeof(buffer)-1]=0;
if (buffer_len > sizeof(buffer) - 1 || buffer_len < 0) { if (buffer_len > sizeof(buffer) - 1 || buffer_len < 0) {