Skip to content

Commit 83764e9

Browse files
laruencelaruence
committed
remove TSRMLS_XX
1 parent 8aa2a5a commit 83764e9

15 files changed

+810
-810
lines changed

‎cluster_library.c

Lines changed: 99 additions & 99 deletions
Large diffs are not rendered by default.

‎cluster_library.h

Lines changed: 21 additions & 21 deletions
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, 1); \
5959
}
6060

6161
/* Clear out our "last error" */
@@ -69,12 +69,12 @@
6969

7070
/* Protected sending of data down the wire to a RedisSock->stream */
7171
#define CLUSTER_SEND_PAYLOAD(sock, buf, len) \
72-
(sock && sock->stream && !redis_check_eof(sock, 1 TSRMLS_CC) && \
72+
(sock && sock->stream && !redis_check_eof(sock, 1) && \
7373
php_stream_write(sock->stream, buf, len)==len)
7474

7575
/* Macro to read our reply type character */
7676
#define CLUSTER_VALIDATE_REPLY_TYPE(sock, type) \
77-
(redis_check_eof(sock, 1 TSRMLS_CC) == 0 && \
77+
(redis_check_eof(sock, 1) == 0 && \
7878
(php_stream_getc(sock->stream) == type))
7979

8080
/* Reset our last single line reply buffer and length */
@@ -148,10 +148,10 @@ typedef enum CLUSTER_REDIR_TYPE {
148148
} CLUSTER_REDIR_TYPE;
149149

150150
/* MULTI BULK response callback typedef */
151-
typedef int (*mbulk_cb)(RedisSock*,zval*,long long, void* TSRMLS_DC);
151+
typedef int (*mbulk_cb)(RedisSock*,zval*,long long, void*);
152152

153153
/* Specific destructor to free a cluster object */
154-
// void redis_destructor_redis_cluster(zend_rsrc_list_entry *rsrc TSRMLS_DC);
154+
// void redis_destructor_redis_cluster(zend_rsrc_list_entry *rsrc);
155155

156156
/* A Redis Cluster master node */
157157
typedef struct redisClusterNode {
@@ -317,9 +317,9 @@ typedef struct clusterReply {
317317
} clusterReply;
318318

319319
/* Direct variant response handler */
320-
clusterReply *cluster_read_resp(redisCluster *c TSRMLS_DC);
320+
clusterReply *cluster_read_resp(redisCluster *c);
321321
clusterReply *cluster_read_sock_resp(RedisSock *redis_sock,
322-
REDIS_REPLY_TYPE type, size_t reply_len TSRMLS_DC);
322+
REDIS_REPLY_TYPE type, size_t reply_len);
323323
void cluster_free_reply(clusterReply *reply, int free_data);
324324

325325
/* Cluster distribution helpers for WATCH */
@@ -328,7 +328,7 @@ void cluster_dist_free(HashTable *ht);
328328
int cluster_dist_add_key(redisCluster *c, HashTable *ht, char *key,
329329
int key_len, clusterKeyVal **kv);
330330
void cluster_dist_add_val(redisCluster *c, clusterKeyVal *kv, zval *val
331-
TSRMLS_DC);
331+
);
332332

333333
/* Aggregation for multi commands like MGET, MSET, and MSETNX */
334334
void cluster_multi_init(clusterMultiCmd *mc, char *kw, int kw_len);
@@ -344,26 +344,26 @@ unsigned short cluster_hash_key(const char *key, int len);
344344
long long mstime(void);
345345

346346
PHP_REDIS_API short cluster_send_command(redisCluster *c, short slot, const char *cmd,
347-
int cmd_len TSRMLS_DC);
347+
int cmd_len);
348348

349-
PHP_REDIS_API void cluster_disconnect(redisCluster *c TSRMLS_DC);
349+
PHP_REDIS_API void cluster_disconnect(redisCluster *c);
350350

351-
PHP_REDIS_API int cluster_send_exec(redisCluster *c, short slot TSRMLS_DC);
352-
PHP_REDIS_API int cluster_send_discard(redisCluster *c, short slot TSRMLS_DC);
353-
PHP_REDIS_API int cluster_abort_exec(redisCluster *c TSRMLS_DC);
351+
PHP_REDIS_API int cluster_send_exec(redisCluster *c, short slot);
352+
PHP_REDIS_API int cluster_send_discard(redisCluster *c, short slot);
353+
PHP_REDIS_API int cluster_abort_exec(redisCluster *c);
354354
PHP_REDIS_API int cluster_reset_multi(redisCluster *c);
355355

356356
PHP_REDIS_API short cluster_find_slot(redisCluster *c, const char *host,
357357
unsigned short port);
358358
PHP_REDIS_API int cluster_send_slot(redisCluster *c, short slot, char *cmd,
359-
int cmd_len, REDIS_REPLY_TYPE rtype TSRMLS_DC);
359+
int cmd_len, REDIS_REPLY_TYPE rtype);
360360

361361
PHP_REDIS_API int cluster_init_seeds(redisCluster *c, HashTable *ht_seeds);
362-
PHP_REDIS_API int cluster_map_keyspace(redisCluster *c TSRMLS_DC);
362+
PHP_REDIS_API int cluster_map_keyspace(redisCluster *c);
363363
PHP_REDIS_API void cluster_free_node(redisClusterNode *node);
364364

365365
PHP_REDIS_API char **cluster_sock_read_multibulk_reply(RedisSock *redis_sock,
366-
int *len TSRMLS_DC);
366+
int *len);
367367

368368
/*
369369
* Redis Cluster response handlers. Our response handlers generally take the
@@ -442,15 +442,15 @@ PHP_REDIS_API void cluster_client_list_resp(INTERNAL_FUNCTION_PARAMETERS,
442442

443443
/* MULTI BULK processing callbacks */
444444
int mbulk_resp_loop(RedisSock *redis_sock, zval *z_result,
445-
long long count, void *ctx TSRMLS_DC);
445+
long long count, void *ctx);
446446
int mbulk_resp_loop_raw(RedisSock *redis_sock, zval *z_result,
447-
long long count, void *ctx TSRMLS_DC);
447+
long long count, void *ctx);
448448
int mbulk_resp_loop_zipstr(RedisSock *redis_sock, zval *z_result,
449-
long long count, void *ctx TSRMLS_DC);
449+
long long count, void *ctx);
450450
int mbulk_resp_loop_zipdbl(RedisSock *redis_sock, zval *z_result,
451-
long long count, void *ctx TSRMLS_DC);
451+
long long count, void *ctx);
452452
int mbulk_resp_loop_assoc(RedisSock *redis_sock, zval *z_result,
453-
long long count, void *ctx TSRMLS_DC);
453+
long long count, void *ctx);
454454

455455
#endif
456456

‎common.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ typedef enum _PUBSUB_TYPE {
101101
#define IF_NOT_ATOMIC() if(redis_sock->mode != ATOMIC)
102102
#define IF_ATOMIC() if(redis_sock->mode == ATOMIC)
103103
#define ELSE_IF_MULTI() else if(redis_sock->mode == MULTI) { \
104-
if(redis_response_enqueued(redis_sock TSRMLS_CC) == 1) { \
104+
if(redis_response_enqueued(redis_sock) == 1) { \
105105
RETURN_ZVAL(getThis(), 1, 0);\
106106
} else { \
107107
RETURN_FALSE; \
@@ -139,7 +139,7 @@ typedef enum _PUBSUB_TYPE {
139139
}
140140

141141
#define SOCKET_WRITE_COMMAND(redis_sock, cmd, cmd_len) \
142-
if(redis_sock_write(redis_sock, cmd, cmd_len TSRMLS_CC) < 0) { \
142+
if(redis_sock_write(redis_sock, cmd, cmd_len) < 0) { \
143143
efree(cmd); \
144144
RETURN_FALSE; \
145145
}
@@ -161,7 +161,7 @@ typedef enum _PUBSUB_TYPE {
161161

162162
#define REDIS_ELSE_IF_MULTI(function, closure_context) \
163163
else if(redis_sock->mode == MULTI) { \
164-
if(redis_response_enqueued(redis_sock TSRMLS_CC) == 1) {\
164+
if(redis_response_enqueued(redis_sock) == 1) {\
165165
REDIS_SAVE_CALLBACK(function, closure_context); \
166166
RETURN_ZVAL(getThis(), 1, 0);\
167167
} else {\
@@ -200,7 +200,7 @@ typedef enum _PUBSUB_TYPE {
200200
* function is redis_<cmdname>_cmd */
201201
#define REDIS_PROCESS_CMD(cmdname, resp_func) \
202202
RedisSock *redis_sock; char *cmd; int cmd_len; void *ctx=NULL; \
203-
if(redis_sock_get(getThis(), &redis_sock TSRMLS_CC, 0)<0 || \
203+
if(redis_sock_get(getThis(), &redis_sock, 0)<0 || \
204204
redis_##cmdname##_cmd(INTERNAL_FUNCTION_PARAM_PASSTHRU,redis_sock, \
205205
&cmd, &cmd_len, NULL, &ctx)==FAILURE) { \
206206
RETURN_FALSE; \
@@ -215,7 +215,7 @@ typedef enum _PUBSUB_TYPE {
215215
* and keyword which is passed to us*/
216216
#define REDIS_PROCESS_KW_CMD(kw, cmdfunc, resp_func) \
217217
RedisSock *redis_sock; char *cmd; int cmd_len; void *ctx=NULL; \
218-
if(redis_sock_get(getThis(), &redis_sock TSRMLS_CC, 0)<0 || \
218+
if(redis_sock_get(getThis(), &redis_sock, 0)<0 || \
219219
cmdfunc(INTERNAL_FUNCTION_PARAM_PASSTHRU, redis_sock, kw, &cmd, \
220220
&cmd_len, NULL, &ctx)==FAILURE) { \
221221
RETURN_FALSE; \

0 commit comments

Comments
 (0)