Skip to content

Commit 411100d

Browse files
Don't duplicate TSRMLS_CC
1 parent 7c52f3a commit 411100d

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

redis.c

+9-9
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ PHPAPI int redis_sock_get(zval *id, RedisSock **redis_sock TSRMLS_DC, int no_thr
398398
* redis_sock_get_direct
399399
* Returns our attached RedisSock pointer if we're connected
400400
*/
401-
PHPAPI RedisSock *redis_sock_get_connected(INTERNAL_FUNCTION_PARAMETERS TSRMLS_DC) {
401+
PHPAPI RedisSock *redis_sock_get_connected(INTERNAL_FUNCTION_PARAMETERS) {
402402
zval *object;
403403
RedisSock *redis_sock;
404404

@@ -6348,7 +6348,7 @@ PHP_METHOD(Redis, time) {
63486348
PHP_METHOD(Redis, isConnected) {
63496349
RedisSock *redis_sock;
63506350

6351-
if((redis_sock = redis_sock_get_connected(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC))) {
6351+
if((redis_sock = redis_sock_get_connected(INTERNAL_FUNCTION_PARAM_PASSTHRU))) {
63526352
RETURN_TRUE;
63536353
} else {
63546354
RETURN_FALSE;
@@ -6361,7 +6361,7 @@ PHP_METHOD(Redis, isConnected) {
63616361
PHP_METHOD(Redis, getHost) {
63626362
RedisSock *redis_sock;
63636363

6364-
if((redis_sock = redis_sock_get_connected(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC))) {
6364+
if((redis_sock = redis_sock_get_connected(INTERNAL_FUNCTION_PARAM_PASSTHRU))) {
63656365
RETURN_STRING(redis_sock->host, 1);
63666366
} else {
63676367
RETURN_FALSE;
@@ -6374,7 +6374,7 @@ PHP_METHOD(Redis, getHost) {
63746374
PHP_METHOD(Redis, getPort) {
63756375
RedisSock *redis_sock;
63766376

6377-
if((redis_sock = redis_sock_get_connected(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC))) {
6377+
if((redis_sock = redis_sock_get_connected(INTERNAL_FUNCTION_PARAM_PASSTHRU))) {
63786378
// Return our port
63796379
RETURN_LONG(redis_sock->port);
63806380
} else {
@@ -6388,7 +6388,7 @@ PHP_METHOD(Redis, getPort) {
63886388
PHP_METHOD(Redis, getDBNum) {
63896389
RedisSock *redis_sock;
63906390

6391-
if((redis_sock = redis_sock_get_connected(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC))) {
6391+
if((redis_sock = redis_sock_get_connected(INTERNAL_FUNCTION_PARAM_PASSTHRU))) {
63926392
// Return our db number
63936393
RETURN_LONG(redis_sock->dbNumber);
63946394
} else {
@@ -6402,7 +6402,7 @@ PHP_METHOD(Redis, getDBNum) {
64026402
PHP_METHOD(Redis, getTimeout) {
64036403
RedisSock *redis_sock;
64046404

6405-
if((redis_sock = redis_sock_get_connected(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC))) {
6405+
if((redis_sock = redis_sock_get_connected(INTERNAL_FUNCTION_PARAM_PASSTHRU))) {
64066406
RETURN_DOUBLE(redis_sock->timeout);
64076407
} else {
64086408
RETURN_FALSE;
@@ -6415,7 +6415,7 @@ PHP_METHOD(Redis, getTimeout) {
64156415
PHP_METHOD(Redis, getReadTimeout) {
64166416
RedisSock *redis_sock;
64176417

6418-
if((redis_sock = redis_sock_get_connected(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC))) {
6418+
if((redis_sock = redis_sock_get_connected(INTERNAL_FUNCTION_PARAM_PASSTHRU))) {
64196419
RETURN_DOUBLE(redis_sock->read_timeout);
64206420
} else {
64216421
RETURN_FALSE;
@@ -6428,7 +6428,7 @@ PHP_METHOD(Redis, getReadTimeout) {
64286428
PHP_METHOD(Redis, getPersistentID) {
64296429
RedisSock *redis_sock;
64306430

6431-
if((redis_sock = redis_sock_get_connected(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC))) {
6431+
if((redis_sock = redis_sock_get_connected(INTERNAL_FUNCTION_PARAM_PASSTHRU))) {
64326432
if(redis_sock->persistent_id != NULL) {
64336433
RETURN_STRING(redis_sock->persistent_id, 1);
64346434
} else {
@@ -6445,7 +6445,7 @@ PHP_METHOD(Redis, getPersistentID) {
64456445
PHP_METHOD(Redis, getAuth) {
64466446
RedisSock *redis_sock;
64476447

6448-
if((redis_sock = redis_sock_get_connected(INTERNAL_FUNCTION_PARAM_PASSTHRU TSRMLS_CC))) {
6448+
if((redis_sock = redis_sock_get_connected(INTERNAL_FUNCTION_PARAM_PASSTHRU))) {
64496449
if(redis_sock->auth != NULL) {
64506450
RETURN_STRING(redis_sock->auth, 1);
64516451
} else {

0 commit comments

Comments
 (0)