[PHP4BETA] CVS update: php4/ext/hyperwave

Date: Friday April 23, 1999 @ 20:11 Author: zeev Update of /repository/php4/ext/hyperwave In directory php:/tmp/cvs-serv8598/ext/hyperwave Modified Files: hg_comm.c hw.c Log Message: A lot of cleanups... Removed old thread-safe code and other redundant code and files Index: php4/ext/hyperwave/hg_comm.c diff -u php4/ext/hyperwave/hg_comm.c:1.1 php4/ext/hyperwave/hg_comm.c:1.2 --- php4/ext/hyperwave/hg_comm.c:1.1 Wed Apr 21 19:11:20 1999 +++ php4/ext/hyperwave/hg_comm.c Fri Apr 23 20:11:52 1999 @@ -23,7 +23,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: hg_comm.c,v 1.1 1999/04/21 23:11:20 ssb Exp $ */ +/* $Id: hg_comm.c,v 1.2 1999/04/24 00:11:52 zeev Exp $ */ /* #define HW_DEBUG */ @@ -461,7 +461,7 @@ #if APACHE { int j; - array_header *arr = table_elts(GLOBAL(php3_rqst)->subprocess_env); + array_header *arr = table_elts(php3_rqst->subprocess_env); table_entry *elts = (table_entry *)arr->elts; for (j=0; j < arr->nelts; j++) { Index: php4/ext/hyperwave/hw.c diff -u php4/ext/hyperwave/hw.c:1.2 php4/ext/hyperwave/hw.c:1.3 --- php4/ext/hyperwave/hw.c:1.2 Wed Apr 21 20:25:55 1999 +++ php4/ext/hyperwave/hw.c Fri Apr 23 20:11:52 1999 @@ -23,7 +23,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: hw.c,v 1.2 1999/04/22 00:25:55 ssb Exp $ */ +/* $Id: hw.c,v 1.3 1999/04/24 00:11:52 zeev Exp $ */ #if COMPILE_DL #include "dl/phpdl.h" #endif @@ -426,7 +426,6 @@ hw_connection *ptr; int do_swap; int version = 0; - TLS_VARS; argc = ARG_COUNT(ht); switch(argc) { @@ -694,7 +693,6 @@ pval *arg1; int id, type; hw_connection *ptr; - TLS_VARS; if (ARG_COUNT(ht) != 1 || getParameters(ht, 1, &arg1) == FAILURE) { WRONG_PARAM_COUNT; @@ -719,7 +717,6 @@ int id, type; hw_connection *ptr; char *str; - TLS_VARS; if (ARG_COUNT(ht) != 1 || getParameters(ht, 1, &arg1) == FAILURE) { WRONG_PARAM_COUNT; @@ -752,7 +749,6 @@ pval *arg1; int id, type; hw_connection *ptr; - TLS_VARS; if (ARG_COUNT(ht) != 1 || getParameters(ht, 1, &arg1) == FAILURE) { WRONG_PARAM_COUNT; @@ -776,7 +772,6 @@ int id, type; hw_connection *ptr; char errstr[100]; - TLS_VARS; if (ARG_COUNT(ht) != 1 || getParameters(ht, 1, &arg1) == FAILURE) { WRONG_PARAM_COUNT; @@ -861,7 +856,6 @@ Returns object id of root collection */ void php3_hw_root(INTERNAL_FUNCTION_PARAMETERS) { - TLS_VARS; return_value->value.lval = 0; return_value->type = IS_LONG; } @@ -871,7 +865,6 @@ pval *arg1; int link, type; hw_connection *ptr; - TLS_VARS; if (ARG_COUNT(ht) != 1 || getParameters(ht, 1, &arg1) == FAILURE) { return NULL; @@ -1024,7 +1017,6 @@ pval *arg1, *arg2, *arg3; int link, id, type, msgid; hw_connection *ptr; - TLS_VARS; if (ARG_COUNT(ht) != 3 || getParameters(ht, 3, &arg1, &arg2, &arg3) == FAILURE) { WRONG_PARAM_COUNT; @@ -1060,7 +1052,6 @@ pval *arg1, *arg2; int link, id, type; hw_connection *ptr; - TLS_VARS; if (ARG_COUNT(ht) != 2 || getParameters(ht, 2, &arg1, &arg2) == FAILURE) { WRONG_PARAM_COUNT; @@ -1097,7 +1088,6 @@ int link, type; char *objrec, *parms; hw_connection *ptr; - TLS_VARS; if (ARG_COUNT(ht) != 3 || getParameters(ht, 3, &arg1, &arg2, &arg3) == FAILURE) { WRONG_PARAM_COUNT; @@ -1131,7 +1121,6 @@ pval *arg1, *arg2; int link, id, type; hw_connection *ptr; - TLS_VARS; if (ARG_COUNT(ht) != 2 || getParameters(ht, 2, &arg1, &arg2) == FAILURE) { WRONG_PARAM_COUNT; @@ -1164,7 +1153,6 @@ pval *arg1, *arg2; int link, id, type; hw_connection *ptr; - TLS_VARS; if (ARG_COUNT(ht) != 2 || getParameters(ht, 2, &arg1, &arg2) == FAILURE) { WRONG_PARAM_COUNT; @@ -1193,7 +1181,6 @@ pval *arg1, *arg2; int link, id, type; hw_connection *ptr; - TLS_VARS; if (ARG_COUNT(ht) != 2 || getParameters(ht, 2, &arg1, &arg2) == FAILURE) { WRONG_PARAM_COUNT; @@ -1223,7 +1210,6 @@ hw_connection *ptr; char *modification, *oldobjrec, buf[200]; HashTable *newobjarr; - TLS_VARS; if (ARG_COUNT(ht) != 3 || getParameters(ht, 3, &arg1, &arg2, &arg3) == FAILURE) { WRONG_PARAM_COUNT; @@ -1304,7 +1290,6 @@ HashTable *src_arr; hw_connection *ptr; int collIDcount, docIDcount, i, *docIDs, *collIDs; - TLS_VARS; switch(mvcp) { case MOVE: /* Move also has fromID */ @@ -1418,7 +1403,6 @@ int rootid = 0; hw_document *doc; hw_connection *ptr; - TLS_VARS; argc = ARG_COUNT(ht); if((argc > 3) || (argc < 2)) @@ -1470,7 +1454,6 @@ int link, id, doc, type; hw_connection *ptr; hw_document *docptr; - TLS_VARS; if (ARG_COUNT(ht) != 2 || getParameters(ht, 2, &arg1, &arg2) == FAILURE) { WRONG_PARAM_COUNT; @@ -1513,7 +1496,6 @@ hw_document *doc; hw_connection *ptr; char cgi_env_str[1000]; - TLS_VARS; if (ARG_COUNT(ht) != 2 || getParameters(ht, 2, &arg1, &arg2) == FAILURE) { WRONG_PARAM_COUNT; @@ -1549,9 +1531,9 @@ getenv("QUERY_STRING")); #else sprintf(cgi_env_str, "CGI_REQUEST_METHOD=%s\nCGI_PATH_INFO=%s\nCGI_QUERY_STRING=%s", - GLOBAL(request_info).request_method, - GLOBAL(request_info).path_info, - GLOBAL(request_info).query_string); + request_info.request_method, + request_info.path_info, + request_info.query_string); #endif /* !!!! memory for object and attributes is allocated with malloc !!!! */ if (0 != (ptr->lasterror = send_getcgi(ptr->socket, id, cgi_env_str, &attributes, &object, &count))) @@ -1574,7 +1556,6 @@ int link, id, type; hw_document *doc; hw_connection *ptr; - TLS_VARS; if (ARG_COUNT(ht) != 2 || getParameters(ht, 2, &arg1, &arg2) == FAILURE) { WRONG_PARAM_COUNT; @@ -1615,7 +1596,6 @@ int link, type, i; hw_connection *ptr; char *objrec; - TLS_VARS; if (ARG_COUNT(ht) != 2 || getParameters(ht, 2, &arg1, &arg2) == FAILURE) { WRONG_PARAM_COUNT; @@ -1673,7 +1653,6 @@ pval *arg1, *arg2; int link, type, rootid; hw_connection *ptr; - TLS_VARS; if (ARG_COUNT(ht) != 2 || getParameters(ht, 2, &arg1, &arg2) == FAILURE) { WRONG_PARAM_COUNT; @@ -1702,9 +1681,8 @@ hw_connection *ptr; hw_document *doc; #if APACHE - server_rec *serv = GLOBAL(php3_rqst)->server; + server_rec *serv = php3_rqst->server; #endif - TLS_VARS; argc = ARG_COUNT(ht); if((argc > 2) || (argc < 2)) @@ -1770,9 +1748,8 @@ hw_document *doc; char cgi_env_str[1000]; #if APACHE - server_rec *serv = GLOBAL(php3_rqst)->server; + server_rec *serv = php3_rqst->server; #endif - TLS_VARS; if (ARG_COUNT(ht) != 2 || getParameters(ht, 2, &arg1, &arg2) == FAILURE) { WRONG_PARAM_COUNT; @@ -1800,9 +1777,9 @@ getenv("QUERY_STRING")); #else sprintf(cgi_env_str, "CGI_REQUEST_METHOD=%s\nCGI_PATH_INFO=%s\nCGI_QUERY_STRING=%s", - GLOBAL(request_info).request_method, - GLOBAL(request_info).path_info, - GLOBAL(request_info).query_string); + request_info.request_method, + request_info.path_info, + request_info.query_string); #endif /* !!!! memory for object, bodytag and attributes is allocated with malloc !!!! */ if (0 != (ptr->lasterror = send_pipecgi(ptr->socket, @@ -1832,9 +1809,8 @@ hw_connection *ptr; hw_document *docptr; #if APACHE - server_rec *serv = GLOBAL(php3_rqst)->server; + server_rec *serv = php3_rqst->server; #endif - TLS_VARS; if (ARG_COUNT(ht) != 3 || getParameters(ht, 3, &arg1, &arg2, &arg3) == FAILURE) { WRONG_PARAM_COUNT; @@ -1902,7 +1878,6 @@ pval *arg1; int id, type; hw_document *ptr; - TLS_VARS; if (ARG_COUNT(ht) != 1 || getParameters(ht, 1, &arg1) == FAILURE) { WRONG_PARAM_COUNT; @@ -1925,7 +1900,6 @@ int id, type, count; hw_document *ptr; char *ptr1; - TLS_VARS; if (ARG_COUNT(ht) != 1 || getParameters(ht, 1, &arg1) == FAILURE) { WRONG_PARAM_COUNT; @@ -1955,7 +1929,6 @@ int id, type, argc; hw_document *ptr; char *temp, *str = NULL; - TLS_VARS; argc = ARG_COUNT(ht); if((argc > 2) || (argc < 1)) @@ -1994,7 +1967,6 @@ pval *argv[1]; int id, type, argc; hw_document *ptr; - TLS_VARS; argc = ARG_COUNT(ht); if(argc != 1) @@ -2020,7 +1992,6 @@ pval *arg1; int id, type; hw_document *ptr; - TLS_VARS; if (ARG_COUNT(ht) != 1 || getParameters(ht, 1, &arg1) == FAILURE) { WRONG_PARAM_COUNT; @@ -2042,7 +2013,6 @@ pval *arg1; int id, type; hw_document *ptr; - TLS_VARS; if (ARG_COUNT(ht) != 1 || getParameters(ht, 1, &arg1) == FAILURE) { WRONG_PARAM_COUNT; @@ -2067,7 +2037,6 @@ int count; char **childObjRecs = NULL; hw_connection *ptr; - TLS_VARS; if (ARG_COUNT(ht) != 2 || getParameters(ht, 2, &arg1, &arg2) == FAILURE) { WRONG_PARAM_COUNT; @@ -2101,7 +2070,6 @@ int link, id, type; int count; hw_connection *ptr; - TLS_VARS; if (ARG_COUNT(ht) != 2 || getParameters(ht, 2, &arg1, &arg2) == FAILURE) { WRONG_PARAM_COUNT; @@ -2146,7 +2114,6 @@ int link, id, type; int count; hw_connection *ptr; - TLS_VARS; if (ARG_COUNT(ht) != 2 || getParameters(ht, 2, &arg1, &arg2) == FAILURE) { WRONG_PARAM_COUNT; @@ -2192,7 +2159,6 @@ int count; char **childObjRecs = NULL; hw_connection *ptr; - TLS_VARS; if (ARG_COUNT(ht) != 2 || getParameters(ht, 2, &arg1, &arg2) == FAILURE) { WRONG_PARAM_COUNT; @@ -2226,7 +2192,6 @@ int link, id, type; int count; hw_connection *ptr; - TLS_VARS; if (ARG_COUNT(ht) != 2 || getParameters(ht, 2, &arg1, &arg2) == FAILURE) { WRONG_PARAM_COUNT; @@ -2272,7 +2237,6 @@ int count; char **childObjRecs = NULL; hw_connection *ptr; - TLS_VARS; if (ARG_COUNT(ht) != 2 || getParameters(ht, 2, &arg1, &arg2) == FAILURE) { WRONG_PARAM_COUNT; @@ -2305,7 +2269,6 @@ pval *arg1, *arg2; int link, id, type; hw_connection *ptr; - TLS_VARS; if (ARG_COUNT(ht) != 2 || getParameters(ht, 2, &arg1, &arg2) == FAILURE) { WRONG_PARAM_COUNT; @@ -2336,7 +2299,6 @@ pval *arg1, *arg2; int link, id, type; hw_connection *ptr; - TLS_VARS; if (ARG_COUNT(ht) != 2 || getParameters(ht, 2, &arg1, &arg2) == FAILURE) { WRONG_PARAM_COUNT; @@ -2374,7 +2336,6 @@ int count, i; int *childIDs = NULL; hw_connection *ptr; - TLS_VARS; if (ARG_COUNT(ht) != 3 || getParameters(ht, 3, &arg1, &arg2, &arg3) == FAILURE) { WRONG_PARAM_COUNT; @@ -2417,7 +2378,6 @@ int count; char **childObjRecs = NULL; hw_connection *ptr; - TLS_VARS; if (ARG_COUNT(ht) != 3 || getParameters(ht, 3, &arg1, &arg2, &arg3) == FAILURE) { WRONG_PARAM_COUNT; @@ -2455,7 +2415,6 @@ int count, i; hw_connection *ptr; int *childIDs = NULL; - TLS_VARS; if (ARG_COUNT(ht) != 4 || getParameters(ht, 4, &arg1, &arg2, &arg3, &arg4) == FAILURE) { WRONG_PARAM_COUNT; @@ -2500,7 +2459,6 @@ int count; hw_connection *ptr; char **childObjRecs = NULL; - TLS_VARS; if (ARG_COUNT(ht) != 4 || getParameters(ht, 4, &arg1, &arg2, &arg3, &arg4) == FAILURE) { WRONG_PARAM_COUNT; @@ -2539,7 +2497,6 @@ int count, i; int *childIDs = NULL; hw_connection *ptr; - TLS_VARS; if (ARG_COUNT(ht) != 2 || getParameters(ht, 2, &arg1, &arg2) == FAILURE) { WRONG_PARAM_COUNT; @@ -2578,7 +2535,6 @@ int count; char **childObjRecs = NULL; hw_connection *ptr; - TLS_VARS; if (ARG_COUNT(ht) != 2 || getParameters(ht, 2, &arg1, &arg2) == FAILURE) { WRONG_PARAM_COUNT; @@ -2613,7 +2569,6 @@ int count, i; int *anchorIDs = NULL; hw_connection *ptr; - TLS_VARS; if (ARG_COUNT(ht) != 2 || getParameters(ht, 2, &arg1, &arg2) == FAILURE) { WRONG_PARAM_COUNT; @@ -2652,7 +2607,6 @@ int count; char **anchorObjRecs = NULL; hw_connection *ptr; - TLS_VARS; if (ARG_COUNT(ht) != 2 || getParameters(ht, 2, &arg1, &arg2) == FAILURE) { WRONG_PARAM_COUNT; @@ -2684,7 +2638,6 @@ pval *arg1; int link, type; hw_connection *ptr; - TLS_VARS; if (ARG_COUNT(ht) != 1 || getParameters(ht, 1, &arg1) == FAILURE) { WRONG_PARAM_COUNT; @@ -2710,7 +2663,6 @@ int link, type; char *name, *passwd, *userdata; hw_connection *ptr; - TLS_VARS; if (ARG_COUNT(ht) != 3 || getParameters(ht, 3, &arg1, &arg2, &arg3) == FAILURE) { WRONG_PARAM_COUNT; @@ -2757,7 +2709,6 @@ Returns object array of object record*/ void php3_hw_objrec2array(INTERNAL_FUNCTION_PARAMETERS) { pval *arg1; - TLS_VARS; if (ARG_COUNT(ht) != 1 || getParameters(ht, 1, &arg1) == FAILURE) { WRONG_PARAM_COUNT; @@ -2772,7 +2723,6 @@ void php3_hw_array2objrec(INTERNAL_FUNCTION_PARAMETERS) { pval *arg1; char *objrec, *retobj; - TLS_VARS; if (ARG_COUNT(ht) != 1 || getParameters(ht, 1, &arg1) == FAILURE) { WRONG_PARAM_COUNT; @@ -2795,7 +2745,6 @@ int type, link, i; hw_connection *ptr; int cobjids, ccollids, *objectIDs, *collIDs, cretids, *retIDs, retcoll; - TLS_VARS; if (ARG_COUNT(ht) != 4 || getParameters(ht, 4, &arg1, &arg2, &arg3, &arg4) == FAILURE) { WRONG_PARAM_COUNT; @@ -2857,7 +2806,6 @@ char *objrec; int id, newid, type, link; hw_connection *ptr; - TLS_VARS; if (ARG_COUNT(ht) != 3 || getParameters(ht, 3, &arg1, &arg2, &arg3) == FAILURE) { WRONG_PARAM_COUNT; @@ -2896,7 +2844,6 @@ char *objrec, *text; int id, newid, type, link, argc; hw_connection *ptr; - TLS_VARS; argc = ARG_COUNT(ht); if((argc < 3) || (argc > 4)) @@ -2940,7 +2887,6 @@ int count; char **childObjRecs = NULL; hw_connection *ptr; - TLS_VARS; if (ARG_COUNT(ht) != 2 || getParameters(ht, 2, &arg1, &arg2) == FAILURE) { WRONG_PARAM_COUNT; @@ -2975,7 +2921,6 @@ int rootid, destid, sourceid; char *anchorstr; hw_connection *ptr; - TLS_VARS; if (ARG_COUNT(ht) != 4 || getParameters(ht, 4, &arg1, &arg2, &arg3, &arg4) == FAILURE) { WRONG_PARAM_COUNT; -- PHP 4 Beta