Remove redis_get_exception_base

yatsukhnenko · yatsukhnenko · commit 7c140714e3d3 · 2017-08-01T18:07:33.000+03:00
diff --git a/library.c b/library.c
@@ -49,25 +49,6 @@
 extern zend_class_entry *redis_ce;
 extern zend_class_entry *redis_exception_ce;
 
-static zend_class_entry *runtime_exception_ce = NULL;
-
-PHP_REDIS_API zend_class_entry *
-redis_get_exception_base(TSRMLS_D)
-{
-    if (runtime_exception_ce == NULL) {
-#if HAVE_SPL
-        runtime_exception_ce = zend_hash_str_find_ptr(CG(class_table), "RuntimeException", sizeof("RuntimeException") - 1);
-#else
-    #if (PHP_MAJOR_VERSION == 5) && (PHP_MINOR_VERSION < 2)
-        runtime_exception_ce = zend_exception_get_default();
-    #else
-        runtime_exception_ce = zend_exception_get_default(TSRMLS_C);
-    #endif
-#endif
-    }
-    return runtime_exception_ce;
-}
-
 /* Helper to reselect the proper DB number when we reconnect */
 static int reselect_db(RedisSock *redis_sock TSRMLS_DC) {
     char *cmd, *response;
diff --git a/library.h b/library.h
@@ -88,5 +88,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);
 
-PHP_REDIS_API zend_class_entry *redis_get_exception_base(TSRMLS_D);
 #endif
diff --git a/redis.c b/redis.c
@@ -1121,6 +1121,8 @@ PHP_MINIT_FUNCTION(redis)
     zend_class_entry redis_exception_class_entry;
     zend_class_entry redis_cluster_exception_class_entry;
 
+    zend_class_entry *exception_ce = NULL;
+
     /* Seed random generator (for RedisCluster failover) */
     gettimeofday(&tv, NULL);
     srand(tv.tv_usec * tv.tv_sec);
@@ -1142,15 +1144,27 @@ PHP_MINIT_FUNCTION(redis)
     redis_cluster_ce = zend_register_internal_class(&redis_cluster_class_entry TSRMLS_CC);
     redis_cluster_ce->create_object = create_cluster_context;
 
+
+    /* Base Exception class */
+#if HAVE_SPL
+    exception_ce = zend_hash_str_find_ptr(CG(class_table), "RuntimeException", sizeof("RuntimeException") - 1);
+#endif
+    if (exception_ce == NULL) {
+#if (PHP_MAJOR_VERSION == 5) && (PHP_MINOR_VERSION < 2)
+        exception_ce = zend_exception_get_default();
+#else
+        exception_ce = zend_exception_get_default(TSRMLS_C);
+#endif
+    }
+
     /* RedisException class */
     INIT_CLASS_ENTRY(redis_exception_class_entry, "RedisException", NULL);
     redis_exception_ce = zend_register_internal_class_ex(
         &redis_exception_class_entry,
 #if (PHP_MAJOR_VERSION < 7)
-        redis_get_exception_base(TSRMLS_C),
-        NULL TSRMLS_CC
+        exception_ce, NULL TSRMLS_CC
 #else
-        redis_get_exception_base(TSRMLS_C)
+        exception_ce
 #endif
     );
 
@@ -1160,10 +1174,9 @@ PHP_MINIT_FUNCTION(redis)
     redis_cluster_exception_ce = zend_register_internal_class_ex(
         &redis_cluster_exception_class_entry,
 #if (PHP_MAJOR_VERSION < 7)
-        redis_get_exception_base(TSRMLS_C),
-        NULL TSRMLS_CC
+        exception_ce, NULL TSRMLS_CC
 #else
-        redis_get_exception_base(TSRMLS_C)
+        exception_ce
 #endif
     );
 

Original file line number	Diff line number	Diff line change
`@@ -88,5 +88,4 @@ PHP_REDIS_API int redis_read_variant_reply(INTERNAL_FUNCTION_PARAMETERS, RedisSo`
`88`	`88`
`89`	`89`	`PHP_REDIS_API void redis_client_list_reply(INTERNAL_FUNCTION_PARAMETERS, RedisSock redis_sock, zval z_tab);`
`90`	`90`
`91`		`-PHP_REDIS_API zend_class_entry *redis_get_exception_base(TSRMLS_D);`
`92`	`91`	`#endif`