cvs: /php4 main.c

rasmus Thu Dec 2 15:00:47 1999 EDT Modified files: /php4 main.c Log: # just some symbol cleanup while I am browsing through looking for this # timeout problem Index: php4/main.c diff -u php4/main.c:1.142 php4/main.c:1.143 --- php4/main.c:1.142 Wed Dec 1 12:07:24 1999 +++ php4/main.c Thu Dec 2 15:00:16 1999 @@ -19,7 +19,7 @@ */ -/* $Id: main.c,v 1.142 1999/12/01 17:07:24 sas Exp $ */ +/* $Id: main.c,v 1.143 1999/12/02 20:00:16 rasmus Exp $ */ #include <stdio.h> @@ -103,9 +103,9 @@ #endif -void _php3_build_argv(char * ELS_DC); -static void php3_timeout(int dummy); -static void php3_set_timeout(long seconds); +void _php_build_argv(char * ELS_DC); +static void php_timeout(int dummy); +static void php_set_timeout(long seconds); void *gLock; /*mutex variable */ @@ -135,7 +135,7 @@ } else { new_timeout = 0; } - php3_set_timeout(new_timeout); + php_set_timeout(new_timeout); return SUCCESS; } @@ -497,7 +497,7 @@ static long php_timeout_seconds; #ifdef HAVE_SETITIMER -static void php3_timeout(int dummy) +static void php_timeout(int dummy) { PLS_FETCH(); @@ -512,7 +512,7 @@ #define SIGPROF 27 #endif -static void php3_set_timeout(long seconds) +static void php_set_timeout(long seconds) { #if WIN32|WINNT #else @@ -524,13 +524,13 @@ php_timeout_seconds = seconds; setitimer(ITIMER_PROF, &t_r, NULL); - signal(SIGPROF, php3_timeout); + signal(SIGPROF, php_timeout); # endif #endif } -static void php3_unset_timeout() +static void php_unset_timeout() { #if WIN32|WINNT #else @@ -568,8 +568,8 @@ should work fine. Is this FIXME a WIN32 problem? Is there no way to do per-thread timers on WIN32? */ - php3_unset_timeout(); - php3_set_timeout(new_timeout->value.lval); + php_unset_timeout(); + php_set_timeout(new_timeout->value.lval); } @@ -803,7 +803,7 @@ php3_destroy_request_info(NULL); shutdown_memory_manager(CG(unclean_shutdown), 0); - php3_unset_timeout(); + php_unset_timeout(); #if CGI_BINARY @@ -1113,12 +1113,12 @@ /* need argc/argv support as well */ - _php3_build_argv(SG(request_info).query_string ELS_CC); + _php_build_argv(SG(request_info).query_string ELS_CC); return SUCCESS; } -void _php3_build_argv(char *s ELS_DC) +void _php_build_argv(char *s ELS_DC) { pval *arr, *tmp; int count = 0;