Changed php_error to php_error_docref.

Thanks to Marcus Börger for writing a script that significantly simplifies
this process.

1 files changed, 10 insertions, 10 deletions

diff --git a/ext/cyrus/cyrus.c b/ext/cyrus/cyrus.c
index 5e659f4998..dfea22ee70 100644
--- a/ext/cyrus/cyrus.c
+++ b/ext/cyrus/cyrus.c
@@ -108,7 +108,9 @@ PHP_MINFO_FUNCTION(cyrus)
 
 extern void fatal(char *s, int exit)
 {
-	php_error(E_ERROR, s);
+	TSRMLS_FETCH();
+
+	php_error_docref(NULL TSRMLS_CC, E_ERROR, s);
 }
 
 /* {{{ proto resource cyrus_connect([ string host [, string port [, int flags]]])
@@ -167,11 +169,11 @@ PHP_FUNCTION(cyrus_connect)
 		break;
 
 	case -1:
-		php_error(E_WARNING, "%s(): Invalid hostname: %s", get_active_function_name(TSRMLS_C), host);
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid hostname: %s", host);
 		RETURN_FALSE;
 	
 	case -2:
-		php_error(E_WARNING, "%s(): Invalid port: %d", get_active_function_name(TSRMLS_C), port);
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid port: %d", port);
 		RETURN_FALSE;
 	}
 
@@ -285,7 +287,7 @@ PHP_FUNCTION(cyrus_authenticate)
 			if (! user) {
 				struct passwd *pwd = getpwuid(getuid());
 				if (! pwd) {
-				php_error(E_WARNING, "%s(): Couldn't determine user id", get_active_function_name(TSRMLS_C));
+				php_error_docref(NULL TSRMLS_CC, E_WARNING, "Couldn't determine user id");
 				RETURN_FALSE;
 				}
 			
@@ -358,8 +360,7 @@ static void cyrus_generic_callback(struct imclient *client,
 
 		if (call_user_function_ex(EG(function_table), NULL, callback->function, 
                                   &retval, 4, argv, 0, NULL TSRMLS_CC) == FAILURE) {
-			php_error(E_WARNING, "%s(): Couldn't call the %s handler",
-			          get_active_function_name(TSRMLS_C), callback->trigger);
+			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Couldn't call the %s handler", callback->trigger);
 		}
 
 		zval_ptr_dtor(argv[0]);
@@ -397,8 +398,7 @@ PHP_FUNCTION(cyrus_bind)
 
 	hash = HASH_OF(*z_callback);
 	if (! hash) {
-		php_error(E_WARNING, 
-		          "%s(): Second argument must be an array or object", get_active_function_name(TSRMLS_C));
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Second argument must be an array or object");
 		RETURN_FALSE;
 	}
 
@@ -425,12 +425,12 @@ PHP_FUNCTION(cyrus_bind)
 	}
 
 	if (! callback.trigger) {
-		php_error(E_WARNING, "%s(): You must specify a trigger in your callback", get_active_function_name(TSRMLS_C));
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "You must specify a trigger in your callback");
 		RETURN_FALSE;
 	}
 
 	if (! callback.function) {
-		php_error(E_WARNING, "%s(): You must specify a function in your callback", get_active_function_name(TSRMLS_C));
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "You must specify a function in your callback");
 		RETURN_FALSE;
 	}