diff options
Diffstat (limited to 'Zend/zend_API.c')
| -rw-r--r-- | Zend/zend_API.c | 81 |
1 files changed, 44 insertions, 37 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c index a2ea7a7030..ab12fed9ad 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -1383,90 +1383,88 @@ ZEND_API int _object_init(zval *arg ZEND_FILE_LINE_DC) /* {{{ */ ZEND_API int add_assoc_long_ex(zval *arg, const char *key, size_t key_len, zend_long n) /* {{{ */ { - zval *ret, tmp; + zval tmp; ZVAL_LONG(&tmp, n); - ret = zend_symtable_str_update(Z_ARRVAL_P(arg), key, key_len, &tmp); - return ret ? SUCCESS : FAILURE; + zend_symtable_str_update(Z_ARRVAL_P(arg), key, key_len, &tmp); + return SUCCESS; } /* }}} */ ZEND_API int add_assoc_null_ex(zval *arg, const char *key, size_t key_len) /* {{{ */ { - zval *ret, tmp; + zval tmp; ZVAL_NULL(&tmp); - ret = zend_symtable_str_update(Z_ARRVAL_P(arg), key, key_len, &tmp); - return ret ? SUCCESS : FAILURE; + zend_symtable_str_update(Z_ARRVAL_P(arg), key, key_len, &tmp); + return SUCCESS; } /* }}} */ ZEND_API int add_assoc_bool_ex(zval *arg, const char *key, size_t key_len, int b) /* {{{ */ { - zval *ret, tmp; + zval tmp; ZVAL_BOOL(&tmp, b); - ret = zend_symtable_str_update(Z_ARRVAL_P(arg), key, key_len, &tmp); - return ret ? SUCCESS : FAILURE; + zend_symtable_str_update(Z_ARRVAL_P(arg), key, key_len, &tmp); + return SUCCESS; } /* }}} */ ZEND_API int add_assoc_resource_ex(zval *arg, const char *key, size_t key_len, zend_resource *r) /* {{{ */ { - zval *ret, tmp; + zval tmp; ZVAL_RES(&tmp, r); - ret = zend_symtable_str_update(Z_ARRVAL_P(arg), key, key_len, &tmp); - return ret ? SUCCESS : FAILURE; + zend_symtable_str_update(Z_ARRVAL_P(arg), key, key_len, &tmp); + return SUCCESS; } /* }}} */ ZEND_API int add_assoc_double_ex(zval *arg, const char *key, size_t key_len, double d) /* {{{ */ { - zval *ret, tmp; + zval tmp; ZVAL_DOUBLE(&tmp, d); - ret = zend_symtable_str_update(Z_ARRVAL_P(arg), key, key_len, &tmp); - return ret ? SUCCESS : FAILURE; + zend_symtable_str_update(Z_ARRVAL_P(arg), key, key_len, &tmp); + return SUCCESS; } /* }}} */ ZEND_API int add_assoc_str_ex(zval *arg, const char *key, size_t key_len, zend_string *str) /* {{{ */ { - zval *ret, tmp; + zval tmp; ZVAL_STR(&tmp, str); - ret = zend_symtable_str_update(Z_ARRVAL_P(arg), key, key_len, &tmp); - return ret ? SUCCESS : FAILURE; + zend_symtable_str_update(Z_ARRVAL_P(arg), key, key_len, &tmp); + return SUCCESS; } /* }}} */ ZEND_API int add_assoc_string_ex(zval *arg, const char *key, size_t key_len, const char *str) /* {{{ */ { - zval *ret, tmp; + zval tmp; ZVAL_STRING(&tmp, str); - ret = zend_symtable_str_update(Z_ARRVAL_P(arg), key, key_len, &tmp); - return ret ? SUCCESS : FAILURE; + zend_symtable_str_update(Z_ARRVAL_P(arg), key, key_len, &tmp); + return SUCCESS; } /* }}} */ ZEND_API int add_assoc_stringl_ex(zval *arg, const char *key, size_t key_len, const char *str, size_t length) /* {{{ */ { - zval *ret, tmp; + zval tmp; ZVAL_STRINGL(&tmp, str, length); - ret = zend_symtable_str_update(Z_ARRVAL_P(arg), key, key_len, &tmp); - return ret ? SUCCESS : FAILURE; + zend_symtable_str_update(Z_ARRVAL_P(arg), key, key_len, &tmp); + return SUCCESS; } /* }}} */ ZEND_API int add_assoc_zval_ex(zval *arg, const char *key, size_t key_len, zval *value) /* {{{ */ { - zval *ret; - - ret = zend_symtable_str_update(Z_ARRVAL_P(arg), key, key_len, value); - return ret ? SUCCESS : FAILURE; + zend_symtable_str_update(Z_ARRVAL_P(arg), key, key_len, value); + return SUCCESS; } /* }}} */ @@ -1475,7 +1473,8 @@ ZEND_API int add_index_long(zval *arg, zend_ulong index, zend_long n) /* {{{ */ zval tmp; ZVAL_LONG(&tmp, n); - return zend_hash_index_update(Z_ARRVAL_P(arg), index, &tmp) ? SUCCESS : FAILURE; + zend_hash_index_update(Z_ARRVAL_P(arg), index, &tmp); + return SUCCESS; } /* }}} */ @@ -1484,7 +1483,8 @@ ZEND_API int add_index_null(zval *arg, zend_ulong index) /* {{{ */ zval tmp; ZVAL_NULL(&tmp); - return zend_hash_index_update(Z_ARRVAL_P(arg), index, &tmp) ? SUCCESS : FAILURE; + zend_hash_index_update(Z_ARRVAL_P(arg), index, &tmp); + return SUCCESS; } /* }}} */ @@ -1493,7 +1493,8 @@ ZEND_API int add_index_bool(zval *arg, zend_ulong index, int b) /* {{{ */ zval tmp; ZVAL_BOOL(&tmp, b); - return zend_hash_index_update(Z_ARRVAL_P(arg), index, &tmp) ? SUCCESS : FAILURE; + zend_hash_index_update(Z_ARRVAL_P(arg), index, &tmp); + return SUCCESS; } /* }}} */ @@ -1502,7 +1503,8 @@ ZEND_API int add_index_resource(zval *arg, zend_ulong index, zend_resource *r) / zval tmp; ZVAL_RES(&tmp, r); - return zend_hash_index_update(Z_ARRVAL_P(arg), index, &tmp) ? SUCCESS : FAILURE; + zend_hash_index_update(Z_ARRVAL_P(arg), index, &tmp); + return SUCCESS; } /* }}} */ @@ -1511,7 +1513,8 @@ ZEND_API int add_index_double(zval *arg, zend_ulong index, double d) /* {{{ */ zval tmp; ZVAL_DOUBLE(&tmp, d); - return zend_hash_index_update(Z_ARRVAL_P(arg), index, &tmp) ? SUCCESS : FAILURE; + zend_hash_index_update(Z_ARRVAL_P(arg), index, &tmp); + return SUCCESS; } /* }}} */ @@ -1520,7 +1523,8 @@ ZEND_API int add_index_str(zval *arg, zend_ulong index, zend_string *str) /* {{{ zval tmp; ZVAL_STR(&tmp, str); - return zend_hash_index_update(Z_ARRVAL_P(arg), index, &tmp) ? SUCCESS : FAILURE; + zend_hash_index_update(Z_ARRVAL_P(arg), index, &tmp); + return SUCCESS; } /* }}} */ @@ -1529,7 +1533,8 @@ ZEND_API int add_index_string(zval *arg, zend_ulong index, const char *str) /* { zval tmp; ZVAL_STRING(&tmp, str); - return zend_hash_index_update(Z_ARRVAL_P(arg), index, &tmp) ? SUCCESS : FAILURE; + zend_hash_index_update(Z_ARRVAL_P(arg), index, &tmp); + return SUCCESS; } /* }}} */ @@ -1538,13 +1543,15 @@ ZEND_API int add_index_stringl(zval *arg, zend_ulong index, const char *str, siz zval tmp; ZVAL_STRINGL(&tmp, str, length); - return zend_hash_index_update(Z_ARRVAL_P(arg), index, &tmp) ? SUCCESS : FAILURE; + zend_hash_index_update(Z_ARRVAL_P(arg), index, &tmp); + return SUCCESS; } /* }}} */ ZEND_API int add_index_zval(zval *arg, zend_ulong index, zval *value) /* {{{ */ { - return zend_hash_index_update(Z_ARRVAL_P(arg), index, value) ? SUCCESS : FAILURE; + zend_hash_index_update(Z_ARRVAL_P(arg), index, value); + return SUCCESS; } /* }}} */ |