php3 -> php prefix work

diff --git a/main/fopen_wrappers.c b/main/fopen_wrappers.c
index 94c27437aa3089bb7ba1158cfe2319dceb847994..e1da5cac54b730ad94476fef4ae25545445ca15e 100644 (file)
--- a/main/fopen_wrappers.c
+++ b/main/fopen_wrappers.c
@@ -18,8 +18,6 @@
  */
 /* $Id$ */
 
-/* Synced with php3 revision 1.66 1999-06-18 [ssb] */
-
 #include "php.h"
 #include "php_globals.h"
 #include "SAPI.h"
@@ -278,7 +276,7 @@ PHPAPI FILE *php_fopen_primary_script(void)
        }                                                       /* if doc_root && path_info */
        if (!fn) {
                /* we have to free SG(request_info).path_translated here because
-                  php3_destroy_request_info assumes that it will get
+                  php_destroy_request_info assumes that it will get
                   freed when the include_names hash is emptied, but
                   we're not adding it in this case */
                STR_FREE(SG(request_info).path_translated);

diff --git a/main/fopen_wrappers.h b/main/fopen_wrappers.h
index 5ec3e385cbf0f116fe179316c59e48908d1e5b38..198950c4263cf4cd8a09700999b4636bced539d2 100644 (file)
--- a/main/fopen_wrappers.h
+++ b/main/fopen_wrappers.h
@@ -17,8 +17,6 @@
  */
 /* $Id$ */
 
-/* Synced with php3 revision 1.25 1999-06-16 [ssb] */
-
 #ifndef _FOPEN_WRAPPERS_H
 #define _FOPEN_WRAPPERS_H
 

diff --git a/main/main.c b/main/main.c
index d620520de3459650f84e90ed3a504b7bef25b436..e2ba3fb2d0ed1bffe72a6b3f36880435ce119e1a 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -712,7 +712,7 @@ int php_request_startup(CLS_D ELS_DC PLS_DC SLS_DC)
                PG(header_is_being_sent)=0;
        }
 
-       if (php3_init_request_info(NULL)) {
+       if (php_init_request_info(NULL)) {
                php_printf("Unable to initialize request info.\n");
                return FAILURE;
        }
@@ -780,7 +780,7 @@ void php_request_shutdown(void *dummy)
        zend_deactivate(CLS_C ELS_CC);
        sapi_deactivate(SLS_C);
 
-       php3_destroy_request_info(NULL);
+       php_destroy_request_info(NULL);
        shutdown_memory_manager(CG(unclean_shutdown), 0);
        php_unset_timeout();
 

diff --git a/request_info.c b/request_info.c
index 08a1ba65bb8adb870f7c62c251dae204ef44d320..c4f7b25f39ee7bbf126462893b9db18d2dd285ea 100644 (file)
--- a/request_info.c
+++ b/request_info.c
@@ -20,11 +20,11 @@
 #include "SAPI.h"
 
 #ifndef THREAD_SAFE
-PHPAPI php3_request_info request_info;
+PHPAPI php_request_info request_info;
 #endif
 
 #if CGI_BINARY
-int php3_init_request_info(void *conf)
+int php_init_request_info(void *conf)
 {
        request_info.current_user = NULL;
        request_info.current_user_length = 0;
@@ -51,7 +51,7 @@ int php3_init_request_info(void *conf)
        /* We always need to emalloc() filename, since it gets placed into
           the include file hash table, and gets freed with that table.
           Notice that this means that we don't need to efree() it in
-          php3_destroy_request_info()! */
+          php_destroy_request_info()! */
 #if DISCARD_PATH
        if (request_info.script_filename) {
                SLS_FETCH();
@@ -64,7 +64,7 @@ int php3_init_request_info(void *conf)
        return SUCCESS;
 }
 
-int php3_destroy_request_info(void *conf)
+int php_destroy_request_info(void *conf)
 {
        STR_FREE(request_info.current_user);
        return SUCCESS;
@@ -73,7 +73,7 @@ int php3_destroy_request_info(void *conf)
 
 
 #if APACHE
-int php3_init_request_info(void *conf)
+int php_init_request_info(void *conf)
 {
        request_rec *r;
        SLS_FETCH();
@@ -88,7 +88,7 @@ int php3_init_request_info(void *conf)
 #endif
 
 #if !CGI_BINARY
-int php3_destroy_request_info(void *conf)
+int php_destroy_request_info(void *conf)
 {
        /* see above for why we don't want to efree() request_info.filename */
        STR_FREE(request_info.current_user);

diff --git a/request_info.h b/request_info.h
index f1354113d2035652fe7e66294a82e88b1768f80b..d0a397e9d6bd0eb2792c28d251d6914c54a32dcd 100644 (file)
--- a/request_info.h
+++ b/request_info.h
@@ -25,14 +25,14 @@ typedef struct {
        int current_user_length;
        const char *script_filename;
        char *php_argv0;
-} php3_request_info;
+} php_request_info;
 
 #ifndef THREAD_SAFE
-PHPAPI extern php3_request_info request_info;
+PHPAPI extern php_request_info request_info;
 #endif
 
-extern int php3_init_request_info(void *conf);
-extern int php3_destroy_request_info(void *conf);
+extern int php_init_request_info(void *conf);
+extern int php_destroy_request_info(void *conf);
 
 #endif
 /*