cvs: /php4 acconfig.h.in /php4/ext/session mod_files.c /php4/ext/standard string.c

sas Sun Dec 19 09:40:11 1999 EDT Modified files: /php4 acconfig.h.in /php4/ext/session mod_files.c /php4/ext/standard string.c Log: Use zend_sprintf by default (which is defined to sprintf, if the system's sprintf is useable). Index: php4/acconfig.h.in diff -u php4/acconfig.h.in:1.28 php4/acconfig.h.in:1.29 --- php4/acconfig.h.in:1.28 Fri Dec 3 17:08:32 1999 +++ php4/acconfig.h.in Sun Dec 19 09:39:40 1999 @@ -113,9 +113,6 @@ /* Define if you have broken header files like SunOS 4 */ #define MISSING_FCLOSE_DECL 0 -/* Define if you have broken sprintf function like SunOS 4 */ -#define BROKEN_SPRINTF 0 - /* Define to compile PHP/Zend thread safe */ #undef ZTS @@ -124,3 +121,5 @@ /* Define if struct sockaddr contains the field sa_len */ #undef HAVE_SOCKADDR_SA_LEN + +#define sprintf zend_sprintf Index: php4/ext/session/mod_files.c diff -u php4/ext/session/mod_files.c:1.22 php4/ext/session/mod_files.c:1.23 --- php4/ext/session/mod_files.c:1.22 Sat Dec 18 21:12:31 1999 +++ php4/ext/session/mod_files.c Sun Dec 19 09:39:40 1999 @@ -100,7 +100,7 @@ (strlen(data->basedir) + 2 * data->dirdepth + keylen + 5 + sizeof(FILE_PREFIX))) return NULL; p = key; - n = zend_sprintf(buf, "%s/", data->basedir); + n = sprintf(buf, "%s/", data->basedir); for(i = 0; i < data->dirdepth; i++) { buf[n++] = *p++; buf[n++] = DIR_DELIMITER; Index: php4/ext/standard/string.c diff -u php4/ext/standard/string.c:1.77 php4/ext/standard/string.c:1.78 --- php4/ext/standard/string.c:1.77 Sat Dec 18 21:12:31 1999 +++ php4/ext/standard/string.c Sun Dec 19 09:39:41 1999 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: string.c,v 1.77 1999/12/19 02:12:31 sas Exp $ */ +/* $Id: string.c,v 1.78 1999/12/19 14:39:41 sas Exp $ */ /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */ @@ -1607,7 +1607,7 @@ case '\v': *target++ = 'v'; break; case '\b': *target++ = 'b'; break; case '\f': *target++ = 'f'; break; - default: target += zend_sprintf(target, "%03o", (unsigned char)c); + default: target += sprintf(target, "%03o", (unsigned char)c); } continue; }