8000 Merge branch 'hotfix/tsrmls_cc' into develop · jrtkcoder/phpredis@578bdf0 · GitHub
[go: up one dir, main page]

Skip to content

Commit 578bdf0

Browse files
Merge branch 'hotfix/tsrmls_cc' into develop
2 parents e914485 + 411100d commit 578bdf0

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

redis.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ PHPAPI int redis_sock_get(zval *id, RedisSock **redis_sock TSRMLS_DC, int no_thr
399399
* redis_sock_get_direct
400400
* Returns our attached RedisSock pointer if we're connected
401401
*/
402-
PHPAPI RedisSock *redis_sock_get_connected(INTERNAL_FUNCTION_PARAMETERS TSRMLS_DC) {
402+
PHPAPI RedisSock *redis_sock_get_connected(INTERNAL_FUNCTION_PARAMETERS) {
403403
zval *object;
404404
RedisSock *redis_sock;
405405

@@ -6356,7 +6356,7 @@ PHP_METHOD(Redis, time) {
63566356
PHP_METHOD(Redis, isConnected) {
63576357
RedisSock *redis_sock;
63586358

6359-
if((redis_sock = redis_sock_get_connected(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC))) {
6359+
if((redis_sock = redis_sock_get_connected(INTERNAL_FUNCTION_PARAM_PASSTHRU))) {
63606360
RETURN_TRUE;
63616361
} else {
63626362
RETURN_FALSE;
@@ -6369,7 +6369,7 @@ PHP_METHOD(Redis, isConnected) {
63696369
PHP_METHOD(Redis, getHost) {
63706370
RedisSock *redis_sock;
63716371

6372-
if((redis_sock = redis_sock_get_connected(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC))) {
6372+
if((redis_sock = redis_sock_get_connected(INTERNAL_FUNCTION_PARAM_PASSTHRU))) {
63736373
RETURN_STRING(redis_sock->host, 1);
63746374
} else {
63756375
RETURN_FALSE;
@@ -6382,7 +6382,7 @@ PHP_METHOD(Redis, getHost) {
63826382
PHP_METHOD(Redis, getPort) {
63836383
RedisSock *redis_sock;
63846384

6385-
if((redis_sock = redis_sock_get_connected(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC))) {
6385+
if((redis_sock = redis_sock_get_connected(INTERNAL_FUNCTION_PARAM_PASSTHRU))) {
63866386
// Return our port
63876387
RETURN_LONG(redis_sock->port);
63886388
} else {
@@ -6396,7 +6396,7 @@ PHP_METHOD(Redis, getPort) {
63966396
PHP_METHOD(Redis, getDBNum) {
63976397
RedisSock *redis_sock;
63986398

6399-
if((redis_sock = redis_sock_get_connected(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC))) {
6399+
if((redis_sock = redis_sock_get_connected(INTERNAL_FUNCTION_PARAM_PASSTHRU))) {
64006400
// Return our db number
64016401
RETURN_LONG(redis_sock->dbNumber);
64026402
} else {
@@ -6410,7 +6410,7 @@ PHP_METHOD(Redis, getDBNum) {
64106410
PHP_METHOD(Redis, getTimeout) {
64116411
RedisSock *redis_sock;
64126412

6413-
if((redis_sock = redis_sock_get_connected(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC))) {
6413+
if((redis_sock = redis_sock_get_connected(INTERNAL_FUNCTION_PARAM_PASSTHRU))) {
64146414
RETURN_DOUBLE(redis_sock->timeout);
64156415
} else {
64166416
RETURN_FALSE;
@@ -6423,7 +6423,7 @@ PHP_METHOD(Redis, getTimeout) {
64236423
PHP_METHOD(Redis, getReadTimeout) {
64246424
RedisSock *redis_sock;
64256425

6426-
if((redis_sock = redis_sock_get_connected(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC))) {
6426+
if((redis_sock = redis_sock_get_connected(INTERNAL_FUNCT 8000 ION_PARAM_PASSTHRU))) {
64276427
RETURN_DOUBLE(redis_sock->read_timeout);
64286428
} else {
64296429
RETURN_FALSE;
@@ -6436,7 +6436,7 @@ PHP_METHOD(Redis, getReadTimeout) {
64366436
PHP_METHOD(Redis, getPersistentID) {
64376437
RedisSock *redis_sock;
64386438

6439-
if((redis_sock = redis_sock_get_connected(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC))) {
6439+
if((redis_sock = redis_sock_get_connected(INTERNAL_FUNCTION_PARAM_PASSTHRU))) {
64406440
if(redis_sock->persistent_id != NULL) {
64416441
RETURN_STRING(redis_sock->persistent_id, 1);
64426442
} else {
@@ -6453,7 +6453,7 @@ PHP_METHOD(Redis, getPersistentID) {
64536453
PHP_METHOD(Redis, getAuth) {
64546454
RedisSock *redis_sock;
64556455

6456-
if((redis_sock = redis_sock_get_connected(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC))) {
6456+
if((redis_sock = redis_sock_get_connected(INTERNAL_FUNCTION_PARAM_PASSTHRU))) {
64576457
if(redis_sock->auth != NULL) {
64586458
RETURN_STRING(redis_sock->auth, 1);
64596459
} else {

0 commit comments

Comments
 (0)
0