Bugfixes.

Author: nicolasff

library.c

@@ -1006,6 +1006,7 @@ redis_serialize(RedisSock *redis_sock, zval *z, char **val, int *val_len TSRMLS_
 			}
 			return 0;
 	}
+	return 0;
 }
 
 PHPAPI int
@@ -1044,5 +1045,6 @@ redis_unserialize(RedisSock *redis_sock, const char *val, int val_len, zval **re
 			return 0;
 			break;
 	}
+	return 0;
 }
 

library.h

@@ -33,4 +33,4 @@ PHPAPI int
 redis_serialize(RedisSock *redis_sock, zval *z, char **val, int *val_len TSRMLS_CC);
 
 PHPAPI int
-redis_unserialize(RedisSock *redis_sock, char *val, int val_len, zval **return_value TSRMLS_CC);
+redis_unserialize(RedisSock *redis_sock, const char *val, int val_len, zval **return_value TSRMLS_CC);

redis.c

@@ -3268,17 +3268,12 @@ PHP_METHOD(Redis, zRevRank) {
 PHPAPI void generic_incrby_method(INTERNAL_FUNCTION_PARAMETERS, char *keyword, int keyword_len) {
     zval *object;
     RedisSock *redis_sock;
-<<<<<<< HEAD
-    char *key = NULL, *cmd, *val, *response;
-    int key_len, val_len, cmd_len, response_len;
+
+    char *key = NULL, *cmd, *val;
+    int key_len, val_len, cmd_len;
     double add;
     int val_free;
     zval *z_value;
-=======
-    char *key = NULL, *cmd, *member;
-    int key_len, member_len, cmd_len;
-    double val;
->>>>>>> master
 
     if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Osdz",
                                      &object, redis_ce,