Skip to content

Commit 8b1a64b

Browse files
michael-grundermichael-grunder
committed
TSRMLS_CC
1 parent c4fb26e commit 8b1a64b

File tree

3 files changed

+20
-21
lines changed

3 files changed

+20
-21
lines changed

‎library.c

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1374,7 +1374,7 @@ redis_key_prefix(RedisSock *redis_sock, char **key, int *key_len TSRMLS_DC) {
13741374
*/
13751375

13761376
PHPAPI int
1377-
redis_sock_gets(RedisSock *redis_sock, char *buf, int buf_size, size_t *line_size) {
1377+
redis_sock_gets(RedisSock *redis_sock, char *buf, int buf_size, size_t *line_size TSRMLS_DC) {
13781378
// Handle EOF
13791379
if(-1 == redis_check_eof(redis_sock TSRMLS_CC)) {
13801380
return -1;
@@ -1402,7 +1402,7 @@ redis_sock_gets(RedisSock *redis_sock, char *buf, int buf_size, size_t *line_siz
14021402
}
14031403

14041404
PHPAPI int
1405-
redis_read_reply_type(RedisSock *redis_sock, REDIS_REPLY_TYPE *reply_type, int *reply_info) {
1405+
redis_read_reply_type(RedisSock *redis_sock, REDIS_REPLY_TYPE *reply_type, int *reply_info TSRMLS_DC) {
14061406
// Make sure we haven't lost the connection, even trying to reconnect
14071407
if(-1 == redis_check_eof(redis_sock TSRMLS_CC)) {
14081408
// Failure
@@ -1436,13 +1436,13 @@ redis_read_reply_type(RedisSock *redis_sock, REDIS_REPLY_TYPE *reply_type, int *
14361436
* Read a single line response, having already consumed the reply-type byte
14371437
*/
14381438
PHPAPI int
1439-
redis_read_variant_line(RedisSock *redis_sock, REDIS_REPLY_TYPE reply_type, zval **z_ret) {
1439+
redis_read_variant_line(RedisSock *redis_sock, REDIS_REPLY_TYPE reply_type, zval **z_ret TSRMLS_DC) {
14401440
// Buffer to read our single line reply
14411441
char inbuf[1024];
14421442
size_t line_size;
14431443

14441444
// Attempt to read our single line reply
1445-
if(redis_sock_gets(redis_sock, inbuf, sizeof(inbuf), &line_size) < 0) {
1445+
if(redis_sock_gets(redis_sock, inbuf, sizeof(inbuf), &line_size TSRMLS_CC) < 0) {
14461446
return -1;
14471447
}
14481448

@@ -1466,9 +1466,9 @@ redis_read_variant_line(RedisSock *redis_sock, REDIS_REPLY_TYPE reply_type, zval
14661466
}
14671467

14681468
PHPAPI int
1469-
redis_read_variant_bulk(RedisSock *redis_sock, int size, zval **z_ret) {
1469+
redis_read_variant_bulk(RedisSock *redis_sock, int size, zval **z_ret TSRMLS_DC) {
14701470
// Attempt to read the bulk reply
1471-
char *bulk_resp = redis_sock_read_bulk_reply(redis_sock, size);
1471+
char *bulk_resp = redis_sock_read_bulk_reply(redis_sock, size TSRMLS_CC);
14721472

14731473
// Set our reply to FALSE on failure, and the string on success
14741474
if(bulk_resp == NULL) {
@@ -1481,15 +1481,15 @@ redis_read_variant_bulk(RedisSock *redis_sock, int size, zval **z_ret) {
14811481
}
14821482

14831483
PHPAPI int
1484-
redis_read_multibulk_recursive(RedisSock *redis_sock, int elements, zval **z_ret) {
1484+
redis_read_multibulk_recursive(RedisSock *redis_sock, int elements, zval **z_ret TSRMLS_DC) {
14851485
int reply_info;
14861486
REDIS_REPLY_TYPE reply_type;
14871487
zval *z_subelem;
14881488

14891489
// Iterate while we have elements
14901490
while(elements > 0) {
14911491
// Attempt to read our reply type
1492-
if(redis_read_reply_type(redis_sock, &reply_type, &reply_info) < 0) {
1492+
if(redis_read_reply_type(redis_sock, &reply_type, &reply_info TSRMLS_CC) < 0) {
14931493
zend_throw_exception_ex(redis_exception_ce, 0 TSRMLS_CC, "protocol error, couldn't parse MULTI-BULK response\n", reply_type);
14941494
return -1;
14951495
}
@@ -1499,7 +1499,7 @@ redis_read_multibulk_recursive(RedisSock *redis_sock, int elements, zval **z_ret
14991499
case TYPE_ERR:
15001500
case TYPE_LINE:
15011501
ALLOC_INIT_ZVAL(z_subelem);
1502-
redis_read_variant_line(redis_sock, reply_type, &z_subelem);
1502+
redis_read_variant_line(redis_sock, reply_type, &z_subelem TSRMLS_CC);
15031503
add_next_index_zval(*z_ret, z_subelem);
15041504
break;
15051505
case TYPE_INT:
@@ -1509,15 +1509,15 @@ redis_read_multibulk_recursive(RedisSock *redis_sock, int elements, zval **z_ret
15091509
case TYPE_BULK:
15101510
// Init a zval for our bulk response, read and add it
15111511
ALLOC_INIT_ZVAL(z_subelem);
1512-
redis_read_variant_bulk(redis_sock, reply_info, &z_subelem);
1512+
redis_read_variant_bulk(redis_sock, reply_info, &z_subelem TSRMLS_CC);
15131513
add_next_index_zval(*z_ret, z_subelem);
15141514
break;
15151515
case TYPE_MULTIBULK:
15161516
// Construct an array for our sub element, and add it, and recurse
15171517
ALLOC_INIT_ZVAL(z_subelem);
15181518
array_init(z_subelem);
15191519
add_next_index_zval(*z_ret, z_subelem);
1520-
redis_read_multibulk_recursive(redis_sock, reply_info, &z_subelem);
1520+
redis_read_multibulk_recursive(redis_sock, reply_info, &z_subelem TSRMLS_CC);
15211521
break;
15221522
}
15231523

@@ -1537,7 +1537,7 @@ redis_read_variant_reply(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zv
15371537
zval *z_ret;
15381538

15391539
// Attempt to read our header
1540-
if(redis_read_reply_type(redis_sock, &reply_type, &reply_info) < 0) {
1540+
if(redis_read_reply_type(redis_sock, &reply_type, &reply_info TSRMLS_CC) < 0) {
15411541
return -1;
15421542
}
15431543

@@ -1548,21 +1548,21 @@ redis_read_variant_reply(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zv
15481548
switch(reply_type) {
15491549
case TYPE_ERR:
15501550
case TYPE_LINE:
1551-
redis_read_variant_line(redis_sock, reply_type, &z_ret);
1551+
redis_read_variant_line(redis_sock, reply_type, &z_ret TSRMLS_CC);
15521552
break;
15531553
case TYPE_INT:
15541554
ZVAL_LONG(z_ret, reply_info);
15551555
break;
15561556
case TYPE_BULK:
1557-
redis_read_variant_bulk(redis_sock, reply_info, &z_ret);
1557+
redis_read_variant_bulk(redis_sock, reply_info, &z_ret TSRMLS_CC);
15581558
break;
15591559
case TYPE_MULTIBULK:
15601560
// Initialize an array for our multi-bulk response
15611561
array_init(z_ret);
15621562

15631563
// If we've got more than zero elements, parse our multi bulk respoinse recursively
15641564
if(reply_info > -1) {
1565-
redis_read_multibulk_recursive(redis_sock, reply_info, &z_ret);
1565+
redis_read_multibulk_recursive(redis_sock, reply_info, &z_ret TSRMLS_CC);
15661566
}
15671567
break;
15681568
default:

‎library.h

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,8 @@ redis_unserialize(RedisSock *redis_sock, const char *val, int val_len, zval **re
5151
* Variant Read methods, mostly to implement eval
5252
*/
5353

54-
PHPAPI int redis_read_reply_type(RedisSock *redis_sock, REDIS_REPLY_TYPE *reply_type, int *reply_info);
55-
PHPAPI int redis_read_reply_type(RedisSock *redis_sock, REDIS_REPLY_TYPE *reply_type, int *reply_info);
56-
PHPAPI int redis_read_variant_line(RedisSock *redis_sock, REDIS_REPLY_TYPE reply_type, zval **z_ret);
57-
PHPAPI int redis_read_variant_bulk(RedisSock *redis_sock, int size, zval **z_ret);
58-
PHPAPI int redis_read_multibulk_recursive(RedisSock *redis_sock, int elements, zval **z_ret);
54+
PHPAPI int redis_read_reply_type(RedisSock *redis_sock, REDIS_REPLY_TYPE *reply_type, int *reply_info TSRMLS_DC);
55+
PHPAPI int redis_read_variant_line(RedisSock *redis_sock, REDIS_REPLY_TYPE reply_type, zval **z_ret TSRMLS_DC);
56+
PHPAPI int redis_read_variant_bulk(RedisSock *redis_sock, int size, zval **z_ret TSRMLS_DC);
57+
PHPAPI int redis_read_multibulk_recursive(RedisSock *redis_sock, int elements, zval **z_ret TSRMLS_DC);
5958
PHPAPI int redis_read_variant_reply(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval *z_tab);

‎redis.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6039,7 +6039,7 @@ PHP_METHOD(Redis, migrate) {
60396039
int cmd_len, host_len, key_len, port, dest_db, timeout, key_free;
60406040

60416041
// Parse arguments
6042-
if(zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_C, getThis(), "Oslsll", &object, redis_ce,
6042+
if(zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oslsll", &object, redis_ce,
60436043
&host, &host_len, &port, &key, &key_len, &dest_db, &timeout) == FAILURE) {
60446044
RETURN_FALSE;
60456045
}

0 commit comments

Comments
 (0)