Removed pointless checks.

diff --git a/ext/dbx/dbx.c b/ext/dbx/dbx.c
index ac6665a22327c109deb0617ae354e73e4c433e93..43b7c5c6e1978f6c1ae8a418719f51b231290a70 100644 (file)
--- a/ext/dbx/dbx.c
+++ b/ext/dbx/dbx.c
@@ -302,14 +302,7 @@ ZEND_FUNCTION(dbx_connect)
                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 @@ ZEND_FUNCTION(dbx_query)
         * 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 */

diff --git a/ext/fbsql/php_fbsql.c b/ext/fbsql/php_fbsql.c
index bc1979dac5688caccb274708f3151c0730bd3cf1..76020985136c9649a9785bd8f3600a98f8b05beb 100644 (file)
--- a/ext/fbsql/php_fbsql.c
+++ b/ext/fbsql/php_fbsql.c
@@ -3059,10 +3059,8 @@ PHP_FUNCTION(fbsql_fetch_field)
                        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))));

diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c
index ca315598b51169ce06c0058a79a0bfe4fd42214b..41918579fa36f288d66991be06462e99587942b4 100644 (file)
--- a/ext/imap/php_imap.c
+++ b/ext/imap/php_imap.c
@@ -1866,9 +1866,7 @@ PHP_FUNCTION(imap_mailboxmsginfo)
        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 @@ PHP_FUNCTION(imap_status)
        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 @@ PHP_FUNCTION(imap_bodystruct)
                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) {

diff --git a/ext/mcal/php_mcal.c b/ext/mcal/php_mcal.c
index 0c73edb38307c4f3fa3ba153e2415feea5aafa81..6ecd3a54197641954b3f8cb125e21d44996fe031 100644 (file)
--- a/ext/mcal/php_mcal.c
+++ b/ext/mcal/php_mcal.c
@@ -1367,9 +1367,7 @@ PHP_FUNCTION(mcal_next_recurrence)
        
        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);

diff --git a/ext/msql/php_msql.c b/ext/msql/php_msql.c
index ddd97293cc7730e5d475f730a6ed9954c2404377..f4736f5df1445f96bdf54bf2dbfb1c75eff99d81 100644 (file)
--- a/ext/msql/php_msql.c
+++ b/ext/msql/php_msql.c
@@ -1095,9 +1095,7 @@ PHP_FUNCTION(msql_fetch_field)
        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);

diff --git a/ext/mssql/php_mssql.c b/ext/mssql/php_mssql.c
index b44deff3c685533eef4face3a6c1f8901fa11267..c60065c73e105bdd61df04bc06cefa84cf25f849 100644 (file)
--- a/ext/mssql/php_mssql.c
+++ b/ext/mssql/php_mssql.c
@@ -1490,9 +1490,8 @@ PHP_FUNCTION(mssql_fetch_field)
                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);

diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c
index eeefc0aeda66a644481bb5a9f02028471774558a..ef46b204a0171c0dfe16f3524641c50a63f70e7b 100644 (file)
--- a/ext/mysql/php_mysql.c
+++ b/ext/mysql/php_mysql.c
@@ -2111,9 +2111,7 @@ PHP_FUNCTION(mysql_fetch_field)
        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);

diff --git a/ext/sybase/php_sybase_db.c b/ext/sybase/php_sybase_db.c
index e8e1026185ccb335681eeb5595f0ef6d5f23555d..d96dad533de62118e053893ed7a56e310337a588 100644 (file)
--- a/ext/sybase/php_sybase_db.c
+++ b/ext/sybase/php_sybase_db.c
@@ -1219,9 +1219,8 @@ PHP_FUNCTION(sybase_fetch_field)
                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);

diff --git a/ext/sybase_ct/php_sybase_ct.c b/ext/sybase_ct/php_sybase_ct.c
index a4782ed5d7fd1c5c928972b442301196e41f5b3b..6c33f7ede24bee3fb0b72ed7b832cc43aac90f04 100644 (file)
--- a/ext/sybase_ct/php_sybase_ct.c
+++ b/ext/sybase_ct/php_sybase_ct.c
@@ -1824,9 +1824,8 @@ PHP_FUNCTION(sybase_fetch_field)
                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);