Merge pull request #1158 from yatsukhnenko/develop

yatsukhnenko · web-flow · commit b08722338c80 · 2017-04-21T21:35:03.000+03:00
Remove REDIS_DOUBLE_TO_STRING macros
diff --git a/library.c b/library.c
@@ -586,7 +586,6 @@ redis_cmd_format_static(char **ret, char *keyword, char *format, ...)
     va_list ap;
     smart_string buf = {0};
     int l = strlen(keyword);
-    zend_string *dbl_str;
 
     va_start(ap, format);
 
@@ -615,11 +614,11 @@ redis_cmd_format_static(char **ret, char *keyword, char *format, ...)
             case 'f':
             case 'F': {
                 double d = va_arg(ap, double);
-                REDIS_DOUBLE_TO_STRING(dbl_str, d);
-                smart_string_append_long(&buf, dbl_str->len);
+                char tmp[64];
+                int len = snprintf(tmp, sizeof(tmp), "%.16g", d);
+                smart_string_append_long(&buf, len);
                 smart_string_appendl(&buf, _NL, sizeof(_NL) - 1);
-                smart_string_appendl(&buf, dbl_str->val, dbl_str->len);
-                zend_string_release(dbl_str);
+                smart_string_appendl(&buf, tmp, len);
             }
                 break;
 
@@ -666,7 +665,6 @@ redis_cmd_format(char **ret, char *format, ...) {
     smart_string buf = {0};
     va_list ap;
     char *p = format;
-    zend_string *dbl_str;
 
     va_start(ap, format);
 
@@ -683,11 +681,11 @@ redis_cmd_format(char **ret, char *format, ...) {
                 case 'F':
                 case 'f': {
                     double d = va_arg(ap, double);
-                    REDIS_DOUBLE_TO_STRING(dbl_str, d);
-                    smart_string_append_long(&buf, dbl_str->len);
+                    char tmp[64];
+                    int len = snprintf(tmp, sizeof(tmp), "%.16g", d);
+                    smart_string_append_long(&buf, len);
                     smart_string_appendl(&buf, _NL, sizeof(_NL) - 1);
-                    smart_string_appendl(&buf, dbl_str->val, dbl_str->len);
-                    zend_string_release(dbl_str);
+                    smart_string_appendl(&buf, tmp, len);
                 }
                     break;
 
@@ -792,18 +790,17 @@ int redis_cmd_append_sstr_long(smart_string *str, long append) {
 /*
  * Append a double to a smart string command
  */
-int redis_cmd_append_sstr_dbl(smart_string *str, double value) {
-    zend_string *dbl_str;
-    int retval;
+int
+redis_cmd_append_sstr_dbl(smart_string *str, double value)
+{
+    char tmp[64];
+    int len, retval;
 
-    /* Convert to double */
-    REDIS_DOUBLE_TO_STRING(dbl_str, value);
+    /* Convert to string */
+    len = snprintf(tmp, sizeof(tmp), "%.16g", value);
 
     // Append the string
-    retval = redis_cmd_append_sstr(str, dbl_str->val, dbl_str->len);
-
-    /* Free our double string */
-    zend_string_release(dbl_str);
+    retval = redis_cmd_append_sstr(str, tmp, len);
 
     /* Return new length */
     return retval;
diff --git a/library.h b/library.h
@@ -84,28 +84,4 @@ PHP_REDIS_API int redis_read_variant_reply(INTERNAL_FUNCTION_PARAMETERS, RedisSo
 
 PHP_REDIS_API void redis_client_list_reply(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zval *z_tab);
 
-#if (PHP_MAJOR_VERSION < 7)
-#if ZEND_MODULE_API_NO >= 20100000
-#define REDIS_DOUBLE_TO_STRING(dbl_str, dbl) do { \
-    char dbl_decsep = '.'; \
-    dbl_str = emalloc(sizeof(zend_string)); \
-    dbl_str->val = _php_math_number_format_ex(dbl, 16, &dbl_decsep, 1, NULL, 0); \
-    dbl_str->len = strlen(dbl_str->val); \
-    dbl_str->gc = 0x11; \
-} while (0);
-#else
-#define REDIS_DOUBLE_TO_STRING(dbl_str, dbl) do { \
-    dbl_str = emalloc(sizeof(zend_string)); \
-    dbl_str->val = _php_math_number_format(dbl, 16, '.', '\x00'); \
-    dbl_str->len = strlen(dbl_str->val); \
-    dbl_str->gc = 0x11; \
-} while (0)
-#endif
-#else
-#define REDIS_DOUBLE_TO_STRING(dbl_str, dbl) do { \
-    char dbl_decsep = '.'; \
-    dbl_str = _php_math_number_format_ex(dbl, 16, &dbl_decsep, 1, NULL, 0); \
-} while (0);
-#endif
-
 #endif
