Properly fix TRMLS_CC references :)

michael-grunder · michael-grunder · commit 8f006cba2d20 · 2014-02-26T06:59:11.000-08:00
diff --git a/library.c b/library.c
@@ -103,7 +103,7 @@ PHPAPI int redis_check_eof(RedisSock *redis_sock TSRMLS_DC)
 
 PHPAPI int 
 redis_sock_read_scan_reply(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
-                           REDIS_SCAN_TYPE type, long *iter TSRMLS_DC)
+                           REDIS_SCAN_TYPE type, long *iter)
 {
     REDIS_REPLY_TYPE reply_type;
     int reply_info;
diff --git a/library.h b/library.h
@@ -35,7 +35,7 @@ PHPAPI int redis_sock_read_multibulk_reply_loop(INTERNAL_FUNCTION_PARAMETERS, Re
 PHPAPI int redis_sock_read_multibulk_reply_zipped(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval *z_tab, void *ctx);
 PHPAPI int redis_sock_read_multibulk_reply_zipped_strings(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval *z_tab, void *ctx);
 PHPAPI int redis_sock_read_multibulk_reply_assoc(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval *z_tab, void *ctx);
-PHPAPI int redis_sock_read_scan_reply(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, REDIS_SCAN_TYPE type, long *iter TSRMLS_DC);
+PHPAPI int redis_sock_read_scan_reply(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, REDIS_SCAN_TYPE type, long *iter);
 
 PHPAPI int redis_sock_write(RedisSock *redis_sock, char *cmd, size_t sz TSRMLS_DC);
 PHPAPI void redis_stream_close(RedisSock *redis_sock TSRMLS_DC);
diff --git a/redis.c b/redis.c
@@ -6885,7 +6885,7 @@ generic_scan_cmd(INTERNAL_FUNCTION_PARAMETERS, REDIS_SCAN_TYPE type) {
 
     // Prefix our key if we've got one and we have a prefix set
     if(key_len) {
-        key_free = redis_key_prefix(redis_sock, &key, &key_len);
+        key_free = redis_key_prefix(redis_sock, &key, &key_len TSRMLS_CC);
     }
 
     /**
@@ -6903,7 +6903,7 @@ generic_scan_cmd(INTERNAL_FUNCTION_PARAMETERS, REDIS_SCAN_TYPE type) {
         // Execute our command getting our new iterator value
         REDIS_PROCESS_REQUEST(redis_sock, cmd, cmd_len);
         if(redis_sock_read_scan_reply(INTERNAL_FUNCTION_PARAM_PASSTHRU,
-                                      redis_sock,type,&iter TSRMLS_CC)<0)
+                                      redis_sock,type,&iter)<0)
         {
             if(key_free) efree(key);
             RETURN_FALSE;

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ PHPAPI int redis_check_eof(RedisSock *redis_sock TSRMLS_DC)`
`103`	`103`
`104`	`104`	`PHPAPI int`
`105`	`105`	`redis_sock_read_scan_reply(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,`
`106`		`- REDIS_SCAN_TYPE type, long *iter TSRMLS_DC)`
	`106`	`+ REDIS_SCAN_TYPE type, long *iter)`
`107`	`107`	`{`
`108`	`108`	`REDIS_REPLY_TYPE reply_type;`
`109`	`109`	`int reply_info;`