Changeset 671

Timestamp:

08/14/2009 04:02:53 AM (4 years ago)

Author:

moo

Message:

move and add back compatibile function to utils.c

Location:

trunk

Files:

• utils.c (modified) (1 diff)
• utils.h (modified) (1 diff)
• xcache.c (modified) (1 diff)
• xcache.h (modified) (1 diff)

trunk/utils.c

@@ -921 +921 @@
 }
 /* }}} */
+
+#ifndef ZEND_ENGINE_2_3
+size_t zend_dirname(char *path, size_t len) /* {{{ */
+{
+    php_dirname(path, len);
+    return strlen(path);
+}
+/* }}} */
+
+long zend_atol(const char *str, int str_len) /* {{{ */
+{
+    long retval;
+
+    if (!str_len) {
+        str_len = strlen(str);
+    }
+
+    retval = strtol(str, NULL, 0);
+    if (str_len > 0) {
+        switch (str[str_len - 1]) {
+        case 'g':
+        case 'G':
+            retval *= 1024;
+            /* break intentionally missing */
+        case 'm':
+        case 'M':
+            retval *= 1024;
+            /* break intentionally missing */
+        case 'k':
+        case 'K':
+            retval *= 1024;
+            break;
+        }
+    }
+
+    return retval;
+}
+/* }}} */
+
+#endif

trunk/utils.h

@@ -134 +134 @@
 #endif
 
+#ifndef ZEND_ENGINE_2_3
+size_t zend_dirname(char *path, size_t len);
+long zend_atol(const char *str, int len);
+#endif
+
 typedef struct {
     zend_uint size;

trunk/xcache.c

@@ -37 +37 @@
 #include "opcode_spec.h"
 #include "utils.h"
-
-#ifndef ZEND_ENGINE_2_3
-ZEND_DLEXPORT size_t zend_dirname(char *path, size_t len)
-{
-    php_dirname(path, len);
-    return strlen(path);
-}
-#endif
 
 #define VAR_ENTRY_EXPIRED(pentry) ((pentry)->ttl && XG(request_time) > pentry->ctime + (pentry)->ttl)

trunk/xcache.h

@@ -62 +62 @@
 #ifndef IS_CONSTANT_TYPE_MASK
 #   define IS_CONSTANT_TYPE_MASK (~IS_CONSTANT_INDEX)
-#endif
-
-#ifndef ZEND_ENGINE_2_3
-#define zend_dirname(path, len) xc_dirname(path, len)
 #endif