cvs: /php4 fopen-wrappers.c fopen-wrappers.h main.c request_info.c request_info.h

andrei Tue Dec 21 14:44:09 1999 EDT Modified files: /php4 fopen-wrappers.c fopen-wrappers.h main.c request_info.c request_info.h Log: php3 -> php prefix work Index: php4/fopen-wrappers.c diff -u php4/fopen-wrappers.c:1.35 php4/fopen-wrappers.c:1.36 --- php4/fopen-wrappers.c:1.35 Fri Dec 17 14:50:56 1999 +++ php4/fopen-wrappers.c Tue Dec 21 14:43:38 1999 @@ -16,10 +16,8 @@ | Jim Winstead <jimw@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: fopen-wrappers.c,v 1.35 1999/12/17 19:50:56 zeev Exp $ */ +/* $Id: fopen-wrappers.c,v 1.36 1999/12/21 19:43:38 andrei Exp $ */ -/* Synced with php3 revision 1.66 1999-06-18 [ssb] */ - #include "php.h" #include "php_globals.h" #include "SAPI.h" @@ -278,7 +276,7 @@ } /* 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); Index: php4/fopen-wrappers.h diff -u php4/fopen-wrappers.h:1.11 php4/fopen-wrappers.h:1.12 --- php4/fopen-wrappers.h:1.11 Fri Dec 17 14:16:33 1999 +++ php4/fopen-wrappers.h Tue Dec 21 14:43:38 1999 @@ -15,9 +15,7 @@ | Authors: Jim Winstead <jimw@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: fopen-wrappers.h,v 1.11 1999/12/17 19:16:33 zeev Exp $ */ - -/* Synced with php3 revision 1.25 1999-06-16 [ssb] */ +/* $Id: fopen-wrappers.h,v 1.12 1999/12/21 19:43:38 andrei Exp $ */ #ifndef _FOPEN_WRAPPERS_H #define _FOPEN_WRAPPERS_H Index: php4/main.c diff -u php4/main.c:1.164 php4/main.c:1.165 --- php4/main.c:1.164 Tue Dec 21 12:14:28 1999 +++ php4/main.c Tue Dec 21 14:43:38 1999 @@ -19,7 +19,7 @@ */ -/* $Id: main.c,v 1.164 1999/12/21 17:14:28 andrei Exp $ */ +/* $Id: main.c,v 1.165 1999/12/21 19:43:38 andrei Exp $ */ #include <stdio.h> @@ -712,7 +712,7 @@ 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 @@ 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(); Index: php4/request_info.c diff -u php4/request_info.c:1.20 php4/request_info.c:1.21 --- php4/request_info.c:1.20 Wed Nov 24 12:56:30 1999 +++ php4/request_info.c Tue Dec 21 14:43:38 1999 @@ -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 @@ /* 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 @@ 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 @@ #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 @@ #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); Index: php4/request_info.h diff -u php4/request_info.h:1.7 php4/request_info.h:1.8 --- php4/request_info.h:1.7 Fri Jul 16 09:12:42 1999 +++ php4/request_info.h Tue Dec 21 14:43:38 1999 @@ -25,14 +25,14 @@ 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 /*