Improve error messages

diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c
index 0ec4e0daf4114ae71a71889854ae5b0f9fb65afb..dd1f2c08bb27112c1d2ce3b714f8e68f01c6fc12 100644 (file)
--- a/Zend/zend_exceptions.c
+++ b/Zend/zend_exceptions.c
@@ -343,7 +343,7 @@ ZEND_METHOD(exception, getTraceAsString)
 }
 /* }}} */
 
-int zend_spprintf(char **message, int max_len, char *format, ...)
+static int zend_spprintf(char **message, int max_len, char *format, ...)
 {
        va_list arg;
        int len;
@@ -471,7 +471,7 @@ ZEND_API void zend_throw_exception_ex(zend_class_entry *exception_ce, long code
        MAKE_STD_ZVAL(ex);
        if (exception_ce) {
                if (!instanceof_function(exception_ce, default_exception_ce TSRMLS_CC)) {
-                       zend_error(E_NOTICE, "Exceptions must be derived from exception");
+                       zend_error(E_NOTICE, "Exceptions must be derived from the Exception base class");
                        exception_ce = default_exception_ce;
                }
        } else {
@@ -563,7 +563,7 @@ ZEND_API void zend_throw_exception_object(zval *exception TSRMLS_DC)
        exception_ce = Z_OBJCE_P(exception);
 
        if (!exception_ce || !instanceof_function(exception_ce, default_exception_ce TSRMLS_CC)) {
-               zend_error(E_ERROR, "Exceptions must be valid objects that are derived from class Exception");
+               zend_error(E_ERROR, "Exceptions must be valid objects derived from the Exception base class");
        }
        zend_throw_exception_internal(exception TSRMLS_CC);
 }