Fix for linker error

michael-grunder · michael-grunder · commit d5b7f8521bb3 · 2016-08-18T18:14:27.000-07:00
Reorder inclusion of common.h in redis_session.c. Fix a couple of unused variable warnings Potential fix for phpredis#929
diff --git a/library.c b/library.c
@@ -462,7 +462,6 @@ PHP_REDIS_API char *redis_sock_read_bulk_reply(RedisSock *redis_sock, int bytes
 PHP_REDIS_API char *redis_sock_read(RedisSock *redis_sock, int *buf_len TSRMLS_DC)
 {
     char inbuf[1024];
-    char *resp = NULL;
     size_t err_len;
 
     if(-1 == redis_check_eof(redis_sock, 0 TSRMLS_CC)) {
diff --git a/redis_cluster.c b/redis_cluster.c
@@ -37,7 +37,6 @@ zend_class_entry *redis_cluster_ce;
 
 /* Exception handler */
 zend_class_entry *redis_cluster_exception_ce;
-static zend_class_entry *spl_rte_ce = NULL;
 
 /* Handlers for RedisCluster */
 zend_object_handlers RedisCluster_handlers;
diff --git a/redis_session.c b/redis_session.c
@@ -20,12 +20,13 @@
   +----------------------------------------------------------------------+
 */
 
+#include "common.h"
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #ifdef PHP_SESSION
-#include "common.h"
 #include "ext/standard/info.h"
 #include "php_redis.h"
 #include "redis_session.h"

Original file line number	Diff line number	Diff line change
`@@ -462,7 +462,6 @@ PHP_REDIS_API char redis_sock_read_bulk_reply(RedisSock redis_sock, int bytes`
`462`	`462`	`PHP_REDIS_API char redis_sock_read(RedisSock redis_sock, int *buf_len TSRMLS_DC)`
`463`	`463`	`{`
`464`	`464`	`char inbuf[1024];`
`465`		`- char *resp = NULL;`
`466`	`465`	`size_t err_len;`
`467`	`466`
`468`	`467`	`if(-1 == redis_check_eof(redis_sock, 0 TSRMLS_CC)) {`