Unify error messages

1 files changed, 21 insertions, 21 deletions

diff --git a/ext/db/db.c b/ext/db/db.c
index f089504ad3..f9c0480480 100644
--- a/ext/db/db.c
+++ b/ext/db/db.c
@@ -295,7 +295,7 @@ dbm_info *php_dbm_open(char *filename, char *mode TSRMLS_DC)
 	DBM_MODE_TYPE imode;
 
 	if (filename == NULL) {
-		php_error(E_WARNING, "NULL filename passed to php_dbm_open()");
+		php_error(E_WARNING, "%s(): NULL filename passed", get_active_function_name(TSRMLS_C));
 		return NULL;
 	}
 
@@ -341,7 +341,7 @@ dbm_info *php_dbm_open(char *filename, char *mode TSRMLS_DC)
 			lockfd = open(lockfn, O_RDWR|O_CREAT, 0644);
 			close(lockfd);
 		} else {
-			php_error(E_WARNING, "File appears to be locked [%s]\n", lockfn);
+			php_error(E_WARNING, "%s(): File appears to be locked [%s]", get_active_function_name(TSRMLS_C), lockfn);
 			return -1;
 		}
 #else /* NFS_HACK */
@@ -352,7 +352,7 @@ dbm_info *php_dbm_open(char *filename, char *mode TSRMLS_DC)
 			flock(lockfd, LOCK_EX);
 			close(lockfd);
 		} else {
-			php_error(E_WARNING, "Unable to establish lock: %s", filename);
+			php_error(E_WARNING, "%s(): Unable to establish lock: %s", get_active_function_name(TSRMLS_C), filename);
 		}
 #endif /* else NFS_HACK */
 
@@ -369,7 +369,7 @@ dbm_info *php_dbm_open(char *filename, char *mode TSRMLS_DC)
 	if (dbf) {
 		info = (dbm_info *)emalloc(sizeof(dbm_info));
 		if (!info) {
-			php_error(E_ERROR, "problem allocating memory!");
+			php_error(E_ERROR, "%s(): problem allocating memory!", get_active_function_name(TSRMLS_C));
 			return NULL;
 		}
 
@@ -381,7 +381,7 @@ dbm_info *php_dbm_open(char *filename, char *mode TSRMLS_DC)
 		return info;
 	} else {
 #if GDBM 
-		php_error(E_WARNING, "dbmopen_gdbm(%s): %d [%s], %d [%s]", filename, gdbm_errno, gdbm_strerror(gdbm_errno), errno, strerror(errno));
+		php_error(E_WARNING, "%s(%s): %d [%s], %d [%s]", get_active_function_name(TSRMLS_C), filename, gdbm_errno, gdbm_strerror(gdbm_errno), errno, strerror(errno));
 		if (gdbm_errno)
 			ret = gdbm_errno;
 		else if (errno)
@@ -391,13 +391,13 @@ dbm_info *php_dbm_open(char *filename, char *mode TSRMLS_DC)
 #else 
 #if NDBM 
 #if PHP_DEBUG
-		php_error(E_WARNING, "dbmopen_ndbm(%s): errno = %d [%s]\n", filename, errno, strerror(errno));
+		php_error(E_WARNING, "%s(%s): errno = %d [%s]\n", get_active_function_name(TSRMLS_C), filename, errno, strerror(errno));
 #endif
 		if (errno) ret=errno;
 		else ret = -1;
 #else
 #if PHP_DEBUG
-		php_error(E_WARNING, "dbmopen_flatfile(%s): errno = %d [%s]\n", filename, errno, strerror(errno));
+		php_error(E_WARNING, "%s(%s): errno = %d [%s]\n", get_active_function_name(TSRMLS_C), filename, errno, strerror(errno));
 #endif
 		if (errno) ret=errno;
 		else ret = -1;
@@ -487,7 +487,7 @@ PHP_FUNCTION(dbminsert)
 
 	info = php_find_dbm(id TSRMLS_CC);
 	if (!info) {
-		php_error(E_WARNING, "not a valid database identifier %d", Z_LVAL_P(id));
+		php_error(E_WARNING, "%s(): not a valid database identifier %d", get_active_function_name(TSRMLS_C), Z_LVAL_P(id));
 		RETURN_FALSE;
 	}
 	
@@ -518,7 +518,7 @@ int php_dbm_insert(dbm_info *info, char *key, char *value TSRMLS_DC) {
 
 	dbf = info->dbf;
 	if (!dbf) {
-		php_error(E_WARNING, "Unable to locate dbm file");
+		php_error(E_WARNING, "%s(): Unable to locate dbm file", get_active_function_name(TSRMLS_C));
 		return 1;
 	}
 
@@ -547,7 +547,7 @@ PHP_FUNCTION(dbmreplace)
 
 	info = php_find_dbm(id TSRMLS_CC);
 	if (!info) {
-		php_error(E_WARNING, "not a valid database identifier %d", Z_LVAL_P(id));
+		php_error(E_WARNING, "%s(): not a valid database identifier %d", get_active_function_name(TSRMLS_C), Z_LVAL_P(id));
 		RETURN_FALSE;
 	}
 	
@@ -580,7 +580,7 @@ int php_dbm_replace(dbm_info *info, char *key, char *value TSRMLS_DC)
 
 	dbf = info->dbf;
 	if (!dbf) {
-		php_error(E_WARNING, "Unable to locate dbm file");
+		php_error(E_WARNING, "%s(): Unable to locate dbm file", get_active_function_name(TSRMLS_C));
 		return 1;
 	}
 
@@ -608,7 +608,7 @@ PHP_FUNCTION(dbmfetch)
 
 	info = php_find_dbm(id TSRMLS_CC);
 	if (!info) {
-		php_error(E_WARNING, "not a valid database identifier %d", Z_LVAL_P(id));
+		php_error(E_WARNING, "%s(): not a valid database identifier %d", get_active_function_name(TSRMLS_C), Z_LVAL_P(id));
 		RETURN_FALSE;
 	}
 
@@ -639,7 +639,7 @@ char *php_dbm_fetch(dbm_info *info, char *key TSRMLS_DC)
 
 	dbf = info->dbf;
 	if (!dbf) {
-		php_error(E_WARNING, "Unable to locate dbm file");
+		php_error(E_WARNING, "%s(): Unable to locate dbm file", get_active_function_name(TSRMLS_C));
 		return(NULL);
 	}
 
@@ -684,7 +684,7 @@ PHP_FUNCTION(dbmexists)
 
 	info = php_find_dbm(id TSRMLS_CC);
 	if (!info) {
-		php_error(E_WARNING, "not a valid database identifier %d", Z_LVAL_P(id));
+		php_error(E_WARNING, "%s(): not a valid database identifier %d", get_active_function_name(TSRMLS_C), Z_LVAL_P(id));
 		RETURN_FALSE;
 	}
 
@@ -708,7 +708,7 @@ int php_dbm_exists(dbm_info *info, char *key) {
 
 	dbf = info->dbf;
 	if (!dbf) {
-		php_error(E_WARNING, "Unable to locate dbm file");
+		php_error(E_WARNING, "%s(): Unable to locate dbm file", get_active_function_name(TSRMLS_C));
 		return(0);
 	}
 
@@ -733,7 +733,7 @@ PHP_FUNCTION(dbmdelete)
 
 	info = php_find_dbm(id TSRMLS_CC);
 	if (!info) {
-		php_error(E_WARNING, "not a valid database identifier %d", Z_LVAL_P(id));
+		php_error(E_WARNING, "%s(): not a valid database identifier %d", get_active_function_name(TSRMLS_C), Z_LVAL_P(id));
 		RETURN_FALSE;
 	}
 
@@ -757,7 +757,7 @@ int php_dbm_delete(dbm_info *info, char *key) {
 
 	dbf = info->dbf;
 	if (!dbf) {
-		php_error(E_WARNING, "Unable to locate dbm file");
+		php_error(E_WARNING, "%s(): Unable to locate dbm file", get_active_function_name(TSRMLS_C));
 		return(0);
 	}
 
@@ -780,7 +780,7 @@ PHP_FUNCTION(dbmfirstkey)
 
 	info = php_find_dbm(id TSRMLS_CC);
 	if (!info) {
-		php_error(E_WARNING, "not a valid database identifier %d", Z_LVAL_P(id));
+		php_error(E_WARNING, "%s(): not a valid database identifier %d", get_active_function_name(TSRMLS_C), Z_LVAL_P(id));
 		RETURN_FALSE;
 	}
 
@@ -802,7 +802,7 @@ char *php_dbm_first_key(dbm_info *info) {
 
 	dbf = info->dbf;
 	if (!dbf) {
-		php_error(E_WARNING, "Unable to locate dbm file");
+		php_error(E_WARNING, "%s(): Unable to locate dbm file", get_active_function_name(TSRMLS_C));
 		return(NULL);
 	}
 
@@ -842,7 +842,7 @@ PHP_FUNCTION(dbmnextkey)
 
 	info = php_find_dbm(id TSRMLS_CC);
 	if (!info) {
-		php_error(E_WARNING, "not a valid database identifier %d", Z_LVAL_P(id));
+		php_error(E_WARNING, "%s(): not a valid database identifier %d", get_active_function_name(TSRMLS_C), Z_LVAL_P(id));
 		RETURN_FALSE;
 	}
 
@@ -871,7 +871,7 @@ char *php_dbm_nextkey(dbm_info *info, char *key TSRMLS_DC)
 
 	dbf = info->dbf;
 	if (!dbf) {
-		php_error(E_WARNING, "Unable to locate dbm file");
+		php_error(E_WARNING, "%s(): Unable to locate dbm file", get_active_function_name(TSRMLS_C));
 		return(NULL);
 	}