diff options
| -rw-r--r-- | ext/msql/php_msql.c | 100 | ||||
| -rw-r--r-- | ext/standard/dns.c | 12 |
2 files changed, 56 insertions, 56 deletions
diff --git a/ext/msql/php_msql.c b/ext/msql/php_msql.c index 70b281dd57..905c721ec3 100644 --- a/ext/msql/php_msql.c +++ b/ext/msql/php_msql.c @@ -243,9 +243,9 @@ static void php_msql_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent) hashed_details_length=4+1; break; case 1: { - pval *yyhost; + zval *yyhost; - if (getParameters(ht, 1, &yyhost) == FAILURE) { + if (zend_get_parameters(ht, 1, &yyhost) == FAILURE) { RETURN_FALSE; } convert_to_string(yyhost); @@ -401,7 +401,7 @@ PHP_FUNCTION(msql_pconnect) Close an mSQL connection */ PHP_FUNCTION(msql_close) { - pval *msql_link; + zval *msql_link; int id; int msql; @@ -410,7 +410,7 @@ PHP_FUNCTION(msql_close) id = msql_globals.default_link; break; case 1: - if (getParameters(ht, 1, &msql_link)==FAILURE) { + if (zend_get_parameters(ht, 1, &msql_link)==FAILURE) { RETURN_FALSE; } id = -1; @@ -440,19 +440,19 @@ PHP_FUNCTION(msql_close) Select an mSQL database */ PHP_FUNCTION(msql_select_db) { - pval *db,*msql_link; + zval *db,*msql_link; int id; int msql; switch(ZEND_NUM_ARGS()) { case 1: - if (getParameters(ht, 1, &db)==FAILURE) { + if (zend_get_parameters(ht, 1, &db)==FAILURE) { RETURN_FALSE; } id = php_msql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU); break; case 2: - if (getParameters(ht, 2, &db, &msql_link)==FAILURE) { + if (zend_get_parameters(ht, 2, &db, &msql_link)==FAILURE) { RETURN_FALSE; } id = -1; @@ -479,19 +479,19 @@ PHP_FUNCTION(msql_select_db) Create an mSQL database */ PHP_FUNCTION(msql_create_db) { - pval *db,*msql_link; + zval *db,*msql_link; int id; int msql; switch(ZEND_NUM_ARGS()) { case 1: - if (getParameters(ht, 1, &db)==FAILURE) { + if (zend_get_parameters(ht, 1, &db)==FAILURE) { WRONG_PARAM_COUNT; } id = php_msql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU); break; case 2: - if (getParameters(ht, 2, &db, &msql_link)==FAILURE) { + if (zend_get_parameters(ht, 2, &db, &msql_link)==FAILURE) { WRONG_PARAM_COUNT; } id = -1; @@ -516,19 +516,19 @@ PHP_FUNCTION(msql_create_db) Drop (delete) an mSQL database */ PHP_FUNCTION(msql_drop_db) { - pval *db,*msql_link; + zval *db,*msql_link; int id; int msql; switch(ZEND_NUM_ARGS()) { case 1: - if (getParameters(ht, 1, &db)==FAILURE) { + if (zend_get_parameters(ht, 1, &db)==FAILURE) { WRONG_PARAM_COUNT; } id = php_msql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU); break; case 2: - if (getParameters(ht, 2, &db, &msql_link)==FAILURE) { + if (zend_get_parameters(ht, 2, &db, &msql_link)==FAILURE) { WRONG_PARAM_COUNT; } id = -1; @@ -553,20 +553,20 @@ PHP_FUNCTION(msql_drop_db) Send an SQL query to mSQL */ PHP_FUNCTION(msql_query) { - pval *query,*msql_link; + zval *query,*msql_link; int id; int msql; int af_rows; switch(ZEND_NUM_ARGS()) { case 1: - if (getParameters(ht, 1, &query)==FAILURE) { + if (zend_get_parameters(ht, 1, &query)==FAILURE) { WRONG_PARAM_COUNT; } id = msql_globals.default_link; break; case 2: - if (getParameters(ht, 2, &query, &msql_link)==FAILURE) { + if (zend_get_parameters(ht, 2, &query, &msql_link)==FAILURE) { WRONG_PARAM_COUNT; } id = -1; @@ -590,20 +590,20 @@ PHP_FUNCTION(msql_query) Send an SQL query to mSQL */ PHP_FUNCTION(msql_db_query) { - pval *db,*query,*msql_link; + zval *db,*query,*msql_link; int id; int msql; int af_rows; switch(ZEND_NUM_ARGS()) { case 2: - if (getParameters(ht, 2, &db, &query)==FAILURE) { + if (zend_get_parameters(ht, 2, &db, &query)==FAILURE) { RETURN_FALSE; } id = php_msql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU); break; case 3: - if (getParameters(ht, 3, &db, &query, &msql_link)==FAILURE) { + if (zend_get_parameters(ht, 3, &db, &query, &msql_link)==FAILURE) { RETURN_FALSE; } id = -1; @@ -632,7 +632,7 @@ PHP_FUNCTION(msql_db_query) List databases available on an mSQL server */ PHP_FUNCTION(msql_list_dbs) { - pval *msql_link; + zval *msql_link; int id; int msql; m_result *msql_result; @@ -642,7 +642,7 @@ PHP_FUNCTION(msql_list_dbs) id = php_msql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU); break; case 1: - if (getParameters(ht, 1, &msql_link)==FAILURE) { + if (zend_get_parameters(ht, 1, &msql_link)==FAILURE) { RETURN_FALSE; } id = -1; @@ -666,20 +666,20 @@ PHP_FUNCTION(msql_list_dbs) List tables in an mSQL database */ PHP_FUNCTION(msql_list_tables) { - pval *db,*msql_link; + zval *db,*msql_link; int id; int msql; m_result *msql_result; switch(ZEND_NUM_ARGS()) { case 1: - if (getParameters(ht, 1, &db)==FAILURE) { + if (zend_get_parameters(ht, 1, &db)==FAILURE) { RETURN_FALSE; } id = php_msql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU); break; case 2: - if (getParameters(ht, 2, &db, &msql_link)==FAILURE) { + if (zend_get_parameters(ht, 2, &db, &msql_link)==FAILURE) { RETURN_FALSE; } id = -1; @@ -707,20 +707,20 @@ PHP_FUNCTION(msql_list_tables) List mSQL result fields */ PHP_FUNCTION(msql_list_fields) { - pval *db,*table,*msql_link; + zval *db,*table,*msql_link; int id; int msql; m_result *msql_result; switch(ZEND_NUM_ARGS()) { case 2: - if (getParameters(ht, 2, &db, &table)==FAILURE) { + if (zend_get_parameters(ht, 2, &db, &table)==FAILURE) { RETURN_FALSE; } id = php_msql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU); break; case 3: - if (getParameters(ht, 3, &db, &table, &msql_link)==FAILURE) { + if (zend_get_parameters(ht, 3, &db, &table, &msql_link)==FAILURE) { RETURN_FALSE; } id = -1; @@ -760,7 +760,7 @@ PHP_FUNCTION(msql_error) Get result data */ PHP_FUNCTION(msql_result) { - pval *result, *row, *field=NULL; + zval *result, *row, *field=NULL; m_result *msql_result; m_query *msql_query; m_row sql_row; @@ -768,12 +768,12 @@ PHP_FUNCTION(msql_result) switch (ZEND_NUM_ARGS()) { case 2: - if (getParameters(ht, 2, &result, &row)==FAILURE) { + if (zend_get_parameters(ht, 2, &result, &row)==FAILURE) { RETURN_FALSE; } break; case 3: - if (getParameters(ht, 3, &result, &row, &field)==FAILURE) { + if (zend_get_parameters(ht, 3, &result, &row, &field)==FAILURE) { RETURN_FALSE; } break; @@ -861,11 +861,11 @@ PHP_FUNCTION(msql_result) Get number of rows in a result */ PHP_FUNCTION(msql_num_rows) { - pval *result; + zval *result; m_result *msql_result; m_query *msql_query; - if (ZEND_NUM_ARGS()!=1 || getParameters(ht, 1, &result)==FAILURE) { + if (ZEND_NUM_ARGS()!=1 || zend_get_parameters(ht, 1, &result)==FAILURE) { WRONG_PARAM_COUNT; } @@ -878,11 +878,11 @@ PHP_FUNCTION(msql_num_rows) Get number of fields in a result */ PHP_FUNCTION(msql_num_fields) { - pval *result; + zval *result; m_result *msql_result; m_query *msql_query; - if (ZEND_NUM_ARGS()!=1 || getParameters(ht, 1, &result)==FAILURE) { + if (ZEND_NUM_ARGS()!=1 || zend_get_parameters(ht, 1, &result)==FAILURE) { WRONG_PARAM_COUNT; } @@ -895,7 +895,7 @@ PHP_FUNCTION(msql_num_fields) */ static void php_msql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int result_type) { - pval *result, *arg2; + zval *result, *arg2; m_result *msql_result; m_row msql_row; m_field *msql_field; @@ -905,7 +905,7 @@ static void php_msql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int result_type) switch (ZEND_NUM_ARGS()) { case 1: - if (getParameters(ht, 1, &result)==FAILURE) { + if (zend_get_parameters(ht, 1, &result)==FAILURE) { RETURN_FALSE; } if (!result_type) { @@ -913,7 +913,7 @@ static void php_msql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int result_type) } break; case 2: - if (getParameters(ht, 2, &result, &arg2)==FAILURE) { + if (zend_get_parameters(ht, 2, &result, &arg2)==FAILURE) { RETURN_FALSE; } convert_to_long(arg2); @@ -1002,11 +1002,11 @@ PHP_FUNCTION(msql_fetch_array) Move internal result pointer */ PHP_FUNCTION(msql_data_seek) { - pval *result,*offset; + zval *result,*offset; m_result *msql_result; m_query *msql_query; - if (ZEND_NUM_ARGS()!=2 || getParameters(ht, 2, &result, &offset)==FAILURE) { + if (ZEND_NUM_ARGS()!=2 || zend_get_parameters(ht, 2, &result, &offset)==FAILURE) { WRONG_PARAM_COUNT; } @@ -1068,19 +1068,19 @@ static char *php_msql_get_field_name(int field_type) Get column information from a result and return as an object */ PHP_FUNCTION(msql_fetch_field) { - pval *result, *field=NULL; + zval *result, *field=NULL; m_result *msql_result; m_field *msql_field; m_query *msql_query; switch (ZEND_NUM_ARGS()) { case 1: - if (getParameters(ht, 1, &result)==FAILURE) { + if (zend_get_parameters(ht, 1, &result)==FAILURE) { RETURN_FALSE; } break; case 2: - if (getParameters(ht, 2, &result, &field)==FAILURE) { + if (zend_get_parameters(ht, 2, &result, &field)==FAILURE) { RETURN_FALSE; } convert_to_long(field); @@ -1119,11 +1119,11 @@ PHP_FUNCTION(msql_fetch_field) Set result pointer to a specific field offset */ PHP_FUNCTION(msql_field_seek) { - pval *result, *offset; + zval *result, *offset; m_result *msql_result; m_query *msql_query; - if (ZEND_NUM_ARGS()!=2 || getParameters(ht, 2, &result, &offset)==FAILURE) { + if (ZEND_NUM_ARGS()!=2 || zend_get_parameters(ht, 2, &result, &offset)==FAILURE) { WRONG_PARAM_COUNT; } @@ -1152,12 +1152,12 @@ PHP_FUNCTION(msql_field_seek) */ static void php_msql_field_info(INTERNAL_FUNCTION_PARAMETERS, int entry_type) { - pval *result, *field; + zval *result, *field; m_result *msql_result; m_field *msql_field; m_query *msql_query; - if (ZEND_NUM_ARGS()!=2 || getParameters(ht, 2, &result, &field)==FAILURE) { + if (ZEND_NUM_ARGS()!=2 || zend_get_parameters(ht, 2, &result, &field)==FAILURE) { WRONG_PARAM_COUNT; } @@ -1280,11 +1280,11 @@ PHP_FUNCTION(msql_field_flags) Free result memory */ PHP_FUNCTION(msql_free_result) { - pval *result; + zval *result; m_result *msql_result; m_query *msql_query; - if (ZEND_NUM_ARGS()!=1 || getParameters(ht, 1, &result)==FAILURE) { + if (ZEND_NUM_ARGS()!=1 || zend_get_parameters(ht, 1, &result)==FAILURE) { WRONG_PARAM_COUNT; } @@ -1298,11 +1298,11 @@ PHP_FUNCTION(msql_free_result) Return number of affected rows */ PHP_FUNCTION(msql_affected_rows) { - pval *result; + zval *result; m_result *msql_result; m_query *msql_query; - if(ZEND_NUM_ARGS() != 1 || getParameters(ht, 1, &result) == FAILURE) { + if(ZEND_NUM_ARGS() != 1 || zend_get_parameters(ht, 1, &result) == FAILURE) { WRONG_PARAM_COUNT; } MSQL_GET_QUERY(result); diff --git a/ext/standard/dns.c b/ext/standard/dns.c index a85c5466cc..24c5d5c68d 100644 --- a/ext/standard/dns.c +++ b/ext/standard/dns.c @@ -655,7 +655,7 @@ static u_char *php_parserr(u_char *cp, querybuf *answer, int type_to_fetch, int Get any Resource Record corresponding to a given Internet host name */ PHP_FUNCTION(dns_get_record) { - pval *addtl, *host, *authns, *fetch_type; + zval *addtl, *host, *authns, *fetch_type; int addtl_recs = 0; int type_to_fetch, type_param = PHP_DNS_ANY; struct __res_state res; @@ -684,10 +684,10 @@ PHP_FUNCTION(dns_get_record) } convert_to_long(fetch_type); type_param = Z_LVAL_P(fetch_type); - pval_destructor(authns); + zval_dtor(authns); addtl_recs = 1; /* We want the additional Records */ array_init(authns); - pval_destructor(addtl); + zval_dtor(addtl); array_init(addtl); break; default: @@ -845,7 +845,7 @@ PHP_FUNCTION(dns_get_record) Get MX records corresponding to a given Internet host name */ PHP_FUNCTION(dns_get_mx) { - pval *host, *mx_list, *weight_list; + zval *host, *mx_list, *weight_list; int need_weight = 0; int count, qdc; u_short type, weight; @@ -867,7 +867,7 @@ PHP_FUNCTION(dns_get_mx) WRONG_PARAM_COUNT; } need_weight = 1; - pval_destructor(weight_list); /* start with clean array */ + zval_dtor(weight_list); /* start with clean array */ array_init(weight_list); break; @@ -876,7 +876,7 @@ PHP_FUNCTION(dns_get_mx) } convert_to_string(host); - pval_destructor(mx_list); /* start with clean array */ + zval_dtor(mx_list); /* start with clean array */ array_init(mx_list); /* Go! */ |