andi Wed Jan 31 13:53:30 2001 EDT
Modified files:
/php4/ext/ingres_ii ii.c
/php4/ext/mysql php_mysql.c
/php4/ext/pgsql pgsql.c
/php4/ext/standard scanf.c
Log:
- Change unset() functions to null(). unset() is legacy
Index: php4/ext/ingres_ii/ii.c
diff -u php4/ext/ingres_ii/ii.c:1.13 php4/ext/ingres_ii/ii.c:1.14
--- php4/ext/ingres_ii/ii.c:1.13 Mon Nov 13 14:23:15 2000
+++ php4/ext/ingres_ii/ii.c Wed Jan 31 13:53:29 2001
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: ii.c,v 1.13 2000/11/13 22:23:15 dbeu Exp $ */
+/* $Id: ii.c,v 1.14 2001/01/31 21:53:29 andi Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -1065,10 +1065,10 @@
if(columnData[k-1].dv_null) { /* NULL value ? */
if(result_type & II_NUM) {
- add_index_unset(return_value, i+k-1);
+ add_index_null(return_value, i+k-1);
}
if(result_type & II_ASSOC) {
- add_assoc_unset(return_value, php_ii_field_name(ii_link, i+k-1));
+ add_assoc_null(return_value, php_ii_field_name(ii_link, i+k-1));
}
} else { /* non NULL value */
Index: php4/ext/mysql/php_mysql.c
diff -u php4/ext/mysql/php_mysql.c:1.65 php4/ext/mysql/php_mysql.c:1.66
--- php4/ext/mysql/php_mysql.c:1.65 Tue Jan 30 17:14:54 2001
+++ php4/ext/mysql/php_mysql.c Wed Jan 31 13:53:29 2001
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mysql.c,v 1.65 2001/01/31 01:14:54 elixer Exp $ */
+/* $Id: php_mysql.c,v 1.66 2001/01/31 21:53:29 andi Exp $ */
/* TODO:
@@ -1425,9 +1425,9 @@
} else {
/* NULL value. */
if (result_type & MYSQL_NUM)
- add_index_unset(return_value, i);
+ add_index_null(return_value, i);
else
- add_assoc_unset(return_value, mysql_field->name);
+ add_assoc_null(return_value, mysql_field->name);
}
}
}
Index: php4/ext/pgsql/pgsql.c
diff -u php4/ext/pgsql/pgsql.c:1.84 php4/ext/pgsql/pgsql.c:1.85
--- php4/ext/pgsql/pgsql.c:1.84 Sat Jan 20 02:10:50 2001
+++ php4/ext/pgsql/pgsql.c Wed Jan 31 13:53:29 2001
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pgsql.c,v 1.84 2001/01/20 10:10:50 sas Exp $ */
+/* $Id: pgsql.c,v 1.85 2001/01/31 21:53:29 andi Exp $ */
#include <stdlib.h>
@@ -1049,11 +1049,11 @@
for (i = 0, num_fields = PQnfields(pgsql_result); i<num_fields; i++) {
if (PQgetisnull(pgsql_result, Z_LVAL_PP(row), i)) {
if (result_type & PGSQL_NUM) {
- add_index_unset(return_value, i);
+ add_index_null(return_value, i);
}
if (result_type & PGSQL_ASSOC) {
field_name = PQfname(pgsql_result, i);
- add_assoc_unset(return_value, field_name);
+ add_assoc_null(return_value, field_name);
}
} else {
element = PQgetvalue(pgsql_result, Z_LVAL_PP(row), i);
Index: php4/ext/standard/scanf.c
diff -u php4/ext/standard/scanf.c:1.4 php4/ext/standard/scanf.c:1.5
--- php4/ext/standard/scanf.c:1.4 Mon Oct 30 08:44:01 2000
+++ php4/ext/standard/scanf.c Wed Jan 31 13:53:30 2001
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: scanf.c,v 1.4 2000/10/30 16:44:01 stas Exp $ */
+/* $Id: scanf.c,v 1.5 2001/01/31 21:53:30 andi Exp $ */
/*
scanf.c --
@@ -663,7 +663,7 @@
return FAILURE;
}
for (i = 0; i < totalVars; i++) {
- if (add_next_index_unset(*return_value) == FAILURE) {
+ if (add_next_index_null(*return_value) == FAILURE) {
scan_set_error_return(0, return_value);
return FAILURE;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]
