Updated redis_cmd_format_static to specifically take a long, and changed PEXIPREAT to use a long rather than an int

michael-grunder · michael-grunder · commit d66c893e01f5 · 2012-05-05T13:45:50.000-07:00
diff --git a/library.c b/library.c
@@ -278,6 +278,16 @@ redis_cmd_format_static(char **ret, char *keyword, char *format, ...) {
 				smart_str_appendl(&buf, tmp, tmp_len);
 			}
 				break;
+			case 'l':
+			case 'L': {
+				long l = va_arg(ap, long);
+				char tmp[32];
+				int tmp_len = snprintf(tmp, sizeof(tmp), "%ld", l);
+				smart_str_append_long(&buf, tmp_len);
+				smart_str_appendl(&buf, _NL, sizeof(_NL) -1);
+				smart_str_appendl(&buf, tmp, tmp_len);
+			}
+				break;
 		}
 		p++;
 		smart_str_appendl(&buf, _NL, sizeof(_NL) - 1);
diff --git a/redis.c b/redis.c
@@ -177,6 +177,7 @@ static zend_function_entry redis_functions[] = {
      PHP_ME(Redis, zUnion, NULL, ZEND_ACC_PUBLIC)
      PHP_ME(Redis, zIncrBy, NULL, ZEND_ACC_PUBLIC)
      PHP_ME(Redis, expireAt, NULL, ZEND_ACC_PUBLIC)
+     PHP_ME(Redis, pexpire, NULL, ZEND_ACC_PUBLIC)
      PHP_ME(Redis, pexpireAt, NULL, ZEND_ACC_PUBLIC)
 
      /* 1.2 */
@@ -2892,7 +2893,7 @@ PHPAPI void generic_expire_cmd(INTERNAL_FUNCTION_PARAMETERS, char *keyword, int
     }
 
 	key_free = redis_key_prefix(redis_sock, &key, &key_len TSRMLS_CC);
-    cmd_len = redis_cmd_format_static(&cmd, keyword, "sd", key, key_len, t);
+    cmd_len = redis_cmd_format_static(&cmd, keyword, "sl", key, key_len, t);
 	if(key_free) efree(key);
 
 	REDIS_PROCESS_REQUEST(redis_sock, cmd, cmd_len);
