iliaa Wed Jan 29 21:33:15 2003 EDT
Modified files:
/php4/ext/sybase_ct php_sybase_ct.c
/php4/ext/sybase php_sybase_db.c
/php4/ext/mssql php_mssql.c
/php4/ext/mysql php_mysql.c
/php4/ext/msql php_msql.c
/php4/ext/mcal php_mcal.c
/php4/ext/imap php_imap.c
/php4/ext/fbsql php_fbsql.c
/php4/ext/dbx dbx.c
Log:
Removed pointless checks.
Index: php4/ext/sybase_ct/php_sybase_ct.c
diff -u php4/ext/sybase_ct/php_sybase_ct.c:1.80 php4/ext/sybase_ct/php_sybase_ct.c:1.81
--- php4/ext/sybase_ct/php_sybase_ct.c:1.80 Wed Jan 22 17:07:22 2003
+++ php4/ext/sybase_ct/php_sybase_ct.c Wed Jan 29 21:33:13 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_sybase_ct.c,v 1.80 2003/01/22 22:07:22 iliaa Exp $ */
+/* $Id: php_sybase_ct.c,v 1.81 2003/01/30 02:33:13 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
@@ -1824,9 +1824,8 @@
RETURN_FALSE;
}
- if (object_init(return_value)==FAILURE) {
- RETURN_FALSE;
- }
+ object_init(return_value);
+
add_property_string(return_value, "name", result->fields[field_offset].name,
1);
add_property_long(return_value, "max_length",
result->fields[field_offset].max_length);
add_property_string(return_value, "column_source",
result->fields[field_offset].column_source, 1);
Index: php4/ext/sybase/php_sybase_db.c
diff -u php4/ext/sybase/php_sybase_db.c:1.45 php4/ext/sybase/php_sybase_db.c:1.46
--- php4/ext/sybase/php_sybase_db.c:1.45 Wed Jan 15 08:55:32 2003
+++ php4/ext/sybase/php_sybase_db.c Wed Jan 29 21:33:13 2003
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_sybase_db.c,v 1.45 2003/01/15 13:55:32 iliaa Exp $ */
+/* $Id: php_sybase_db.c,v 1.46 2003/01/30 02:33:13 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
@@ -1219,9 +1219,8 @@
RETURN_FALSE;
}
- if (object_init(return_value)==FAILURE) {
- RETURN_FALSE;
- }
+ object_init(return_value);
+
add_property_string(return_value, "name",result->fields[field_offset].name, 1);
add_property_long(return_value,
"max_length",result->fields[field_offset].max_length);
add_property_string(return_value,
"column_source",result->fields[field_offset].column_source, 1);
Index: php4/ext/mssql/php_mssql.c
diff -u php4/ext/mssql/php_mssql.c:1.101 php4/ext/mssql/php_mssql.c:1.102
--- php4/ext/mssql/php_mssql.c:1.101 Sat Jan 18 16:31:07 2003
+++ php4/ext/mssql/php_mssql.c Wed Jan 29 21:33:13 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mssql.c,v 1.101 2003/01/18 21:31:07 iliaa Exp $ */
+/* $Id: php_mssql.c,v 1.102 2003/01/30 02:33:13 iliaa Exp $ */
#ifdef COMPILE_DL_MSSQL
#define HAVE_MSSQL 1
@@ -1490,9 +1490,8 @@
RETURN_FALSE;
}
- if (object_init(return_value)==FAILURE) {
- RETURN_FALSE;
- }
+ object_init(return_value);
+
add_property_string(return_value, "name",result->fields[field_offset].name, 1);
add_property_long(return_value,
"max_length",result->fields[field_offset].max_length);
add_property_string(return_value,
"column_source",result->fields[field_offset].column_source, 1);
Index: php4/ext/mysql/php_mysql.c
diff -u php4/ext/mysql/php_mysql.c:1.183 php4/ext/mysql/php_mysql.c:1.184
--- php4/ext/mysql/php_mysql.c:1.183 Sat Jan 18 14:41:44 2003
+++ php4/ext/mysql/php_mysql.c Wed Jan 29 21:33:14 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mysql.c,v 1.183 2003/01/18 19:41:44 iliaa Exp $ */
+/* $Id: php_mysql.c,v 1.184 2003/01/30 02:33:14 iliaa Exp $ */
/* TODO:
*
@@ -2111,9 +2111,7 @@
if ((mysql_field=mysql_fetch_field(mysql_result))==NULL) {
RETURN_FALSE;
}
- if (object_init(return_value)==FAILURE) {
- RETURN_FALSE;
- }
+ object_init(return_value);
add_property_string(return_value,
"name",(mysql_field->name?mysql_field->name:empty_string), 1);
add_property_string(return_value,
"table",(mysql_field->table?mysql_field->table:empty_string), 1);
Index: php4/ext/msql/php_msql.c
diff -u php4/ext/msql/php_msql.c:1.52 php4/ext/msql/php_msql.c:1.53
--- php4/ext/msql/php_msql.c:1.52 Sat Jan 18 16:31:06 2003
+++ php4/ext/msql/php_msql.c Wed Jan 29 21:33:14 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_msql.c,v 1.52 2003/01/18 21:31:06 iliaa Exp $ */
+/* $Id: php_msql.c,v 1.53 2003/01/30 02:33:14 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1095,9 +1095,7 @@
if (!msql_result || (msql_field=msqlFetchField(msql_result))==NULL) {
RETURN_FALSE;
}
- if (object_init(return_value)==FAILURE) {
- RETURN_FALSE;
- }
+ object_init(return_value);
add_property_string(return_value,
"name",(msql_field->name?msql_field->name:empty_string), 1);
add_property_string(return_value,
"table",(msql_field->table?msql_field->table:empty_string), 1);
Index: php4/ext/mcal/php_mcal.c
diff -u php4/ext/mcal/php_mcal.c:1.55 php4/ext/mcal/php_mcal.c:1.56
--- php4/ext/mcal/php_mcal.c:1.55 Sat Jan 18 19:47:01 2003
+++ php4/ext/mcal/php_mcal.c Wed Jan 29 21:33:14 2003
@@ -1367,9 +1367,7 @@
calevent_next_recurrence(mcal_le_struct->event, &mydate, Z_LVAL_PP(weekstart));
- if (object_init(return_value) == FAILURE) {
- RETURN_FALSE;
- }
+ object_init(return_value);
if (mydate.has_date) {
add_property_long(return_value, "year", mydate.year);
Index: php4/ext/imap/php_imap.c
diff -u php4/ext/imap/php_imap.c:1.156 php4/ext/imap/php_imap.c:1.157
--- php4/ext/imap/php_imap.c:1.156 Fri Jan 24 05:12:55 2003
+++ php4/ext/imap/php_imap.c Wed Jan 29 21:33:14 2003
@@ -26,7 +26,7 @@
| PHP 4.0 updates: Zeev Suraski <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_imap.c,v 1.156 2003/01/24 10:12:55 sniper Exp $ */
+/* $Id: php_imap.c,v 1.157 2003/01/30 02:33:14 iliaa Exp $ */
#define IMAP41
@@ -1866,9 +1866,7 @@
ZEND_FETCH_RESOURCE(imap_le_struct, pils *, streamind, -1, "imap", le_imap);
/* Initialize return object */
- if (object_init(return_value) == FAILURE) {
- RETURN_FALSE;
- }
+ object_init(return_value);
unreadmsg = 0;
deletedmsg = 0;
@@ -2497,9 +2495,7 @@
convert_to_string_ex(mbx);
convert_to_long_ex(flags);
- if (object_init(return_value) == FAILURE) {
- RETURN_FALSE;
- }
+ object_init(return_value);
if (mail_status(imap_le_struct->imap_stream, Z_STRVAL_PP(mbx),
Z_LVAL_PP(flags))) {
add_property_long(return_value, "flags", IMAPG(status_flags));
@@ -2548,9 +2544,7 @@
RETURN_FALSE;
}
- if (object_init(return_value) == FAILURE) {
- RETURN_FALSE;
- }
+ object_init(return_value);
body=mail_body(imap_le_struct->imap_stream, Z_LVAL_PP(msg),
Z_STRVAL_PP(section));
if (body->type <= TYPEMAX) {
Index: php4/ext/fbsql/php_fbsql.c
diff -u php4/ext/fbsql/php_fbsql.c:1.90 php4/ext/fbsql/php_fbsql.c:1.91
--- php4/ext/fbsql/php_fbsql.c:1.90 Tue Jan 21 09:53:15 2003
+++ php4/ext/fbsql/php_fbsql.c Wed Jan 29 21:33:15 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_fbsql.c,v 1.90 2003/01/21 14:53:15 iliaa Exp $ */
+/* $Id: php_fbsql.c,v 1.91 2003/01/30 02:33:15 iliaa Exp $ */
/* TODO:
*
@@ -3059,10 +3059,8 @@
RETURN_FALSE;
}
}
- if (object_init(return_value)==FAILURE)
- {
- RETURN_FALSE;
- }
+ object_init(return_value);
+
add_property_string(return_value, "name",
(char*)fbccmdLabelName(fbcmdColumnMetaDataAtIndex(result->metaData, column)), 1);
add_property_string(return_value, "table",
(char*)fbccmdTableName(fbcmdColumnMetaDataAtIndex(result->metaData, column)), 1);
add_property_long(return_value, "max_length",
fbcdmdLength(fbccmdDatatype(fbcmdColumnMetaDataAtIndex(result->metaData, column))));
Index: php4/ext/dbx/dbx.c
diff -u php4/ext/dbx/dbx.c:1.46 php4/ext/dbx/dbx.c:1.47
--- php4/ext/dbx/dbx.c:1.46 Fri Jan 24 00:21:08 2003
+++ php4/ext/dbx/dbx.c Wed Jan 29 21:33:15 2003
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: dbx.c,v 1.46 2003/01/24 05:21:08 iliaa Exp $ */
+/* $Id: dbx.c,v 1.47 2003/01/30 02:33:15 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -302,14 +302,7 @@
RETURN_LONG(0);
}
- if (object_init(return_value) != SUCCESS) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, "dbx: unable to create
resulting object...");
- FREE_ZVAL(dbx_module);
- zval_dtor(db_name); /* to free stringvalue memory */
- FREE_ZVAL(db_name);
- FREE_ZVAL(rv_dbx_handle);
- RETURN_LONG(0);
- }
+ object_init(return_value);
zend_hash_update(Z_OBJPROP_P(return_value), "handle", 7, (void
*)&(rv_dbx_handle), sizeof(zval *), NULL);
zend_hash_update(Z_OBJPROP_P(return_value), "module", 7, (void
*)&(dbx_module), sizeof(zval *), NULL);
@@ -427,11 +420,8 @@
* rv_result_handle holds a resource
*/
/* init return_value as object (of rows) */
- if (object_init(return_value) != SUCCESS) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, "unable to create resulting
object...");
- FREE_ZVAL(rv_result_handle);
- RETURN_LONG(0);
- }
+ object_init(return_value);
+
/* add result_handle property to return_value */
zend_hash_update(Z_OBJPROP_P(return_value), "handle", 7, (void
*)&(rv_result_handle), sizeof(zval *), NULL);
/* init info property as array and add to return_value as a property */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
