diff options
| -rw-r--r-- | Zend/zend_string.c | 8 | ||||
| -rw-r--r-- | Zend/zend_string.h | 3 |
2 files changed, 1 insertions, 10 deletions
diff --git a/Zend/zend_string.c b/Zend/zend_string.c index 77b165ab20..949c191582 100644 --- a/Zend/zend_string.c +++ b/Zend/zend_string.c @@ -30,12 +30,10 @@ #endif ZEND_API const char *(*zend_new_interned_string)(const char *str, int len, int free_src TSRMLS_DC); -ZEND_API zend_bool (*zend_is_interned_string)(const char *str TSRMLS_DC); ZEND_API void (*zend_interned_strings_snapshot)(TSRMLS_D); ZEND_API void (*zend_interned_strings_restore)(TSRMLS_D); static const char *zend_new_interned_string_int(const char *str, int len, int free_src TSRMLS_DC); -static zend_bool zend_is_interned_string_int(const char *str TSRMLS_DC); static void zend_interned_strings_snapshot_int(TSRMLS_D); static void zend_interned_strings_restore_int(TSRMLS_D); @@ -66,7 +64,6 @@ void zend_interned_strings_init(TSRMLS_D) #endif zend_new_interned_string = zend_new_interned_string_int; - zend_is_interned_string = zend_is_interned_string_int; zend_interned_strings_snapshot = zend_interned_strings_snapshot_int; zend_interned_strings_restore = zend_interned_strings_restore_int; } @@ -180,11 +177,6 @@ static const char *zend_new_interned_string_int(const char *arKey, int nKeyLengt #endif } -static zend_bool zend_is_interned_string_int(const char *s TSRMLS_DC) -{ - return (((s) >= CG(interned_strings_start)) && ((s) < CG(interned_strings_end))); -} - static void zend_interned_strings_snapshot_int(TSRMLS_D) { CG(interned_strings_snapshot_top) = CG(interned_strings_top); diff --git a/Zend/zend_string.h b/Zend/zend_string.h index 5dcc950faf..a130fbcc38 100644 --- a/Zend/zend_string.h +++ b/Zend/zend_string.h @@ -24,7 +24,6 @@ #include "zend.h" ZEND_API extern const char *(*zend_new_interned_string)(const char *str, int len, int free_src TSRMLS_DC); -ZEND_API extern zend_bool (*zend_is_interned_string)(const char *str TSRMLS_DC); ZEND_API extern void (*zend_interned_strings_snapshot)(TSRMLS_D); ZEND_API extern void (*zend_interned_strings_restore)(TSRMLS_D); @@ -34,7 +33,7 @@ void zend_interned_strings_dtor(TSRMLS_D); #ifndef ZTS #define IS_INTERNED(s) \ - (zend_is_interned_string ? zend_is_interned_string((s) TSRMLS_CC) : 0) + (((s) >= CG(interned_strings_start)) && ((s) < CG(interned_strings_end))) #else |