Skip to content

Commit e7ad31e

Browse files
committed
Remove unused force_connect parameter from redis_sock_server_open function.
1 parent 434bb5a commit e7ad31e

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed

cluster_library.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
#define CLUSTER_LAZY_CONNECT(s) \
5656
if(s->lazy_connect) { \
5757
s->lazy_connect = 0; \
58-
redis_sock_server_open(s, 1 TSRMLS_CC); \
58+
redis_sock_server_open(s TSRMLS_CC); \
5959
}
6060

6161
/* Clear out our "last error" */

library.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1630,7 +1630,7 @@ PHP_REDIS_API int redis_sock_connect(RedisSock *redis_sock TSRMLS_DC)
16301630
* redis_sock_server_open
16311631
*/
16321632
PHP_REDIS_API int
1633-
redis_sock_server_open(RedisSock *redis_sock, int force_connect TSRMLS_DC)
1633+
redis_sock_server_open(RedisSock *redis_sock TSRMLS_DC)
16341634
{
16351635
int res = -1;
16361636

library.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ PHP_REDIS_API void redis_parse_client_list_response(char *response, zval *z_ret)
3535
PHP_REDIS_API void redis_type_response(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval *z_tab, void *ctx);
3636
PHP_REDIS_API RedisSock* redis_sock_create(char *host, int host_len, unsigned short port, double timeout, int persistent, char *persistent_id, long retry_interval, zend_bool lazy_connect);
3737
PHP_REDIS_API int redis_sock_connect(RedisSock *redis_sock TSRMLS_DC);
38-
PHP_REDIS_API int redis_sock_server_open(RedisSock *redis_sock, int force_connect TSRMLS_DC);
38+
PHP_REDIS_API int redis_sock_server_open(RedisSock *redis_sock TSRMLS_DC);
3939
PHP_REDIS_API int redis_sock_disconnect(RedisSock *redis_sock TSRMLS_DC);
4040
PHP_REDIS_API zval *redis_sock_read_multibulk_reply_zval(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval *z_tab);
4141
PHP_REDIS_API char *redis_sock_read_bulk_reply(RedisSock *redis_sock, int bytes TSRMLS_DC);

redis.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -546,7 +546,7 @@ redis_sock_get(zval *id TSRMLS_DC, int no_throw)
546546

547547
if (redis_sock->lazy_connect) {
548548
redis_sock->lazy_connect = 0;
549-
if (redis_sock_server_open(redis_sock, 1 TSRMLS_CC) < 0) {
549+
if (redis_sock_server_open(redis_sock TSRMLS_CC) < 0) {
550550
return NULL;
551551
}
552552
}
@@ -857,7 +857,7 @@ redis_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent)
857857
redis->sock = redis_sock_create(host, host_len, port, timeout, persistent,
858858
persistent_id, retry_interval, 0);
859859

860-
if (redis_sock_server_open(redis->sock, 1 TSRMLS_CC) < 0) {
860+
if (redis_sock_server_open(redis->sock TSRMLS_CC) < 0) {
861861
redis_free_socket(redis->sock);
862862
redis->sock = NULL;
863863
return FAILURE;

redis_array_impl.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ ra_load_hosts(RedisArray *ra, HashTable *hosts, long retry_interval, zend_bool b
8383
if (!b_lazy_connect)
8484
{
8585
/* connect */
86-
redis_sock_server_open(redis->sock, 1 TSRMLS_CC);
86+
redis_sock_server_open(redis->sock TSRMLS_CC);
8787
}
8888

8989
ra->count = ++i;

redis_session.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ redis_pool_get_sock(redis_pool *pool, const char *key TSRMLS_DC) {
167167
if(rpm->auth && rpm->auth_len && rpm->redis_sock->status != REDIS_SOCK_STATUS_CONNECTED) {
168168
needs_auth = 1;
169169
}
170-
redis_sock_server_open(rpm->redis_sock, 0 TSRMLS_CC);
170+
redis_sock_server_open(rpm->redis_sock TSRMLS_CC);
171171
if(needs_auth) {
172172
redis_pool_member_auth(rpm TSRMLS_CC);
173173
}

0 commit comments

Comments
 (0)