Skip to content

Commit cc04404

Browse files
author
Ilia Alshanetsky
committed
snprintf() -> slprintf() # Part 1
1 parent 1d08a8d commit cc04404

File tree

8 files changed

+76
-76
lines changed

8 files changed

+76
-76
lines changed

‎ext/date/php_date.c

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -748,74 +748,74 @@ static char *date_format(char *format, int format_len, timelib_time *t, int loca
748748
for (i = 0; i < format_len; i++) {
749749
switch (format[i]) {
750750
/* day */
751-
case 'd': length = snprintf(buffer, 32, "%02d", (int) t->d); break;
752-
case 'D': length = snprintf(buffer, 32, "%s", php_date_short_day_name(t->y, t->m, t->d)); break;
753-
case 'j': length = snprintf(buffer, 32, "%d", (int) t->d); break;
754-
case 'l': length = snprintf(buffer, 32, "%s", php_date_full_day_name(t->y, t->m, t->d)); break;
755-
case 'S': length = snprintf(buffer, 32, "%s", english_suffix(t->d)); break;
756-
case 'w': length = snprintf(buffer, 32, "%d", (int) timelib_day_of_week(t->y, t->m, t->d)); break;
757-
case 'N': length = snprintf(buffer, 32, "%d", (int) timelib_iso_day_of_week(t->y, t->m, t->d)); break;
758-
case 'z': length = snprintf(buffer, 32, "%d", (int) timelib_day_of_year(t->y, t->m, t->d)); break;
751+
case 'd': length = slprintf(buffer, 32, "%02d", (int) t->d); break;
752+
case 'D': length = slprintf(buffer, 32, "%s", php_date_short_day_name(t->y, t->m, t->d)); break;
753+
case 'j': length = slprintf(buffer, 32, "%d", (int) t->d); break;
754+
case 'l': length = slprintf(buffer, 32, "%s", php_date_full_day_name(t->y, t->m, t->d)); break;
755+
case 'S': length = slprintf(buffer, 32, "%s", english_suffix(t->d)); break;
756+
case 'w': length = slprintf(buffer, 32, "%d", (int) timelib_day_of_week(t->y, t->m, t->d)); break;
757+
case 'N': length = slprintf(buffer, 32, "%d", (int) timelib_iso_day_of_week(t->y, t->m, t->d)); break;
758+
case 'z': length = slprintf(buffer, 32, "%d", (int) timelib_day_of_year(t->y, t->m, t->d)); break;
759759

760760
/* week */
761-
case 'W': length = snprintf(buffer, 32, "%02d", (int) isoweek); break; /* iso weeknr */
762-
case 'o': length = snprintf(buffer, 32, "%d", (int) isoyear); break; /* iso year */
761+
case 'W': length = slprintf(buffer, 32, "%02d", (int) isoweek); break; /* iso weeknr */
762+
case 'o': length = slprintf(buffer, 32, "%d", (int) isoyear); break; /* iso year */
763763

764764
/* month */
765-
case 'F': length = snprintf(buffer, 32, "%s", mon_full_names[t->m - 1]); break;
766-
case 'm': length = snprintf(buffer, 32, "%02d", (int) t->m); break;
767-
case 'M': length = snprintf(buffer, 32, "%s", mon_short_names[t->m - 1]); break;
768-
case 'n': length = snprintf(buffer, 32, "%d", (int) t->m); break;
769-
case 't': length = snprintf(buffer, 32, "%d", (int) timelib_days_in_month(t->y, t->m)); break;
765+
case 'F': length = slprintf(buffer, 32, "%s", mon_full_names[t->m - 1]); break;
766+
case 'm': length = slprintf(buffer, 32, "%02d", (int) t->m); break;
767+
case 'M': length = slprintf(buffer, 32, "%s", mon_short_names[t->m - 1]); break;
768+
case 'n': length = slprintf(buffer, 32, "%d", (int) t->m); break;
769+
case 't': length = slprintf(buffer, 32, "%d", (int) timelib_days_in_month(t->y, t->m)); break;
770770

771771
/* year */
772-
case 'L': length = snprintf(buffer, 32, "%d", timelib_is_leap((int) t->y)); break;
773-
case 'y': length = snprintf(buffer, 32, "%02d", (int) t->y % 100); break;
774-
case 'Y': length = snprintf(buffer, 32, "%04d", (int) t->y); break;
772+
case 'L': length = slprintf(buffer, 32, "%d", timelib_is_leap((int) t->y)); break;
773+
case 'y': length = slprintf(buffer, 32, "%02d", (int) t->y % 100); break;
774+
case 'Y': length = slprintf(buffer, 32, "%04d", (int) t->y); break;
775775

776776
/* time */
777-
case 'a': length = snprintf(buffer, 32, "%s", t->h >= 12 ? "pm" : "am"); break;
778-
case 'A': length = snprintf(buffer, 32, "%s", t->h >= 12 ? "PM" : "AM"); break;
777+
case 'a': length = slprintf(buffer, 32, "%s", t->h >= 12 ? "pm" : "am"); break;
778+
case 'A': length = slprintf(buffer, 32, "%s", t->h >= 12 ? "PM" : "AM"); break;
779779
case 'B': {
780780
int retval = (((((long)t->sse)-(((long)t->sse) - ((((long)t->sse) % 86400) + 3600))) * 10) / 864);
781781
while (retval < 0) {
782782
retval += 1000;
783783
}
784784
retval = retval % 1000;
785-
length = snprintf(buffer, 32, "%03d", retval);
785+
length = slprintf(buffer, 32, "%03d", retval);
786786
break;
787787
}
788-
case 'g': length = snprintf(buffer, 32, "%d", (t->h % 12) ? (int) t->h % 12 : 12); break;
789-
case 'G': length = snprintf(buffer, 32, "%d", (int) t->h); break;
790-
case 'h': length = snprintf(buffer, 32, "%02d", (t->h % 12) ? (int) t->h % 12 : 12); break;
791-
case 'H': length = snprintf(buffer, 32, "%02d", (int) t->h); break;
792-
case 'i': length = snprintf(buffer, 32, "%02d", (int) t->i); break;
793-
case 's': length = snprintf(buffer, 32, "%02d", (int) t->s); break;
788+
case 'g': length = slprintf(buffer, 32, "%d", (t->h % 12) ? (int) t->h % 12 : 12); break;
789+
case 'G': length = slprintf(buffer, 32, "%d", (int) t->h); break;
790+
case 'h': length = slprintf(buffer, 32, "%02d", (t->h % 12) ? (int) t->h % 12 : 12); break;
791+
case 'H': length = slprintf(buffer, 32, "%02d", (int) t->h); break;
792+
case 'i': length = slprintf(buffer, 32, "%02d", (int) t->i); break;
793+
case 's': length = slprintf(buffer, 32, "%02d", (int) t->s); break;
794794

795795
/* timezone */
796-
case 'I': length = snprintf(buffer, 32, "%d", localtime ? offset->is_dst : 0); break;
796+
case 'I': length = slprintf(buffer, 32, "%d", localtime ? offset->is_dst : 0); break;
797797
case 'P': rfc_colon = 1; /* break intentionally missing */
798-
case 'O': length = snprintf(buffer, 32, "%c%02d%s%02d",
798+
case 'O': length = slprintf(buffer, 32, "%c%02d%s%02d",
799799
localtime ? ((offset->offset < 0) ? '-' : '+') : '+',
800800
localtime ? abs(offset->offset / 3600) : 0,
801801
rfc_colon ? ":" : "",
802802
localtime ? abs((offset->offset % 3600) / 60) : 0
803803
);
804804
break;
805-
case 'T': length = snprintf(buffer, 32, "%s", localtime ? offset->abbr : "GMT"); break;
806-
case 'e': length = snprintf(buffer, 32, "%s", localtime ? t->tz_info->name : "UTC"); break;
807-
case 'Z': length = snprintf(buffer, 32, "%d", localtime ? offset->offset : 0); break;
805+
case 'T': length = slprintf(buffer, 32, "%s", localtime ? offset->abbr : "GMT"); break;
806+
case 'e': length = slprintf(buffer, 32, "%s", localtime ? t->tz_info->name : "UTC"); break;
807+
case 'Z': length = slprintf(buffer, 32, "%d", localtime ? offset->offset : 0); break;
808808

809809
/* full date/time */
810-
case 'c': length = snprintf(buffer, 32, "%04d-%02d-%02dT%02d:%02d:%02d%c%02d:%02d",
810+
case 'c': length = slprintf(buffer, 32, "%04d-%02d-%02dT%02d:%02d:%02d%c%02d:%02d",
811811
(int) t->y, (int) t->m, (int) t->d,
812812
(int) t->h, (int) t->i, (int) t->s,
813813
localtime ? ((offset->offset < 0) ? '-' : '+') : '+',
814814
localtime ? abs(offset->offset / 3600) : 0,
815815
localtime ? abs((offset->offset % 3600) / 60) : 0
816816
);
817817
break;
818-
case 'r': length = snprintf(buffer, 32, "%3s, %02d %3s %04d %02d:%02d:%02d %c%02d%02d",
818+
case 'r': length = slprintf(buffer, 32, "%3s, %02d %3s %04d %02d:%02d:%02d %c%02d%02d",
819819
php_date_short_day_name(t->y, t->m, t->d),
820820
(int) t->d, mon_short_names[t->m - 1],
821821
(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
824824
localtime ? abs((offset->offset % 3600) / 60) : 0
825825
);
826826
break;
827-
case 'U': length = snprintf(buffer, 32, "%lld", (timelib_sll) t->sse); break;
827+
case 'U': length = slprintf(buffer, 32, "%lld", (timelib_sll) t->sse); break;
828828

829829
case '\\': if (i < format_len) i++; /* break intentionally missing */
830830

‎ext/exif/exif.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1032,22 +1032,22 @@ static unsigned char* exif_char_dump(unsigned char * addr, int len, int offset)
10321032
static unsigned char tmp[20];
10331033
int c, i, p=0, n = 5+31;
10341034

1035-
p += snprintf(buf+p, sizeof(buf)-p, "\nDump Len: %08X (%d)", len, len);
1035+
p += slprintf(buf+p, sizeof(buf)-p, "\nDump Len: %08X (%d)", len, len);
10361036
if (len) {
10371037
for(i=0; i<len+15 && p+n<=sizeof(buf); i++) {
10381038
if (i%16==0) {
1039-
p += snprintf(buf+p, sizeof(buf)-p, "\n%08X: ", i+offset);
1039+
p += slprintf(buf+p, sizeof(buf)-p, "\n%08X: ", i+offset);
10401040
}
10411041
if (i<len) {
10421042
c = *addr++;
1043-
p += snprintf(buf+p, sizeof(buf)-p, "%02X ", c);
1043+
p += slprintf(buf+p, sizeof(buf)-p, "%02X ", c);
10441044
tmp[i%16] = c>=32 ? c : '.';
10451045
tmp[(i%16)+1] = '\0';
10461046
} else {
1047-
p += snprintf(buf+p, sizeof(buf)-p, " ");
1047+
p += slprintf(buf+p, sizeof(buf)-p, " ");
10481048
}
10491049
if (i%16==15) {
1050-
p += snprintf(buf+p, sizeof(buf)-p, " %s", tmp);
1050+
p += slprintf(buf+p, sizeof(buf)-p, " %s", tmp);
10511051
if (i>=len) {
10521052
break;
10531053
}

‎ext/imap/php_imap.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3414,7 +3414,7 @@ int _php_imap_mail(char *to, char *subject, char *message, char *headers, char *
34143414
bt_len += strlen(addr->mailbox);
34153415
bufferTo = safe_erealloc(bufferTo, bt_len, 1, strlen(addr->host));
34163416
bt_len += strlen(addr->host);
3417-
offset += snprintf(bufferTo + offset, bt_len - offset, "%s@%s,", addr->mailbox, addr->host);
3417+
offset += slprintf(bufferTo + offset, bt_len - offset, "%s@%s,", addr->mailbox, addr->host);
34183418
}
34193419
addr = addr->next;
34203420
}
@@ -3443,7 +3443,7 @@ int _php_imap_mail(char *to, char *subject, char *message, char *headers, char *
34433443
bt_len += strlen(addr->mailbox);
34443444
bufferCc = safe_erealloc(bufferCc, bt_len, 1, strlen(addr->host));
34453445
bt_len += strlen(addr->host);
3446-
offset += snprintf(bufferCc + offset, bt_len - offset, "%s@%s,", addr->mailbox, addr->host);
3446+
offset += slprintf(bufferCc + offset, bt_len - offset, "%s@%s,", addr->mailbox, addr->host);
34473447
}
34483448
addr = addr->next;
34493449
}
@@ -3469,7 +3469,7 @@ int _php_imap_mail(char *to, char *subject, char *message, char *headers, char *
34693469
bt_len += strlen(addr->mailbox);
34703470
bufferBcc = safe_erealloc(bufferBcc, bt_len, 1, strlen(addr->host));
34713471
bt_len += strlen(addr->host);
3472-
offset += snprintf(bufferBcc + offset, bt_len - offset, "%s@%s,", addr->mailbox, addr->host);
3472+
offset += slprintf(bufferBcc + offset, bt_len - offset, "%s@%s,", addr->mailbox, addr->host);
34733473
}
34743474
addr = addr->next;
34753475
}

‎ext/interbase/ibase_query.c

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1316,17 +1316,17 @@ static int _php_ibase_var_zval(zval *val, void *data, int type, int len, /* {{{
13161316
goto _sql_long;
13171317
#else
13181318
if (scale == 0) {
1319-
l = snprintf(string_data, sizeof(string_data), "%" LL_MASK "d", *(ISC_INT64 *) data);
1319+
l = slprintf(string_data, sizeof(string_data), "%" LL_MASK "d", *(ISC_INT64 *) data);
13201320
ZVAL_STRINGL(val,string_data,l,1);
13211321
} else {
13221322
ISC_INT64 n = *(ISC_INT64 *) data, f = scales[-scale];
13231323

13241324
if (n >= 0) {
1325-
l = snprintf(string_data, sizeof(string_data), "%" LL_MASK "d.%0*" LL_MASK "d", n / f, -scale, n % f);
1325+
l = slprintf(string_data, sizeof(string_data), "%" LL_MASK "d.%0*" LL_MASK "d", n / f, -scale, n % f);
13261326
} else if (n <= -f) {
1327-
l = snprintf(string_data, sizeof(string_data), "%" LL_MASK "d.%0*" LL_MASK "d", n / f, -scale, -n % f);
1327+
l = slprintf(string_data, sizeof(string_data), "%" LL_MASK "d.%0*" LL_MASK "d", n / f, -scale, -n % f);
13281328
} else {
1329-
l = snprintf(string_data, sizeof(string_data), "-0.%0*" LL_MASK "d", -scale, -n % f);
1329+
l = slprintf(string_data, sizeof(string_data), "-0.%0*" LL_MASK "d", -scale, -n % f);
13301330
}
13311331
ZVAL_STRINGL(val,string_data,l,1);
13321332
}
@@ -1341,11 +1341,11 @@ static int _php_ibase_var_zval(zval *val, void *data, int type, int len, /* {{{
13411341
long f = (long) scales[-scale];
13421342

13431343
if (n >= 0) {
1344-
l = snprintf(string_data, sizeof(string_data), "%ld.%0*ld", n / f, -scale, n % f);
1344+
l = slprintf(string_data, sizeof(string_data), "%ld.%0*ld", n / f, -scale, n % f);
13451345
} else if (n <= -f) {
1346-
l = snprintf(string_data, sizeof(string_data), "%ld.%0*ld", n / f, -scale, -n % f);
1346+
l = slprintf(string_data, sizeof(string_data), "%ld.%0*ld", n / f, -scale, -n % f);
13471347
} else {
1348-
l = snprintf(string_data, sizeof(string_data), "-0.%0*ld", -scale, -n % f);
1348+
l = slprintf(string_data, sizeof(string_data), "-0.%0*ld", -scale, -n % f);
13491349
}
13501350
ZVAL_STRINGL(val,string_data,l,1);
13511351
}
@@ -1385,14 +1385,14 @@ static int _php_ibase_var_zval(zval *val, void *data, int type, int len, /* {{{
13851385
#else
13861386
switch (type & ~1) {
13871387
default:
1388-
l = snprintf(string_data, sizeof(string_data), "%02d/%02d/%4d %02d:%02d:%02d", t.tm_mon+1, t.tm_mday,
1388+
l = slprintf(string_data, sizeof(string_data), "%02d/%02d/%4d %02d:%02d:%02d", t.tm_mon+1, t.tm_mday,
13891389
t.tm_year + 1900, t.tm_hour, t.tm_min, t.tm_sec);
13901390
break;
13911391
case SQL_TYPE_DATE:
1392-
l = snprintf(string_data, sizeof(string_data), "%02d/%02d/%4d", t.tm_mon + 1, t.tm_mday, t.tm_year+1900);
1392+
l = slprintf(string_data, sizeof(string_data), "%02d/%02d/%4d", t.tm_mon + 1, t.tm_mday, t.tm_year+1900);
13931393
break;
13941394
case SQL_TYPE_TIME:
1395-
l = snprintf(string_data, sizeof(string_data), "%02d:%02d:%02d", t.tm_hour, t.tm_min, t.tm_sec);
1395+
l = slprintf(string_data, sizeof(string_data), "%02d:%02d:%02d", t.tm_hour, t.tm_min, t.tm_sec);
13961396
break;
13971397
}
13981398
#endif
@@ -1937,7 +1937,7 @@ static void _php_ibase_field_info(zval *return_value, XSQLVAR *var) /* {{{ */
19371937
add_index_stringl(return_value, 2, var->relname, var->relname_length, 1);
19381938
add_assoc_stringl(return_value, "relation", var->relname, var->relname_length, 1);
19391939

1940-
len = snprintf(buf, 16, "%d", var->sqllen);
1940+
len = slprintf(buf, 16, "%d", var->sqllen);
19411941
add_index_stringl(return_value, 3, buf, len, 1);
19421942
add_assoc_stringl(return_value, "length", buf, len, 1);
19431943

@@ -1956,7 +1956,7 @@ static void _php_ibase_field_info(zval *return_value, XSQLVAR *var) /* {{{ */
19561956
precision = 18;
19571957
break;
19581958
}
1959-
len = snprintf(buf, 16, "NUMERIC(%d,%d)", precision, -var->sqlscale);
1959+
len = slprintf(buf, 16, "NUMERIC(%d,%d)", precision, -var->sqlscale);
19601960
add_index_stringl(return_value, 4, s, len, 1);
19611961
add_assoc_stringl(return_value, "type", s, len, 1);
19621962
} else {

‎ext/interbase/ibase_service.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ static void _php_ibase_user(INTERNAL_FUNCTION_PARAMETERS, char operation) /* {{{
160160

161161
for (i = 0; i < sizeof(user_flags); ++i) {
162162
if (args[i] != NULL) {
163-
int chunk = snprintf(&buf[spb_len], sizeof(buf) - spb_len, "%c%c%c%s",
163+
int chunk = slprintf(&buf[spb_len], sizeof(buf) - spb_len, "%c%c%c%s",
164164
user_flags[i], (char)args_len[i], (char)(args_len[i] >> 8), args[i]);
165165

166166
if ((spb_len + chunk) > sizeof(buf) || chunk <= 0) {
@@ -224,7 +224,7 @@ PHP_FUNCTION(ibase_service_attach)
224224
}
225225

226226
/* construct the spb, hack the service name into it as well */
227-
spb_len = snprintf(buf, sizeof(buf), "%c%c%c%c%s%c%c%s" "%s:service_mgr",
227+
spb_len = slprintf(buf, sizeof(buf), "%c%c%c%c%s%c%c%s" "%s:service_mgr",
228228
isc_spb_version, isc_spb_current_version, isc_spb_user_name, (char)ulen,
229229
user, isc_spb_password, (char)plen, pass, host);
230230

@@ -441,7 +441,7 @@ static void _php_ibase_backup_restore(INTERNAL_FUNCTION_PARAMETERS, char operati
441441
"Interbase service manager handle", le_service);
442442

443443
/* fill the param buffer */
444-
spb_len = snprintf(buf, sizeof(buf), "%c%c%c%c%s%c%c%c%s%c%c%c%c%c",
444+
spb_len = slprintf(buf, sizeof(buf), "%c%c%c%c%s%c%c%c%s%c%c%c%c%c",
445445
operation, isc_spb_dbname, (char)dblen, (char)(dblen >> 8), db,
446446
isc_spb_bkp_file, (char)bklen, (char)(bklen >> 8), bk, isc_spb_options,
447447
(char)opts,(char)(opts >> 8), (char)(opts >> 16), (char)(opts >> 24));
@@ -544,7 +544,7 @@ static void _php_ibase_service_action(INTERNAL_FUNCTION_PARAMETERS, char svc_act
544544
case isc_spb_prp_deny_new_transactions:
545545
case isc_spb_prp_deny_new_attachments:
546546
case isc_spb_prp_set_sql_dialect:
547-
spb_len = snprintf(buf, sizeof(buf), "%c%c%c%c%s%c%c%c%c%c",
547+
spb_len = slprintf(buf, sizeof(buf), "%c%c%c%c%s%c%c%c%c%c",
548548
svc_action, isc_spb_dbname, (char)dblen, (char)(dblen >> 8), db,
549549
(char)action, (char)argument, (char)(argument >> 8), (char)(argument >> 16),
550550
(char)(argument >> 24));
@@ -553,7 +553,7 @@ static void _php_ibase_service_action(INTERNAL_FUNCTION_PARAMETERS, char svc_act
553553
case isc_spb_prp_reserve_space:
554554
case isc_spb_prp_write_mode:
555555
case isc_spb_prp_access_mode:
556-
spb_len = snprintf(buf, sizeof(buf), "%c%c%c%c%s%c%c",
556+
spb_len = slprintf(buf, sizeof(buf), "%c%c%c%c%s%c%c",
557557
isc_action_svc_properties, isc_spb_dbname, (char)dblen, (char)(dblen >> 8),
558558
db, (char)action, (char)argument);
559559
}

‎ext/interbase/interbase.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -595,19 +595,19 @@ int _php_ibase_attach_db(char **args, int *len, long *largs, isc_db_handle *db T
595595

596596
for (i = 0; i < sizeof(dpb_args); ++i) {
597597
if (dpb_args[i] && args[i] && len[i] && buf_len > 0) {
598-
dpb_len = snprintf(dpb, buf_len, "%c%c%s", dpb_args[i],(unsigned char)len[i],args[i]);
598+
dpb_len = slprintf(dpb, buf_len, "%c%c%s", dpb_args[i],(unsigned char)len[i],args[i]);
599599
dpb += dpb_len;
600600
buf_len -= dpb_len;
601601
}
602602
}
603603
if (largs[BUF] && buf_len > 0) {
604-
dpb_len = snprintf(dpb, buf_len, "%c\2%c%c", isc_dpb_num_buffers,
604+
dpb_len = slprintf(dpb, buf_len, "%c\2%c%c", isc_dpb_num_buffers,
605605
(char)(largs[BUF] >> 8), (char)(largs[BUF] & 0xff));
606606
dpb += dpb_len;
607607
buf_len -= dpb_len;
608608
}
609609
if (largs[SYNC] && buf_len > 0) {
610-
dpb_len = snprintf(dpb, buf_len, "%c\1%c", isc_dpb_force_write, largs[SYNC] == isc_spb_prp_wm_sync ? 1 : 0);
610+
dpb_len = slprintf(dpb, buf_len, "%c\1%c", isc_dpb_force_write, largs[SYNC] == isc_spb_prp_wm_sync ? 1 : 0);
611611
dpb += dpb_len;
612612
buf_len -= dpb_len;
613613
}

‎ext/pdo_firebird/firebird_statement.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -327,13 +327,13 @@ static int firebird_stmt_get_col(pdo_stmt_t *stmt, int colno, char **ptr, /* {{
327327
*ptr = FETCH_BUF(S->fetch_buf[colno], char, CHAR_BUF_LEN, NULL);
328328

329329
if (n >= 0) {
330-
*len = snprintf(*ptr, CHAR_BUF_LEN, "%" LL_MASK "d.%0*" LL_MASK "d",
330+
*len = slprintf(*ptr, CHAR_BUF_LEN, "%" LL_MASK "d.%0*" LL_MASK "d",
331331
n / f, -var->sqlscale, n % f);
332332
} else if (n < -f) {
333-
*len = snprintf(*ptr, CHAR_BUF_LEN, "%" LL_MASK "d.%0*" LL_MASK "d",
333+
*len = slprintf(*ptr, CHAR_BUF_LEN, "%" LL_MASK "d.%0*" LL_MASK "d",
334334
n / f, -var->sqlscale, -n % f);
335335
} else {
336-
*len = snprintf(*ptr, CHAR_BUF_LEN, "-0.%0*" LL_MASK "d", -var->sqlscale, -n % f);
336+
*len = slprintf(*ptr, CHAR_BUF_LEN, "-0.%0*" LL_MASK "d", -var->sqlscale, -n % f);
337337
}
338338
} else {
339339
switch (var->sqltype & ~1) {
@@ -356,23 +356,23 @@ static int firebird_stmt_get_col(pdo_stmt_t *stmt, int colno, char **ptr, /* {{
356356
/* --- cut here --- */
357357
case SQL_SHORT:
358358
*ptr = FETCH_BUF(S->fetch_buf[colno], char, CHAR_BUF_LEN, NULL);
359-
*len = snprintf(*ptr, CHAR_BUF_LEN, "%d", *(short*)var->sqldata);
359+
*len = slprintf(*ptr, CHAR_BUF_LEN, "%d", *(short*)var->sqldata);
360360
break;
361361
case SQL_LONG:
362362
*ptr = FETCH_BUF(S->fetch_buf[colno], char, CHAR_BUF_LEN, NULL);
363-
*len = snprintf(*ptr, CHAR_BUF_LEN, "%ld", *(ISC_LONG*)var->sqldata);
363+
*len = slprintf(*ptr, CHAR_BUF_LEN, "%ld", *(ISC_LONG*)var->sqldata);
364364
break;
365365
case SQL_INT64:
366366
*ptr = FETCH_BUF(S->fetch_buf[colno], char, CHAR_BUF_LEN, NULL);
367-
*len = snprintf(*ptr, CHAR_BUF_LEN, "%" LL_MASK "d", *(ISC_INT64*)var->sqldata);
367+
*len = slprintf(*ptr, CHAR_BUF_LEN, "%" LL_MASK "d", *(ISC_INT64*)var->sqldata);
368368
break;
369369
case SQL_FLOAT:
370370
*ptr = FETCH_BUF(S->fetch_buf[colno], char, CHAR_BUF_LEN, NULL);
371-
*len = snprintf(*ptr, CHAR_BUF_LEN, "%F", *(float*)var->sqldata);
371+
*len = slprintf(*ptr, CHAR_BUF_LEN, "%F", *(float*)var->sqldata);
372372
break;
373373
case SQL_DOUBLE:
374374
*ptr = FETCH_BUF(S->fetch_buf[colno], char, CHAR_BUF_LEN, NULL);
375-
*len = snprintf(*ptr, CHAR_BUF_LEN, "%F" , *(double*)var->sqldata);
375+
*len = slprintf(*ptr, CHAR_BUF_LEN, "%F" , *(double*)var->sqldata);
376376
break;
377377
/* --- cut here --- */
378378
#if abies_0
@@ -394,7 +394,7 @@ static int firebird_stmt_get_col(pdo_stmt_t *stmt, int colno, char **ptr, /* {{
394394
*ptr = var->sqldata;
395395
#else
396396
*ptr = FETCH_BUF(S->fetch_buf[colno], char, CHAR_BUF_LEN, NULL);
397-
*len = snprintf(*ptr, CHAR_BUF_LEN, "%" LL_MASK "d", *(ISC_INT64*)var->sqldata);
397+
*len = slprintf(*ptr, CHAR_BUF_LEN, "%" LL_MASK "d", *(ISC_INT64*)var->sqldata);
398398
#endif
399399
break;
400400
case SQL_FLOAT:

0 commit comments

Comments
 (0)