sniper Mon Dec 5 17:21:12 2005 EDT
Modified files:
/php-src/ext/msql php_msql.c
Log:
- Nuke php3 legacy
http://cvs.php.net/diff.php/php-src/ext/msql/php_msql.c?r1=1.60&r2=1.61&ty=u
Index: php-src/ext/msql/php_msql.c
diff -u php-src/ext/msql/php_msql.c:1.60 php-src/ext/msql/php_msql.c:1.61
--- php-src/ext/msql/php_msql.c:1.60 Wed Aug 3 10:07:28 2005
+++ php-src/ext/msql/php_msql.c Mon Dec 5 17:21:12 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_msql.c,v 1.60 2005/08/03 14:07:28 sniper Exp $ */
+/* $Id: php_msql.c,v 1.61 2005/12/05 22:21:12 sniper Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -243,9 +243,9 @@
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 @@
Close an mSQL connection */
PHP_FUNCTION(msql_close)
{
- pval *msql_link;
+ zval *msql_link;
int id;
int msql;
@@ -410,7 +410,7 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
*/
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 @@
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 @@
}
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 @@
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 @@
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 @@
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 @@
*/
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 @@
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 @@
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);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
