diff options
| author | michael-grunder <michael.grunder@gmail.com> | 2013-03-20 20:08:36 +0400 |
|---|---|---|
| committer | michael-grunder <michael.grunder@gmail.com> | 2013-03-20 20:08:36 +0400 |
| commit | b2ffb7ac753f5fa94d808dbf684a64e9f0e6f8c5 (patch) | |
| tree | 974c4e926102c65d9db7084af6c7c2de57d5c127 | |
| parent | d287163de25d6bbd5e2069286c5af5f694c2a27e (diff) | |
| parent | 8596eac45e1f6defc4036fac9375487e8abc63e7 (diff) | |
Merge branch 'hotfix/php5.2_warnings'php5.2_warnings
| -rw-r--r-- | redis_array_impl.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/redis_array_impl.c b/redis_array_impl.c index d5370c82..0c361d74 100644 --- a/redis_array_impl.c +++ b/redis_array_impl.c @@ -288,12 +288,12 @@ ra_make_array(HashTable *hosts, zval *z_fun, zval *z_dist, HashTable *hosts_prev char * ra_call_extractor(RedisArray *ra, const char *key, int key_len, int *out_len TSRMLS_DC) { - char *error = NULL, *out; + char *out; zval z_ret; zval *z_argv0; /* check that we can call the extractor function */ - if(!zend_is_callable_ex(ra->z_fun, NULL, 0, NULL, NULL, NULL, &error TSRMLS_CC)) { + if(!zend_is_callable_ex(ra->z_fun, NULL, 0, NULL, NULL, NULL, NULL TSRMLS_CC)) { php_error_docref(NULL TSRMLS_CC, E_ERROR, "Could not call extractor function"); return NULL; } @@ -349,12 +349,11 @@ ra_extract_key(RedisArray *ra, const char *key, int key_len, int *out_len TSRMLS zend_bool ra_call_distributor(RedisArray *ra, const char *key, int key_len, int *pos TSRMLS_DC) { - char *error = NULL; zval z_ret; zval *z_argv0; /* check that we can call the extractor function */ - if(!zend_is_callable_ex(ra->z_dist, NULL, 0, NULL, NULL, NULL, &error TSRMLS_CC)) { + if(!zend_is_callable_ex(ra->z_dist, NULL, 0, NULL, NULL, NULL, NULL TSRMLS_CC)) { php_error_docref(NULL TSRMLS_CC, E_ERROR, "Could not call distributor function"); return 0; } |