snprintf() -> slprintf()

# Part 1

diff --git a/ext/date/php_date.c b/ext/date/php_date.c
index 2ea2c42e2e02c0fff99b16ec1752eaea3453611d..509cd1e918bd6e99117554927513fe37022db882 100644 (file)
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@ -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++) {
                switch (format[i]) {
                        /* day */
-                       case 'd': length = snprintf(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 'j': length = snprintf(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 'S': length = snprintf(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 'N': length = snprintf(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 'd': length = slprintf(buffer, 32, "%02d", (int) 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 = slprintf(buffer, 32, "%d", (int) 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 = slprintf(buffer, 32, "%s", english_suffix(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 = slprintf(buffer, 32, "%d", (int) timelib_iso_day_of_week(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 */
-                       case 'W': length = snprintf(buffer, 32, "%02d", (int) isoweek); break; /* iso weeknr */
-                       case 'o': length = snprintf(buffer, 32, "%d", (int) isoyear); break; /* iso year */
+                       case 'W': length = slprintf(buffer, 32, "%02d", (int) isoweek); break; /* iso weeknr */
+                       case 'o': length = slprintf(buffer, 32, "%d", (int) isoyear); break; /* iso year */
 
                        /* month */
-                       case 'F': length = snprintf(buffer, 32, "%s", mon_full_names[t->m - 1]); break;
-                       case 'm': length = snprintf(buffer, 32, "%02d", (int) t->m); break;
-                       case 'M': length = snprintf(buffer, 32, "%s", mon_short_names[t->m - 1]); break;
-                       case 'n': length = snprintf(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 'F': length = slprintf(buffer, 32, "%s", mon_full_names[t->m - 1]); break;
+                       case 'm': length = slprintf(buffer, 32, "%02d", (int) t->m); break;
+                       case 'M': length = slprintf(buffer, 32, "%s", mon_short_names[t->m - 1]); break;
+                       case 'n': length = slprintf(buffer, 32, "%d", (int) t->m); break;
+                       case 't': length = slprintf(buffer, 32, "%d", (int) timelib_days_in_month(t->y, t->m)); break;
 
                        /* year */
-                       case 'L': length = snprintf(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 = snprintf(buffer, 32, "%04d", (int) t->y); break;
+                       case 'L': length = slprintf(buffer, 32, "%d", timelib_is_leap((int) t->y)); break;
+                       case 'y': length = slprintf(buffer, 32, "%02d", (int) t->y % 100); break;
+                       case 'Y': length = slprintf(buffer, 32, "%04d", (int) t->y); break;
 
                        /* time */
-                       case 'a': length = snprintf(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 'A': length = slprintf(buffer, 32, "%s", t->h >= 12 ? "PM" : "AM"); break;
                        case 'B': {
                                int retval = (((((long)t->sse)-(((long)t->sse) - ((((long)t->sse) % 86400) + 3600))) * 10) / 864);                      
                                while (retval < 0) {
                                        retval += 1000;
                                }
                                retval = retval % 1000;
-                               length = snprintf(buffer, 32, "%03d", retval);
+                               length = slprintf(buffer, 32, "%03d", retval);
                                break;
                        }
-                       case 'g': length = snprintf(buffer, 32, "%d", (t->h % 12) ? (int) t->h % 12 : 12); break;
-                       case 'G': length = snprintf(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 = snprintf(buffer, 32, "%02d", (int) t->h); break;
-                       case 'i': length = snprintf(buffer, 32, "%02d", (int) t->i); break;
-                       case 's': length = snprintf(buffer, 32, "%02d", (int) t->s); break;
+                       case 'g': length = slprintf(buffer, 32, "%d", (t->h % 12) ? (int) t->h % 12 : 12); break;
+                       case 'G': length = slprintf(buffer, 32, "%d", (int) t->h); break;
+                       case 'h': length = slprintf(buffer, 32, "%02d", (t->h % 12) ? (int) t->h % 12 : 12); break;
+                       case 'H': length = slprintf(buffer, 32, "%02d", (int) t->h); break;
+                       case 'i': length = slprintf(buffer, 32, "%02d", (int) t->i); break;
+                       case 's': length = slprintf(buffer, 32, "%02d", (int) t->s); break;
 
                        /* 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 'O': length = snprintf(buffer, 32, "%c%02d%s%02d",
+                       case 'O': length = slprintf(buffer, 32, "%c%02d%s%02d",
                                                                                        localtime ? ((offset->offset < 0) ? '-' : '+') : '+',
                                                                                        localtime ? abs(offset->offset / 3600) : 0,
                                                                                        rfc_colon ? ":" : "",
                                                                                        localtime ? abs((offset->offset % 3600) / 60) : 0
                                                          );
                                          break;
-                       case 'T': length = snprintf(buffer, 32, "%s", localtime ? offset->abbr : "GMT"); break;
-                       case 'e': length = snprintf(buffer, 32, "%s", localtime ? t->tz_info->name : "UTC"); break;
-                       case 'Z': length = snprintf(buffer, 32, "%d", localtime ? offset->offset : 0); break;
+                       case 'T': length = slprintf(buffer, 32, "%s", localtime ? offset->abbr : "GMT"); break;
+                       case 'e': length = slprintf(buffer, 32, "%s", localtime ? t->tz_info->name : "UTC"); break;
+                       case 'Z': length = slprintf(buffer, 32, "%d", localtime ? offset->offset : 0); break;
 
                        /* 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->h, (int) t->i, (int) t->s,
                                                                                        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
                                                          );
                                          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),
                                                                                        (int) t->d, mon_short_names[t->m - 1],
                                                                                        (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
                                                          );
                                          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 */
 

diff --git a/ext/exif/exif.c b/ext/exif/exif.c
index fee4a41fe7336bc7f993f51fe7146f99ae5e3cfd..c9c46c6d4b2ef2f83864be1d8146fd960f40221c 100644 (file)
--- a/ext/exif/exif.c
+++ b/ext/exif/exif.c
@@ -1032,22 +1032,22 @@ static unsigned char* exif_char_dump(unsigned char * addr, int len, int offset)
        static unsigned char tmp[20];
        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) {
                for(i=0; i<len+15 && p+n<=sizeof(buf); i++) {
                        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) {
                                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)+1] = '\0';
                        } else {
-                               p += snprintf(buf+p, sizeof(buf)-p, "   ");
+                               p += slprintf(buf+p, sizeof(buf)-p, "   ");
                        }
                        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) {
                                        break;
                                }

diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c
index 1ca0d42e419f611235b49e44afb4b843ee2a27bc..c10d727b6924a4ff05d85afbac14dec78425ae44 100644 (file)
--- a/ext/imap/php_imap.c
+++ b/ext/imap/php_imap.c
@@ -3414,7 +3414,7 @@ int _php_imap_mail(char *to, char *subject, char *message, char *headers, char *
                                bt_len += strlen(addr->mailbox);
                                bufferTo = safe_erealloc(bufferTo, bt_len, 1, 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;
                }
@@ -3443,7 +3443,7 @@ int _php_imap_mail(char *to, char *subject, char *message, char *headers, char *
                                bt_len += strlen(addr->mailbox);
                                bufferCc = safe_erealloc(bufferCc, bt_len, 1, 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;
                }
@@ -3469,7 +3469,7 @@ int _php_imap_mail(char *to, char *subject, char *message, char *headers, char *
                                bt_len += strlen(addr->mailbox);
                                bufferBcc = safe_erealloc(bufferBcc, bt_len, 1, 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;
                }

diff --git a/ext/interbase/ibase_query.c b/ext/interbase/ibase_query.c
index bb2bfe6184cc16d165f315a5f959e29cbdf13c35..4f255d15a86d20a89afdeafff1447856bb0f8302 100644 (file)
--- a/ext/interbase/ibase_query.c
+++ b/ext/interbase/ibase_query.c
@@ -1316,17 +1316,17 @@ static int _php_ibase_var_zval(zval *val, void *data, int type, int len, /* {{{
                        goto _sql_long;
 #else
                        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);
                        } else {
                                ISC_INT64 n = *(ISC_INT64 *) data, f = scales[-scale];
 
                                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) {
-                                       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 {
-                                       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);
                        }
@@ -1341,11 +1341,11 @@ static int _php_ibase_var_zval(zval *val, void *data, int type, int len, /* {{{
                                long f = (long) scales[-scale];
 
                                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) {
-                                       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 {
-                                       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);
                        }
@@ -1385,14 +1385,14 @@ format_date_time:
 #else
                                switch (type & ~1) {
                                        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);
                                                break;
                                        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;
                                        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;
                                }
 #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_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_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;
                                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_assoc_stringl(return_value, "type", s, len, 1);
        } else {

diff --git a/ext/interbase/ibase_service.c b/ext/interbase/ibase_service.c
index 4ddb74e0d65948126eb374745b69e047fb838c7e..c50f370e623e7ac8617b9f71047495efaf035f6f 100644 (file)
--- a/ext/interbase/ibase_service.c
+++ b/ext/interbase/ibase_service.c
@@ -160,7 +160,7 @@ static void _php_ibase_user(INTERNAL_FUNCTION_PARAMETERS, char operation) /* {{{
        
        for (i = 0; i < sizeof(user_flags); ++i) {
                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]);
                        
                        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 */
-       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,
                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);
 
        /* 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,
                isc_spb_bkp_file, (char)bklen, (char)(bklen >> 8), bk, isc_spb_options,
                (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_attachments:
                        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,
                                        (char)action, (char)argument, (char)(argument >> 8), (char)(argument >> 16),
                                        (char)(argument >> 24));
@@ -553,7 +553,7 @@ options_argument:
                        case isc_spb_prp_reserve_space:
                        case isc_spb_prp_write_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),
                                        db, (char)action, (char)argument);
                }

diff --git a/ext/interbase/interbase.c b/ext/interbase/interbase.c
index a040cc68457bd6ae415b51f4c6c02742ac54e4db..49d8059733624c00c5e6b48b5d79d169faf36200 100644 (file)
--- a/ext/interbase/interbase.c
+++ b/ext/interbase/interbase.c
@@ -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) {
                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;
                        buf_len -= dpb_len;
                }
        }
        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));
                dpb += dpb_len;
                buf_len -= dpb_len;
        }
        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;
                buf_len -= dpb_len;
        }

diff --git a/ext/pdo_firebird/firebird_statement.c b/ext/pdo_firebird/firebird_statement.c
index 667bd8227a295735963db618e328e457e65ca827..c6958aee204802283e16a6b7a7e3cede35df0829 100644 (file)
--- a/ext/pdo_firebird/firebird_statement.c
+++ b/ext/pdo_firebird/firebird_statement.c
@@ -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);
                        
                        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);
                        } 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);                         
                         } 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 {
                        switch (var->sqltype & ~1) {
@@ -356,23 +356,23 @@ static int firebird_stmt_get_col(pdo_stmt_t *stmt, int colno, char **ptr,  /* {{
 /* --- cut here --- */
                                case SQL_SHORT:
                                    *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;
                                case SQL_LONG:
                                        *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;
                                case SQL_INT64:
                                        *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;
                                case SQL_FLOAT:
                                        *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;
                                case SQL_DOUBLE:
                                        *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;
 /* --- cut here --- */
 #if abies_0
@@ -394,7 +394,7 @@ static int firebird_stmt_get_col(pdo_stmt_t *stmt, int colno, char **ptr,  /* {{
                                        *ptr = var->sqldata;
 #else
                                        *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
                                        break;
                                case SQL_FLOAT:

diff --git a/ext/soap/soap.c b/ext/soap/soap.c
index 8714a8321a8a1b0c1d4c8c31dfd81feccb293bb5..d7320be0f7ee0c579a16158672e577f64195f8d9 100644 (file)
--- a/ext/soap/soap.c
+++ b/ext/soap/soap.c
@@ -2049,10 +2049,10 @@ static void soap_error_handler(int error_num, const char *error_filename, const
                        INIT_ZVAL(outbuflen);
 #ifdef va_copy
                        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);
 #else
-                       buffer_len = vsnprintf(buffer, sizeof(buffer)-1, format, args);
+                       buffer_len = vslprintf(buffer, sizeof(buffer)-1, format, args);
 #endif
                        buffer[sizeof(buffer)-1]=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
                        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);
 #else
-                       buffer_len = vsnprintf(buffer, sizeof(buffer)-1, format, args);
+                       buffer_len = vslprintf(buffer, sizeof(buffer)-1, format, args);
 #endif
                        buffer[sizeof(buffer)-1]=0;
                        if (buffer_len > sizeof(buffer) - 1 || buffer_len < 0) {