10000 Merge branch 'hotfix/php5.2_warnings' into develop · jrtkcoder/phpredis@11a1195 · GitHub
[go: up one dir, main page]

Skip to content

Commit 11a1195

Browse files
Merge branch 'hotfix/php5.2_warnings' into develop
2 parents 25a1593 + 8596eac commit 11a1195

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

redis_array_impl.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -307,12 +307,12 @@ ra_make_array(HashTable *hosts, zval *z_fun, zval *z_dist, HashTable *hosts_prev
307307
char *
308308
ra_call_extractor(RedisArray *ra, const char *key, int key_len, int *out_len TSRMLS_DC) {
309309

310-
char *error = NULL, *out;
310+
char *out;
311311
zval z_ret;
312312
zval *z_argv0;
313313

314314
/* check that we can call the extractor function */
315-
if(!zend_is_callable_ex(ra->z_fun, NULL, 0, NULL, NULL, NULL, &error TSRMLS_CC)) {
315+
if(!zend_is_callable_ex(ra->z_fun, NULL, 0, NULL, NULL, NULL, NULL TSRMLS_CC)) {
316316
php_error_docref(NULL TSRMLS_CC, E_ERROR, "Could not call extractor function");
317317
return NULL;
318318
}
@@ -368,12 +368,11 @@ ra_extract_key(RedisArray *ra, const char *key, int key_len, int *out_len TSRMLS
368368
zend_bool
369369
ra_call_distributor(RedisArray *ra, const char *key, int key_len, int *pos TSRMLS_DC) {
370370

371-
char *error = NULL;
372371
zval z_ret;
373372
zval *z_argv0;
374373

375374
/* check that we can call the extractor function */
376-
if(!zend_is_callable_ex(ra->z_dist, NULL, 0, NULL, NULL, NULL, &error TSRMLS_CC)) {
375+
if(!zend_is_callable_ex(ra->z_dist, NULL, 0, NULL, NULL, NULL, NULL TSRMLS_CC)) {
377376
php_error_docref(NULL TSRMLS_CC, E_ERROR, "Could not call distributor function");
378377
return 0;
379378
}

0 commit comments

Comments
 (0)
0