Unify error messages

1 files changed, 39 insertions, 39 deletions

diff --git a/ext/fbsql/php_fbsql.c b/ext/fbsql/php_fbsql.c
index d9e15c5e8f..24d633dbdc 100644
--- a/ext/fbsql/php_fbsql.c
+++ b/ext/fbsql/php_fbsql.c
@@ -262,7 +262,7 @@ ZEND_GET_MODULE(fbsql)
 #define CHECK_LINK(link) { \
 	if (link==-1) { \
 		if (FB_SQL_G(generateWarnings)) \
-			php_error(E_WARNING, "FrontBase:  A link to the server could not be established"); \
+			php_error(E_WARNING, "%s(): A link to the server could not be established", get_active_function_name(TSRMLS_C)); \
 		RETURN_FALSE; \
 	} \
 }
@@ -526,14 +526,14 @@ static void php_fbsql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent)
 			if ((FB_SQL_G(maxLinks) != -1 && FB_SQL_G(linkCount) == FB_SQL_G(maxLinks)))
 			{
 				if (FB_SQL_G(generateWarnings))
-					php_error(E_WARNING, "FrontBase link limit %d exceeded ", FB_SQL_G(maxLinks));
+					php_error(E_WARNING, "%s(): FrontBase link limit %d exceeded ", get_active_function_name(TSRMLS_C), FB_SQL_G(maxLinks));
 				RETURN_FALSE;
 			}
 
 			if ((FB_SQL_G(maxPersistent) != -1 && FB_SQL_G(persistentCount) == FB_SQL_G(maxPersistent)))
 			{
 				if (FB_SQL_G(generateWarnings))
-					php_error(E_WARNING, "FrontBase persistent link limit %d exceeded ", FB_SQL_G(maxPersistent));
+					php_error(E_WARNING, "%s(): FrontBase persistent link limit %d exceeded ", get_active_function_name(TSRMLS_C), FB_SQL_G(maxPersistent));
 				RETURN_FALSE;
 			}
 
@@ -575,7 +575,7 @@ static void php_fbsql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent)
 		if ((FB_SQL_G(maxLinks) != -1 && FB_SQL_G(linkCount) == FB_SQL_G(maxLinks)))
 		{
 			if (FB_SQL_G(generateWarnings))
-				php_error(E_WARNING, "FrontBase link limit %d exceeded ", FB_SQL_G(maxLinks));
+				php_error(E_WARNING, "%s(): FrontBase link limit %d exceeded ", get_active_function_name(TSRMLS_C), FB_SQL_G(maxLinks));
 			RETURN_FALSE;
 		}
 
@@ -722,7 +722,7 @@ static int php_fbsql_select_db(char *databaseName, PHPFBLink *link TSRMLS_DC)
 		if (c == NULL)
 		{
 			if (FB_SQL_G(generateWarnings))
-				php_error(E_WARNING, fbcdcClassErrorMessage());
+				php_error(E_WARNING, "%s(): %s", get_active_function_name(TSRMLS_C), fbcdcClassErrorMessage());
 			return 0;
 		}
 		md = fbcdcCreateSession(c, "PHP", link->userName, link->userPassword, link->userName);
@@ -733,9 +733,9 @@ static int php_fbsql_select_db(char *databaseName, PHPFBLink *link TSRMLS_DC)
 			if (FB_SQL_G(generateWarnings))
 			{
 				if (emg)
-					php_error(E_WARNING, emg);
+					php_error(E_WARNING, "%s(): %s", get_active_function_name(TSRMLS_C), emg);
 				else
-					php_error(E_WARNING, "No message");
+					php_error(E_WARNING, "%s(): No message", get_active_function_name(TSRMLS_C));
 			}
 			link->errorText = strdup(emg);
 			link->errorNo  = fbcemdErrorCodeAtIndex(emd, 0);;
@@ -1050,7 +1050,7 @@ static void php_fbsql_read_lob(INTERNAL_FUNCTION_PARAMETERS, int lob_type)
 	convert_to_string_ex(lob_handle);
 
 	if (Z_STRLEN_PP(lob_handle) != 27 || Z_STRVAL_PP(lob_handle)[0] != '@') {
-		if (FB_SQL_G(generateWarnings)) php_error(E_WARNING, "The handle is invalid");
+		if (FB_SQL_G(generateWarnings)) php_error(E_WARNING, "%s(): The handle is invalid", get_active_function_name(TSRMLS_C));
 		RETURN_FALSE;
 	}
 
@@ -1113,7 +1113,7 @@ static void php_fbsql_lob_size(INTERNAL_FUNCTION_PARAMETERS, int lob_type)
 	convert_to_string_ex(lob_handle);
 
 	if (Z_STRLEN_PP(lob_handle) != 27 || Z_STRVAL_PP(lob_handle)[0] != '@') {
-		if (FB_SQL_G(generateWarnings)) php_error(E_WARNING, "The handle is invalid");
+		if (FB_SQL_G(generateWarnings)) php_error(E_WARNING, "%s(): The handle is invalid", get_active_function_name(TSRMLS_C));
 		RETURN_FALSE;
 	}
 
@@ -1349,8 +1349,8 @@ PHP_FUNCTION(fbsql_select_db)
 		int port = atoi(name);
 		if (port == 0 || port > 64535) {
 			if (FB_SQL_G(generateWarnings)) {
-				php_error(E_WARNING, "Cannot connect to FBExec for database '%s'", name);
-				php_error(E_WARNING, fbcehClassErrorMessage());
+				php_error(E_WARNING, "%s(): Cannot connect to FBExec for database '%s'", get_active_function_name(TSRMLS_C), name);
+				php_error(E_WARNING, "%s(): %s", get_active_function_name(TSRMLS_C), fbcehClassErrorMessage());
 			}
 			RETURN_FALSE;
 		}
@@ -1465,14 +1465,14 @@ PHP_FUNCTION(fbsql_create_db)
 		else if (status == FBStopping) txt = "stopping";
 		else if (status == FBNoExec  ) txt = "no exec";
 		if (FB_SQL_G(generateWarnings))
-			php_error(E_WARNING, "Could not create %s@%s, database is %s", databaseName, phpLink->hostName, txt);
+			php_error(E_WARNING, "%s(): Could not create %s@%s, database is %s", get_active_function_name(TSRMLS_C), databaseName, phpLink->hostName, txt);
 		RETURN_FALSE;
 	}
 	if (!fbcehCreateDatabaseNamedWithOptions(phpLink->execHandler, databaseName, ""))
 	{
 		char* error = fbechErrorMessage(phpLink->execHandler);
 		if (FB_SQL_G(generateWarnings))
-			php_error(E_WARNING, "Could not create %s@%s. %s.", databaseName, phpLink->hostName, error);
+			php_error(E_WARNING, "%s(): Could not create %s@%s. %s.", get_active_function_name(TSRMLS_C), databaseName, phpLink->hostName, error);
 		RETURN_FALSE;
 	}
 	for (i=0; i < 20; i++)
@@ -1488,7 +1488,7 @@ PHP_FUNCTION(fbsql_create_db)
 	if (status != FBRunning)
 	{
 		if (FB_SQL_G(generateWarnings))
-			php_error(E_WARNING, "Database %s@%s created -- status unknown", databaseName, phpLink->hostName);
+			php_error(E_WARNING, "%s(): Database %s@%s created -- status unknown", get_active_function_name(TSRMLS_C), databaseName, phpLink->hostName);
 		RETURN_FALSE;
 	}
 	RETURN_TRUE;
@@ -1539,7 +1539,7 @@ PHP_FUNCTION(fbsql_drop_db)
 		else if (status == FBStopping     ) txt = "stopping";
 		else if (status == FBNoExec       ) txt = "no exec";
 		if (FB_SQL_G(generateWarnings))
-			php_error(E_WARNING, "Could not drop %s@%s, database is %s.", databaseName, phpLink->hostName, txt);
+			php_error(E_WARNING, "%s(): Could not drop %s@%s, database is %s.", get_active_function_name(TSRMLS_C), databaseName, phpLink->hostName, txt);
 		RETURN_FALSE;
 	}
 
@@ -1547,7 +1547,7 @@ PHP_FUNCTION(fbsql_drop_db)
 	{
 		char* error = fbechErrorMessage(phpLink->execHandler);
 		if (FB_SQL_G(generateWarnings))
-			php_error(E_WARNING, "Could not drop %s@%s. %s.", databaseName, phpLink->hostName, error);
+			php_error(E_WARNING, "%s(): Could not drop %s@%s. %s.", get_active_function_name(TSRMLS_C), databaseName, phpLink->hostName, error);
 		RETURN_FALSE;
 	}
 	for (i=0; i < 20; i++)
@@ -1563,7 +1563,7 @@ PHP_FUNCTION(fbsql_drop_db)
 	if (status != FBUnknownStatus)
 	{
 		if (FB_SQL_G(generateWarnings))
-			php_error(E_WARNING, "Database %s@%s dropped -- status unknown", databaseName, phpLink->hostName);
+			php_error(E_WARNING, "%s(): Database %s@%s dropped -- status unknown", get_active_function_name(TSRMLS_C), databaseName, phpLink->hostName);
 		RETURN_FALSE;
 	}
 }
@@ -1612,7 +1612,7 @@ PHP_FUNCTION(fbsql_start_db)
 		else if (status == FBStopping) txt = "stopping";
 		else if (status == FBNoExec  ) txt = "no exec";
 		if (FB_SQL_G(generateWarnings))
-			php_error(E_WARNING, "Could not start %s@%s, as database is %s.", databaseName, phpLink->hostName, txt);
+			php_error(E_WARNING, "%s(): Could not start %s@%s, as database is %s.", get_active_function_name(TSRMLS_C), databaseName, phpLink->hostName, txt);
 		RETURN_FALSE;
 	}
 
@@ -1622,7 +1622,7 @@ PHP_FUNCTION(fbsql_start_db)
 		{
 			char* error = fbechErrorMessage(phpLink->execHandler);
 			if (FB_SQL_G(generateWarnings))
-				php_error(E_WARNING, "Could not start %s@%s. %s.", databaseName, phpLink->hostName, error);
+				php_error(E_WARNING, "%s(): Could not start %s@%s. %s.", get_active_function_name(TSRMLS_C), databaseName, phpLink->hostName, error);
 			RETURN_FALSE;
 		}
 	}
@@ -1640,7 +1640,7 @@ PHP_FUNCTION(fbsql_start_db)
 	if (status != FBRunning)
 	{
 		if (FB_SQL_G(generateWarnings))
-			php_error(E_WARNING, "Database %s@%s started -- status unknown", databaseName, phpLink->hostName);
+			php_error(E_WARNING, "%s(): Database %s@%s started -- status unknown", get_active_function_name(TSRMLS_C), databaseName, phpLink->hostName);
 		RETURN_FALSE;
 	}
 	RETURN_TRUE;
@@ -1688,7 +1688,7 @@ PHP_FUNCTION(fbsql_stop_db)
 	if (!fbcdcStopDatabase(phpLink->connection))
 	{
 		if (FB_SQL_G(generateWarnings))
-			php_error(E_WARNING, "Cannot stop database %s@%s", databaseName, phpLink->hostName);
+			php_error(E_WARNING, "%s(): Cannot stop database %s@%s", get_active_function_name(TSRMLS_C), databaseName, phpLink->hostName);
 		RETURN_FALSE;
 	}
 
@@ -1765,7 +1765,7 @@ int mdOk(PHPFBLink* link, FBCMetaData* md, char* sql)
 	{
 		link->errorNo = 1;
 		link->errorText = strdup("Connection to database server was lost");
-		if (FB_SQL_G(generateWarnings)) php_error(E_WARNING, link->errorText);
+		if (FB_SQL_G(generateWarnings)) php_error(E_WARNING, "%s(): %s", get_active_function_name(TSRMLS_C), link->errorText);
 		result = 0;
 	}
 	else if (fbcmdErrorsFound(md))
@@ -1775,9 +1775,9 @@ int mdOk(PHPFBLink* link, FBCMetaData* md, char* sql)
 		if (FB_SQL_G(generateWarnings))
 		{
 			if (emg)
-				php_error(E_WARNING, "Error in statement: '%s' %s", sql, emg);
+				php_error(E_WARNING, "%s(): Error in statement: '%s' %s", get_active_function_name(TSRMLS_C), sql, emg);
 			else
-				php_error(E_WARNING, "No message");
+				php_error(E_WARNING, "%s(): No message", get_active_function_name(TSRMLS_C));
 		}
 		link->errorText = strdup(emg);
 		link->errorNo  = fbcemdErrorCodeAtIndex(emd, 0);;
@@ -2432,7 +2432,7 @@ void phpfbColumnAsString (PHPFBResult* result, int column, void* data , int* len
 		break;
 
 		default:
-			php_error(E_ERROR, "Unimplemented type");
+			php_error(E_ERROR, "%s(): Unimplemented type", get_active_function_name(TSRMLS_C));
 		break;
 	}
 }
@@ -2477,13 +2477,13 @@ void phpfbSqlResult(INTERNAL_FUNCTION_PARAMETERS, PHPFBResult* result, int rowIn
 	else if (!phpfbFetchRow(result, rowIndex))
 	{
 		if (FB_SQL_G(generateWarnings))
-			php_error(E_WARNING, "No such row %d in result set %d", rowIndex, rowIndex);
+			php_error(E_WARNING, "%s(): No such row %d in result set %d", get_active_function_name(TSRMLS_C), rowIndex, rowIndex);
 		RETURN_FALSE;
 	}
 	else if (columnIndex >= result->columnCount)
 	{
 		if (FB_SQL_G(generateWarnings))
-			php_error(E_WARNING, "No such column %d in result set %d", columnIndex, rowIndex);
+			php_error(E_WARNING, "%s(): No such column %d in result set %d", get_active_function_name(TSRMLS_C), columnIndex, rowIndex);
 		RETURN_FALSE;
 	}
 	else
@@ -2564,7 +2564,7 @@ PHP_FUNCTION(fbsql_result)
 			if (columnIndex < 0)
 			{
 				if (FB_SQL_G(generateWarnings))
-					php_error(E_WARNING, "Illegal column index - %d", columnIndex);
+					php_error(E_WARNING, "%s(): Illegal column index - %d", get_active_function_name(TSRMLS_C), columnIndex);
 				RETURN_FALSE;
 			}
 		}
@@ -2797,7 +2797,7 @@ static void php_fbsql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int result_type)
 	if (((result_type & FBSQL_NUM) != FBSQL_NUM) && ((result_type & FBSQL_ASSOC) != FBSQL_ASSOC))
 	{
 		if (FB_SQL_G(generateWarnings))
-			php_error(E_WARNING, "Illegal result type use FBSQL_NUM, FBSQL_ASSOC, or FBSQL_BOTH.");
+			php_error(E_WARNING, "%s(): Illegal result type use FBSQL_NUM, FBSQL_ASSOC, or FBSQL_BOTH.", get_active_function_name(TSRMLS_C));
 		RETURN_FALSE;
 	}
 	if (array_init(return_value)==FAILURE)
@@ -2966,7 +2966,7 @@ PHP_FUNCTION(fbsql_data_seek)
 	if (rowIndex < 0)
 	{
 		if (FB_SQL_G(generateWarnings))
-			php_error(E_WARNING, "Illegal row_index (%i)", rowIndex);
+			php_error(E_WARNING, "%s(): Illegal row_index (%i)", get_active_function_name(TSRMLS_C), rowIndex);
 		RETURN_FALSE;
 	}
 
@@ -3043,7 +3043,7 @@ PHP_FUNCTION(fbsql_fetch_field)
 		if (column < 0 || column >= result->columnCount)
 		{
 			if (FB_SQL_G(generateWarnings))
-				php_error(E_WARNING, "%d no such column in result", column);
+				php_error(E_WARNING, "%s(): %d no such column in result", get_active_function_name(TSRMLS_C), column);
 			RETURN_FALSE;
 		}
 	}
@@ -3100,7 +3100,7 @@ PHP_FUNCTION(fbsql_field_seek)
 		if (column < 0 || column >= result->columnCount)
 		{
 			if (FB_SQL_G(generateWarnings))
-				php_error(E_WARNING, "%d no such column in result", column);
+				php_error(E_WARNING, "%s(): %d no such column in result", get_active_function_name(TSRMLS_C), column);
 			RETURN_FALSE;
 		}
 	}
@@ -3143,7 +3143,7 @@ PHP_FUNCTION(fbsql_field_name)
 		if (column < 0 || column >= result->columnCount)
 		{
 			if (FB_SQL_G(generateWarnings))
-				php_error(E_WARNING, "%d no such column in result", column);
+				php_error(E_WARNING, "%s(): %d no such column in result", get_active_function_name(TSRMLS_C), column);
 			RETURN_FALSE;
 		}
 	}
@@ -3192,7 +3192,7 @@ PHP_FUNCTION(fbsql_field_table)
 		if (column < 0 || column >= result->columnCount)
 		{
 			if (FB_SQL_G(generateWarnings))
-				php_error(E_WARNING, "%d no such column in result", column);
+				php_error(E_WARNING, "%s(): %d no such column in result", get_active_function_name(TSRMLS_C), column);
 			RETURN_FALSE;
 		}
 	}
@@ -3233,7 +3233,7 @@ PHP_FUNCTION(fbsql_field_len)
 		if (column < 0 || column >= result->columnCount)
 		{
 			if (FB_SQL_G(generateWarnings))
-				php_error(E_WARNING, "%d no such column in result", column);
+				php_error(E_WARNING, "%s(): %d no such column in result", get_active_function_name(TSRMLS_C), column);
 			RETURN_FALSE;
 		}
 	}
@@ -3285,7 +3285,7 @@ PHP_FUNCTION(fbsql_field_type)
 		if (column < 0 || column >= result->columnCount)
 		{
 			if (FB_SQL_G(generateWarnings))
-				php_error(E_WARNING, "%d no such column in result", column);
+				php_error(E_WARNING, "%s(): %d no such column in result", get_active_function_name(TSRMLS_C), column);
 			RETURN_FALSE;
 		}
 	}
@@ -3339,7 +3339,7 @@ PHP_FUNCTION(fbsql_field_flags)
 		if (column < 0 || column >= result->columnCount)
 		{
 			if (FB_SQL_G(generateWarnings))
-				php_error(E_WARNING, "%d no such column in result", column);
+				php_error(E_WARNING, "%s(): %d no such column in result", get_active_function_name(TSRMLS_C), column);
 			RETURN_FALSE;
 		}
 	}
@@ -3417,7 +3417,7 @@ PHP_FUNCTION(fbsql_table_name)
 	if (index < 0)
 	{
 		if (FB_SQL_G(generateWarnings))
-			php_error(E_WARNING, "Illegal index (%i)", index);
+			php_error(E_WARNING, "%s(): Illegal index (%i)", get_active_function_name(TSRMLS_C), index);
 		RETURN_FALSE;
 	}
 
@@ -3483,7 +3483,7 @@ PHP_FUNCTION(fbsql_get_autostart_info)
 	ZEND_FETCH_RESOURCE2(phpLink, PHPFBLink *, fbsql_link_index, id, "FrontBase-Link", le_link, le_plink);
 
 	if (phpLink->execHandler == NULL) {
-		if (FB_SQL_G(generateWarnings)) php_error(E_WARNING, "No valid Exec handler available for this connection");
+		if (FB_SQL_G(generateWarnings)) php_error(E_WARNING, "%s(): No valid Exec handler available for this connection", get_active_function_name(TSRMLS_C));
 		RETURN_FALSE;
 	}
 	else {