sas Fri Feb 23 14:07:22 2001 EDT
Modified files:
/php4/ext/db db.c
/php4/ext/dbase dbase.c
/php4/ext/filepro filepro.c
/php4/ext/hyperwave hw.c
/php4/ext/standard dir.c file.c filestat.c image.c
/php4/ext/zlib zlib.c zlib_fopen_wrapper.c
/php4/main Makefile.in main.c php.h
/php4/sapi/cgi cgi_main.c
/php4/sapi/servlet servlet.c
Log:
Finish fopen-wrappers rename.
Index: php4/ext/db/db.c
diff -u php4/ext/db/db.c:1.47 php4/ext/db/db.c:1.48
--- php4/ext/db/db.c:1.47 Wed Nov 22 14:00:39 2000
+++ php4/ext/db/db.c Fri Feb 23 14:07:12 2001
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: db.c,v 1.47 2000/11/22 22:00:39 sas Exp $ */
+/* $Id: db.c,v 1.48 2001/02/23 22:07:12 sas Exp $ */
#define IS_EXT_MODULE
#if 1
@@ -25,7 +25,7 @@
#include "php.h"
#include "php_globals.h"
#include "safe_mode.h"
-#include "fopen-wrappers.h"
+#include "fopen_wrappers.h"
#include "ext/standard/flock_compat.h"
#include "ext/standard/info.h"
Index: php4/ext/dbase/dbase.c
diff -u php4/ext/dbase/dbase.c:1.34 php4/ext/dbase/dbase.c:1.35
--- php4/ext/dbase/dbase.c:1.34 Thu Nov 2 15:08:04 2000
+++ php4/ext/dbase/dbase.c Fri Feb 23 14:07:13 2001
@@ -24,7 +24,7 @@
#include "php.h"
#include "safe_mode.h"
-#include "fopen-wrappers.h"
+#include "fopen_wrappers.h"
#include "php_globals.h"
#if DBASE
Index: php4/ext/filepro/filepro.c
diff -u php4/ext/filepro/filepro.c:1.28 php4/ext/filepro/filepro.c:1.29
--- php4/ext/filepro/filepro.c:1.28 Thu Nov 2 15:08:05 2000
+++ php4/ext/filepro/filepro.c Fri Feb 23 14:07:13 2001
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: filepro.c,v 1.28 2000/11/02 23:08:05 andi Exp $ */
+/* $Id: filepro.c,v 1.29 2001/02/23 22:07:13 sas Exp $ */
/*
filePro 4.x support developed by Chad Robinson, [EMAIL PROTECTED]
@@ -28,7 +28,7 @@
#include "php.h"
#include "safe_mode.h"
-#include "fopen-wrappers.h"
+#include "fopen_wrappers.h"
#include <string.h>
#ifdef PHP_WIN32
#include <windows.h>
Index: php4/ext/hyperwave/hw.c
diff -u php4/ext/hyperwave/hw.c:1.77 php4/ext/hyperwave/hw.c:1.78
--- php4/ext/hyperwave/hw.c:1.77 Thu Feb 22 01:38:58 2001
+++ php4/ext/hyperwave/hw.c Fri Feb 23 14:07:13 2001
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: hw.c,v 1.77 2001/02/22 09:38:58 steinm Exp $ */
+/* $Id: hw.c,v 1.78 2001/02/23 22:07:13 sas Exp $ */
#include <stdlib.h>
#include <errno.h>
@@ -26,7 +26,7 @@
#include "ext/standard/php_standard.h"
#include "ext/standard/head.h"
#include "ext/standard/info.h"
-#include "fopen-wrappers.h"
+#include "fopen_wrappers.h"
#include "SAPI.h"
#ifdef PHP_WIN32
Index: php4/ext/standard/dir.c
diff -u php4/ext/standard/dir.c:1.56 php4/ext/standard/dir.c:1.57
--- php4/ext/standard/dir.c:1.56 Wed Feb 14 21:21:27 2001
+++ php4/ext/standard/dir.c Fri Feb 23 14:07:14 2001
@@ -17,12 +17,12 @@
+----------------------------------------------------------------------+
*/
-/* $Id: dir.c,v 1.56 2001/02/15 05:21:27 sas Exp $ */
+/* $Id: dir.c,v 1.57 2001/02/23 22:07:14 sas Exp $ */
/* {{{ includes/startup/misc */
#include "php.h"
-#include "fopen-wrappers.h"
+#include "fopen_wrappers.h"
#include "php_dir.h"
Index: php4/ext/standard/file.c
diff -u php4/ext/standard/file.c:1.142 php4/ext/standard/file.c:1.143
--- php4/ext/standard/file.c:1.142 Tue Feb 20 23:18:28 2001
+++ php4/ext/standard/file.c Fri Feb 23 14:07:14 2001
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: file.c,v 1.142 2001/02/21 07:18:28 sas Exp $ */
+/* $Id: file.c,v 1.143 2001/02/23 22:07:14 sas Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -69,7 +69,7 @@
#include <sys/time.h>
#endif
#include "fsock.h"
-#include "fopen-wrappers.h"
+#include "fopen_wrappers.h"
#include "php_globals.h"
#ifdef HAVE_SYS_FILE_H
Index: php4/ext/standard/filestat.c
diff -u php4/ext/standard/filestat.c:1.54 php4/ext/standard/filestat.c:1.55
--- php4/ext/standard/filestat.c:1.54 Tue Feb 20 23:18:28 2001
+++ php4/ext/standard/filestat.c Fri Feb 23 14:07:14 2001
@@ -16,11 +16,11 @@
+----------------------------------------------------------------------+
*/
-/* $Id: filestat.c,v 1.54 2001/02/21 07:18:28 sas Exp $ */
+/* $Id: filestat.c,v 1.55 2001/02/23 22:07:14 sas Exp $ */
#include "php.h"
#include "safe_mode.h"
-#include "fopen-wrappers.h"
+#include "fopen_wrappers.h"
#include "php_globals.h"
#include <stdlib.h>
Index: php4/ext/standard/image.c
diff -u php4/ext/standard/image.c:1.26 php4/ext/standard/image.c:1.27
--- php4/ext/standard/image.c:1.26 Tue Feb 20 10:00:44 2001
+++ php4/ext/standard/image.c Fri Feb 23 14:07:14 2001
@@ -15,7 +15,7 @@
| Authors: Rasmus Lerdorf |
+----------------------------------------------------------------------+
*/
-/* $Id: image.c,v 1.26 2001/02/20 18:00:44 dbeu Exp $ */
+/* $Id: image.c,v 1.27 2001/02/23 22:07:14 sas Exp $ */
/*
* Based on Daniel Schmitt's imageinfo.c which carried the following
* Copyright notice.
@@ -41,7 +41,7 @@
#if HAVE_FCNTL_H
#include <fcntl.h>
#endif
-#include "fopen-wrappers.h"
+#include "fopen_wrappers.h"
#include "ext/standard/fsock.h"
#if HAVE_UNISTD_H
#include <unistd.h>
Index: php4/ext/zlib/zlib.c
diff -u php4/ext/zlib/zlib.c:1.71 php4/ext/zlib/zlib.c:1.72
--- php4/ext/zlib/zlib.c:1.71 Thu Feb 1 09:16:35 2001
+++ php4/ext/zlib/zlib.c Fri Feb 23 14:07:14 2001
@@ -16,7 +16,7 @@
| Stefan R�hrich <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: zlib.c,v 1.71 2001/02/01 17:16:35 thies Exp $ */
+/* $Id: zlib.c,v 1.72 2001/02/23 22:07:14 sas Exp $ */
#define IS_EXT_MODULE
#include "php.h"
@@ -41,7 +41,7 @@
#include "ext/standard/php_standard.h"
#include "ext/standard/info.h"
#include "php_zlib.h"
-#include "fopen-wrappers.h"
+#include "fopen_wrappers.h"
#if HAVE_PWD_H
#ifdef PHP_WIN32
#include "win32/pwd.h"
Index: php4/ext/zlib/zlib_fopen_wrapper.c
diff -u php4/ext/zlib/zlib_fopen_wrapper.c:1.2 php4/ext/zlib/zlib_fopen_wrapper.c:1.3
--- php4/ext/zlib/zlib_fopen_wrapper.c:1.2 Mon Nov 20 16:43:25 2000
+++ php4/ext/zlib/zlib_fopen_wrapper.c Fri Feb 23 14:07:14 2001
@@ -15,13 +15,13 @@
| Authors: Hartmut Holzgraefe <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: zlib_fopen_wrapper.c,v 1.2 2000/11/21 00:43:25 hholzgra Exp $ */
+/* $Id: zlib_fopen_wrapper.c,v 1.3 2001/02/23 22:07:14 sas Exp $ */
#define IS_EXT_MODULE
#define _GNU_SOURCE
#include "php.h"
#include "php_zlib.h"
-#include "fopen-wrappers.h"
+#include "fopen_wrappers.h"
#if HAVE_FOPENCOOKIE
Index: php4/main/Makefile.in
diff -u php4/main/Makefile.in:1.12 php4/main/Makefile.in:1.13
--- php4/main/Makefile.in:1.12 Thu Nov 2 06:18:34 2000
+++ php4/main/Makefile.in Fri Feb 23 14:07:14 2001
@@ -2,7 +2,7 @@
LTLIBRARY_SOURCES = \
main.c internal_functions.c snprintf.c php_sprintf.c \
- safe_mode.c fopen-wrappers.c alloca.c \
+ safe_mode.c fopen_wrappers.c alloca.c \
php_ini.c SAPI.c rfc1867.c php_content_types.c strlcpy.c \
strlcat.c mergesort.c reentrancy.c php_variables.c php_ticks.c \
network.c php_open_temporary_file.c php_logos.c
Index: php4/main/main.c
diff -u php4/main/main.c:1.352 php4/main/main.c:1.353
--- php4/main/main.c:1.352 Thu Feb 22 03:30:53 2001
+++ php4/main/main.c Fri Feb 23 14:07:15 2001
@@ -19,7 +19,7 @@
*/
-/* $Id: main.c,v 1.352 2001/02/22 11:30:53 andi Exp $ */
+/* $Id: main.c,v 1.353 2001/02/23 22:07:15 sas Exp $ */
#include <stdio.h>
@@ -48,7 +48,7 @@
#include "php_ini.h"
#include "php_globals.h"
#include "php_main.h"
-#include "fopen-wrappers.h"
+#include "fopen_wrappers.h"
#include "ext/standard/php_standard.h"
#include "php_variables.h"
#include "ext/standard/credits.h"
Index: php4/main/php.h
diff -u php4/main/php.h:1.130 php4/main/php.h:1.131
--- php4/main/php.h:1.130 Fri Jan 19 08:04:27 2001
+++ php4/main/php.h Fri Feb 23 14:07:15 2001
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php.h,v 1.130 2001/01/19 16:04:27 sas Exp $ */
+/* $Id: php.h,v 1.131 2001/02/23 22:07:15 sas Exp $ */
#ifndef PHP_H
#define PHP_H
@@ -161,7 +161,7 @@
char *strerror(int);
#endif
-#include "fopen-wrappers.h"
+#include "fopen_wrappers.h"
#if (REGEX == 1 || REGEX == 0) && !defined(NO_REGEX_EXTRA_H)
#include "regex/regex_extra.h"
Index: php4/sapi/cgi/cgi_main.c
diff -u php4/sapi/cgi/cgi_main.c:1.90 php4/sapi/cgi/cgi_main.c:1.91
--- php4/sapi/cgi/cgi_main.c:1.90 Tue Jan 2 14:49:28 2001
+++ php4/sapi/cgi/cgi_main.c Fri Feb 23 14:07:15 2001
@@ -52,7 +52,7 @@
#include "php_ini.h"
#include "php_globals.h"
#include "php_main.h"
-#include "fopen-wrappers.h"
+#include "fopen_wrappers.h"
#include "ext/standard/php_standard.h"
#ifdef PHP_WIN32
#include <io.h>
Index: php4/sapi/servlet/servlet.c
diff -u php4/sapi/servlet/servlet.c:1.43 php4/sapi/servlet/servlet.c:1.44
--- php4/sapi/servlet/servlet.c:1.43 Tue Jan 2 14:49:31 2001
+++ php4/sapi/servlet/servlet.c Fri Feb 23 14:07:15 2001
@@ -48,7 +48,7 @@
#include "php_ini.h"
#include "php_globals.h"
#include "php_main.h"
-#include "fopen-wrappers.h"
+#include "fopen_wrappers.h"
#include "ext/standard/php_standard.h"
#include "ext/standard/php_dir.h"
#ifdef PHP_WIN32
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]