Removed pointless memory allocation checks.

Changed php_error to php_error_docref.

diff --git a/ext/wddx/wddx.c b/ext/wddx/wddx.c
index f0442a0cf5c7dcba6bd001365b6e329ffc06720d..65cfc545ac6a170b42760131f8214d2b9647baf7 100644 (file)
--- a/ext/wddx/wddx.c
+++ b/ext/wddx/wddx.c
@@ -136,14 +136,11 @@ static int wddx_stack_init(wddx_stack *stack)
 {
        stack->top = 0;
        stack->elements = (void **) emalloc(sizeof(void **) * STACK_BLOCK_SIZE);
-       if (!stack->elements) {
-               return FAILURE;
-       } else {
-               stack->max = STACK_BLOCK_SIZE;
-               stack->varname = NULL;
-               stack->done = 0;
-               return SUCCESS;
-       }
+       stack->max = STACK_BLOCK_SIZE;
+       stack->varname = NULL;
+       stack->done = 0;
+
+       return SUCCESS;
 }
 /* }}} */
 
@@ -154,9 +151,6 @@ static int wddx_stack_push(wddx_stack *stack, void *element, int size)
        if (stack->top >= stack->max) {         /* we need to allocate more memory */
                stack->elements = (void **) erealloc(stack->elements,
                                   (sizeof(void **) * (stack->max += STACK_BLOCK_SIZE)));
-               if (!stack->elements) {
-                       return FAILURE;
-               }
        }
        stack->elements[stack->top] = (void *) emalloc(size);
        memcpy(stack->elements[stack->top], element, size);
@@ -490,7 +484,7 @@ static void php_wddx_serialize_object(wddx_packet *packet, zval *obj)
                                 zend_hash_get_current_data(HASH_OF(retval), (void **)&varname) == SUCCESS;
                                 zend_hash_move_forward(HASH_OF(retval))) {
                                if (Z_TYPE_PP(varname) != IS_STRING) {
-                                       php_error(E_NOTICE, "__sleep should return an array only containing the names of instance-variables to serialize.");
+                                       php_error_docref(NULL TSRMLS_CC, E_NOTICE, "__sleep should return an array only containing the names of instance-variables to serialize.");
                                        continue;
                                }
 
@@ -1133,9 +1127,7 @@ PHP_FUNCTION(wddx_serialize_vars)
                
        argc = ZEND_NUM_ARGS();
        if (argc < 1) {
-               php_error(E_WARNING, "%s() requires at least 1 argument, 0 given",
-                                 get_active_function_name(TSRMLS_C));
-               return;
+               WRONG_PARAM_COUNT;
        }
 
        /* Allocate arguments array and get the arguments, checking for errors. */
@@ -1250,9 +1242,7 @@ PHP_FUNCTION(wddx_add_vars)
        
        argc = ZEND_NUM_ARGS();
        if (argc < 2) {
-               php_error(E_WARNING, "%s() requires at least 2 arguments, %d given",
-                                 get_active_function_name(TSRMLS_C), ZEND_NUM_ARGS());
-               return; 
+               WRONG_PARAM_COUNT;
        }
        
        /* Allocate arguments array and get the arguments, checking for errors. */

diff --git a/ext/yaz/php_yaz.c b/ext/yaz/php_yaz.c
index 901793f7f08b0eab38ced539edc91cb2412eb3fb..d8f63f452ab335588b87319826309391c5c153c3 100644 (file)
--- a/ext/yaz/php_yaz.c
+++ b/ext/yaz/php_yaz.c
@@ -162,7 +162,7 @@ static void get_assoc (INTERNAL_FUNCTION_PARAMETERS, pval **id,
 #ifdef ZTS
                tsrm_mutex_unlock (yaz_mutex);
 #endif
-               php_error(E_WARNING, "Invalid YAZ handle");
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid YAZ handle");
        }
 }
 
@@ -518,7 +518,7 @@ PHP_FUNCTION(yaz_wait)
                }
                if (Z_TYPE_PP(pval_options) != IS_ARRAY)
                {
-                       php_error(E_WARNING, "yaz_wait: Expected array parameter");
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Expected array parameter");
                        RETURN_FALSE;
                }
                options_ht = Z_ARRVAL_PP(pval_options);
@@ -827,10 +827,7 @@ static void retval_grs1 (zval *return_value, Z_GenericRecord *p)
        int eno[20];
        int level = 0;
 
-       if (array_init(return_value) == FAILURE)
-       {
-               RETURN_FALSE;
-       }
+       array_init(return_value);
        eno[level] = 0;
        grs[level] = p;
        while (level >= 0)
@@ -1201,7 +1198,7 @@ PHP_FUNCTION(yaz_itemorder)
        }
        if (Z_TYPE_PP(pval_package) != IS_ARRAY)
        {
-               php_error(E_WARNING, "yaz_itemorder: Expected array parameter");
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Expected array parameter");
                RETURN_FALSE;
        }
        get_assoc (INTERNAL_FUNCTION_PARAM_PASSTHRU, pval_id, &p);
@@ -1247,7 +1244,7 @@ PHP_FUNCTION(yaz_scan)
                }
                if (Z_TYPE_PP(pval_flags) != IS_ARRAY)
                {
-                       php_error(E_WARNING, "yaz_scan: Bad flags parameter");
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Bad flags parameter");
                        RETURN_FALSE;
                }
                flags_ht = Z_ARRVAL_PP(pval_flags);
@@ -1290,10 +1287,7 @@ PHP_FUNCTION(yaz_es_result)
        {
                WRONG_PARAM_COUNT;
        }
-       if (array_init(return_value) == FAILURE)
-       {
-               RETURN_FALSE;
-       }
+       array_init(return_value);
        get_assoc (INTERNAL_FUNCTION_PARAM_PASSTHRU, pval_id, &p);
     if (p && p->zoom_package)
     {
@@ -1331,10 +1325,7 @@ PHP_FUNCTION(yaz_scan_result)
        {
                WRONG_PARAM_COUNT;
        }
-       if (array_init(return_value) == FAILURE)
-       {
-               RETURN_FALSE;
-       }
+       array_init(return_value);
        if (pval_opt && array_init(*pval_opt) == FAILURE)
        {
                RETURN_FALSE;
@@ -1404,7 +1395,7 @@ PHP_FUNCTION(yaz_ccl_conf)
        }
        if (Z_TYPE_PP(pval_package) != IS_ARRAY)
        {
-               php_error(E_WARNING, "yaz_ccl_conf: Expected array parameter");
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Expected array parameter");
                RETURN_FALSE;
        }
        get_assoc (INTERNAL_FUNCTION_PARAM_PASSTHRU, pval_id, &p);
@@ -1453,11 +1444,7 @@ PHP_FUNCTION(yaz_ccl_parse)
        }
        
        pval_destructor(*pval_res);
-       if (array_init(*pval_res) == FAILURE)
-       {
-               php_error(E_WARNING, "cannot initialize array");
-               RETURN_FALSE;
-       }
+       array_init(*pval_res);
        convert_to_string_ex (pval_query);
        get_assoc (INTERNAL_FUNCTION_PARAM_PASSTHRU, pval_id, &p);
        if (p)