Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpredis/phpredis.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormichael-grunder <michael-grunder@github.com>2012-05-29 23:29:17 +0400
committermichael-grunder <michael-grunder@github.com>2012-05-29 23:29:17 +0400
commit8b1a64b43c52e27de23b4077ec0ab3b246949ebc (patch)
tree73330a23e6192c90a0ef5ca472034cd33aa41bb3 /library.c
parentc4fb26e2ac54330a18c71792cf70b45861172131 (diff)
TSRMLS_CC
Diffstat (limited to 'library.c')
-rw-r--r--library.c30
1 files changed, 15 insertions, 15 deletions
diff --git a/library.c b/library.c
index 6a1a6725..6475610e 100644
--- a/library.c
+++ b/library.c
@@ -1374,7 +1374,7 @@ redis_key_prefix(RedisSock *redis_sock, char **key, int *key_len TSRMLS_DC) {
*/
PHPAPI int
-redis_sock_gets(RedisSock *redis_sock, char *buf, int buf_size, size_t *line_size) {
+redis_sock_gets(RedisSock *redis_sock, char *buf, int buf_size, size_t *line_size TSRMLS_DC) {
// Handle EOF
if(-1 == redis_check_eof(redis_sock TSRMLS_CC)) {
return -1;
@@ -1402,7 +1402,7 @@ redis_sock_gets(RedisSock *redis_sock, char *buf, int buf_size, size_t *line_siz
}
PHPAPI int
-redis_read_reply_type(RedisSock *redis_sock, REDIS_REPLY_TYPE *reply_type, int *reply_info) {
+redis_read_reply_type(RedisSock *redis_sock, REDIS_REPLY_TYPE *reply_type, int *reply_info TSRMLS_DC) {
// Make sure we haven't lost the connection, even trying to reconnect
if(-1 == redis_check_eof(redis_sock TSRMLS_CC)) {
// Failure
@@ -1436,13 +1436,13 @@ redis_read_reply_type(RedisSock *redis_sock, REDIS_REPLY_TYPE *reply_type, int *
* Read a single line response, having already consumed the reply-type byte
*/
PHPAPI int
-redis_read_variant_line(RedisSock *redis_sock, REDIS_REPLY_TYPE reply_type, zval **z_ret) {
+redis_read_variant_line(RedisSock *redis_sock, REDIS_REPLY_TYPE reply_type, zval **z_ret TSRMLS_DC) {
// Buffer to read our single line reply
char inbuf[1024];
size_t line_size;
// Attempt to read our single line reply
- if(redis_sock_gets(redis_sock, inbuf, sizeof(inbuf), &line_size) < 0) {
+ if(redis_sock_gets(redis_sock, inbuf, sizeof(inbuf), &line_size TSRMLS_CC) < 0) {
return -1;
}
@@ -1466,9 +1466,9 @@ redis_read_variant_line(RedisSock *redis_sock, REDIS_REPLY_TYPE reply_type, zval
}
PHPAPI int
-redis_read_variant_bulk(RedisSock *redis_sock, int size, zval **z_ret) {
+redis_read_variant_bulk(RedisSock *redis_sock, int size, zval **z_ret TSRMLS_DC) {
// Attempt to read the bulk reply
- char *bulk_resp = redis_sock_read_bulk_reply(redis_sock, size);
+ char *bulk_resp = redis_sock_read_bulk_reply(redis_sock, size TSRMLS_CC);
// Set our reply to FALSE on failure, and the string on success
if(bulk_resp == NULL) {
@@ -1481,7 +1481,7 @@ redis_read_variant_bulk(RedisSock *redis_sock, int size, zval **z_ret) {
}
PHPAPI int
-redis_read_multibulk_recursive(RedisSock *redis_sock, int elements, zval **z_ret) {
+redis_read_multibulk_recursive(RedisSock *redis_sock, int elements, zval **z_ret TSRMLS_DC) {
int reply_info;
REDIS_REPLY_TYPE reply_type;
zval *z_subelem;
@@ -1489,7 +1489,7 @@ redis_read_multibulk_recursive(RedisSock *redis_sock, int elements, zval **z_ret
// Iterate while we have elements
while(elements > 0) {
// Attempt to read our reply type
- if(redis_read_reply_type(redis_sock, &reply_type, &reply_info) < 0) {
+ if(redis_read_reply_type(redis_sock, &reply_type, &reply_info TSRMLS_CC) < 0) {
zend_throw_exception_ex(redis_exception_ce, 0 TSRMLS_CC, "protocol error, couldn't parse MULTI-BULK response\n", reply_type);
return -1;
}
@@ -1499,7 +1499,7 @@ redis_read_multibulk_recursive(RedisSock *redis_sock, int elements, zval **z_ret
case TYPE_ERR:
case TYPE_LINE:
ALLOC_INIT_ZVAL(z_subelem);
- redis_read_variant_line(redis_sock, reply_type, &z_subelem);
+ redis_read_variant_line(redis_sock, reply_type, &z_subelem TSRMLS_CC);
add_next_index_zval(*z_ret, z_subelem);
break;
case TYPE_INT:
@@ -1509,7 +1509,7 @@ redis_read_multibulk_recursive(RedisSock *redis_sock, int elements, zval **z_ret
case TYPE_BULK:
// Init a zval for our bulk response, read and add it
ALLOC_INIT_ZVAL(z_subelem);
- redis_read_variant_bulk(redis_sock, reply_info, &z_subelem);
+ redis_read_variant_bulk(redis_sock, reply_info, &z_subelem TSRMLS_CC);
add_next_index_zval(*z_ret, z_subelem);
break;
case TYPE_MULTIBULK:
@@ -1517,7 +1517,7 @@ redis_read_multibulk_recursive(RedisSock *redis_sock, int elements, zval **z_ret
ALLOC_INIT_ZVAL(z_subelem);
array_init(z_subelem);
add_next_index_zval(*z_ret, z_subelem);
- redis_read_multibulk_recursive(redis_sock, reply_info, &z_subelem);
+ redis_read_multibulk_recursive(redis_sock, reply_info, &z_subelem TSRMLS_CC);
break;
}
@@ -1537,7 +1537,7 @@ redis_read_variant_reply(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zv
zval *z_ret;
// Attempt to read our header
- if(redis_read_reply_type(redis_sock, &reply_type, &reply_info) < 0) {
+ if(redis_read_reply_type(redis_sock, &reply_type, &reply_info TSRMLS_CC) < 0) {
return -1;
}
@@ -1548,13 +1548,13 @@ redis_read_variant_reply(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zv
switch(reply_type) {
case TYPE_ERR:
case TYPE_LINE:
- redis_read_variant_line(redis_sock, reply_type, &z_ret);
+ redis_read_variant_line(redis_sock, reply_type, &z_ret TSRMLS_CC);
break;
case TYPE_INT:
ZVAL_LONG(z_ret, reply_info);
break;
case TYPE_BULK:
- redis_read_variant_bulk(redis_sock, reply_info, &z_ret);
+ redis_read_variant_bulk(redis_sock, reply_info, &z_ret TSRMLS_CC);
break;
case TYPE_MULTIBULK:
// Initialize an array for our multi-bulk response
@@ -1562,7 +1562,7 @@ redis_read_variant_reply(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zv
// If we've got more than zero elements, parse our multi bulk respoinse recursively
if(reply_info > -1) {
- redis_read_multibulk_recursive(redis_sock, reply_info, &z_ret);
+ redis_read_multibulk_recursive(redis_sock, reply_info, &z_ret TSRMLS_CC);
}
break;
default: