nuke php3 legacy

diff --git a/sapi/apache/php_apache.c b/sapi/apache/php_apache.c
index adb3e77552d645aa74b384bcf018c91f72a2653f..787d09a05724d6cbf018804cf9213aa708cad28a 100644 (file)
--- a/sapi/apache/php_apache.c
+++ b/sapi/apache/php_apache.c
@@ -135,7 +135,7 @@ PHP_FUNCTION(apache_child_terminate)
    Get and set Apache request notes */
 PHP_FUNCTION(apache_note)
 {
-       pval **arg_name, **arg_val;
+       zval **arg_name, **arg_val;
        char *note_val;
        int arg_count = ZEND_NUM_ARGS();
 
@@ -304,7 +304,7 @@ PHP_MINFO_FUNCTION(apache)
  */
 PHP_FUNCTION(virtual)
 {
-       pval **filename;
+       zval **filename;
        request_rec *rr = NULL;
 
        if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &filename) == FAILURE) {
@@ -411,7 +411,7 @@ PHP_FUNCTION(apache_setenv)
    Perform a partial request of the given URI to obtain information about it */
 PHP_FUNCTION(apache_lookup_uri)
 {
-       pval **filename;
+       zval **filename;
        request_rec *rr=NULL;
 
        if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &filename) == FAILURE) {
@@ -485,7 +485,7 @@ This function is most likely a bad idea.  Just playing with it for now.
 
 PHP_FUNCTION(apache_exec_uri)
 {
-       pval **filename;
+       zval **filename;
        request_rec *rr=NULL;
        TSRMLS_FETCH();
 

diff --git a/sapi/apache_hooks/php_apache.c b/sapi/apache_hooks/php_apache.c
index f65e31c41f280b8ad6da585e7a7afe97d9bc147e..590707d4cc1241f404d9aaf19d4c9f93a9c354e1 100644 (file)
--- a/sapi/apache_hooks/php_apache.c
+++ b/sapi/apache_hooks/php_apache.c
@@ -105,7 +105,7 @@ static void php_apache_request_free(zend_rsrc_list_entry *rsrc TSRMLS_DC)
        zval_ptr_dtor(&z);
 }
 
-static request_rec *get_apache_request(pval *z TSRMLS_DC)
+static request_rec *get_apache_request(zval *z TSRMLS_DC)
 {
        request_rec *r;
        zval **addr;
@@ -1711,7 +1711,7 @@ PHP_MINFO_FUNCTION(apache)
  */
 PHP_FUNCTION(virtual)
 {
-       pval **filename;
+       zval **filename;
        request_rec *rr = NULL;
 
        if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &filename) == FAILURE) {
@@ -1818,7 +1818,7 @@ PHP_FUNCTION(apache_setenv)
    Perform a partial request of the given URI to obtain information about it */
 PHP_FUNCTION(apache_lookup_uri)
 {
-       pval **filename;
+       zval **filename;
        request_rec *rr=NULL;
 
        if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &filename) == FAILURE) {
@@ -1892,7 +1892,7 @@ This function is most likely a bad idea.  Just playing with it for now.
 
 PHP_FUNCTION(apache_exec_uri)
 {
-       pval **filename;
+       zval **filename;
        request_rec *rr=NULL;
        TSRMLS_FETCH();
 

diff --git a/sapi/nsapi/nsapi.c b/sapi/nsapi/nsapi.c
index 3e852b0a6a268c1d8e1b8d0854e028c729417b90..21e6ca70204104ed76f8473262c4d7b2843cb7d2 100644 (file)
--- a/sapi/nsapi/nsapi.c
+++ b/sapi/nsapi/nsapi.c
@@ -329,7 +329,7 @@ PHP_MINFO_FUNCTION(nsapi)
  */
 PHP_FUNCTION(nsapi_virtual)
 {
-       pval **uri;
+       zval **uri;
        int rv;
        char *value;
        Request *rq;

diff --git a/sapi/roxen/roxen.c b/sapi/roxen/roxen.c
index 28612208fbe61fe20f6713f694fc824016e4b344..2502022d0a8a79c305fb50314db1b0a5256d1201 100644 (file)
--- a/sapi/roxen/roxen.c
+++ b/sapi/roxen/roxen.c
@@ -512,19 +512,19 @@ static sapi_module_struct roxen_sapi_module = {
  * the HTTP header data, so that a script can access these.
  */
 #define ADD_STRING(name)                                                                               \
-       MAKE_STD_ZVAL(pval);                                                                            \
-       pval->type = IS_STRING;                                                                         \
-       pval->value.str.len = strlen(buf);                                                      \
-       pval->value.str.val = estrndup(buf, pval->value.str.len);       \
+       MAKE_STD_ZVAL(zvalue);                                                                          \
+       zvalue->type = IS_STRING;                                                                               \
+       zvalue->value.str.len = strlen(buf);                                                    \
+       zvalue->value.str.val = estrndup(buf, zvalue->value.str.len);   \
        zend_hash_update(&EG(symbol_table), name, sizeof(name),         \
-                       &pval, sizeof(zval *), NULL)
+                       &zvalue, sizeof(zval *), NULL)
 
 static void
 php_roxen_hash_environment(TSRMLS_D)
 {
   int i;
   char buf[512];
-  zval *pval;
+  zval *zvalue;
   struct svalue *headers;
   struct pike_string *sind;
   struct array *indices;
@@ -546,22 +546,22 @@ php_roxen_hash_environment(TSRMLS_D)
        buf_len = MIN(511, ind->u.string->len);
        strncpy(buf, ind->u.string->str, buf_len);
        buf[buf_len] = '\0'; /* Terminate correctly */
-       MAKE_STD_ZVAL(pval);
-       pval->type = IS_STRING;
-       pval->value.str.len = val->u.string->len;
-       pval->value.str.val = estrndup(val->u.string->str, pval->value.str.len);
+       MAKE_STD_ZVAL(zvalue);
+       zvalue->type = IS_STRING;
+       zvalue->value.str.len = val->u.string->len;
+       zvalue->value.str.val = estrndup(val->u.string->str, zvalue->value.str.len);
        
-       zend_hash_update(&EG(symbol_table), buf, buf_len + 1, &pval, sizeof(zval *), NULL);
+       zend_hash_update(&EG(symbol_table), buf, buf_len + 1, &zvalue, sizeof(zval *), NULL);
       }
     }
     free_array(indices);
   }
   
   /*
-    MAKE_STD_ZVAL(pval);
-    pval->type = IS_LONG;
-    pval->value.lval = Ns_InfoBootTime();
-    zend_hash_update(&EG(symbol_table), "SERVER_BOOTTIME", sizeof("SERVER_BOOTTIME"), &pval, sizeof(zval *), NULL);
+    MAKE_STD_ZVAL(zvalue);
+    zvalue->type = IS_LONG;
+    zvalue->value.lval = Ns_InfoBootTime();
+    zend_hash_update(&EG(symbol_table), "SERVER_BOOTTIME", sizeof("SERVER_BOOTTIME"), &zvalue, sizeof(zval *), NULL);
   */
 }