cvs: php4 /ext/db db.c

derick Wed Jun 26 03:51:43 2002 EDT Modified files: /php4/ext/db db.c Log: Unify error messages Index: php4/ext/db/db.c diff -u php4/ext/db/db.c:1.70 php4/ext/db/db.c:1.71 --- php4/ext/db/db.c:1.70 Thu Feb 28 03:25:55 2002 +++ php4/ext/db/db.c Wed Jun 26 03:51:42 2002 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: db.c,v 1.70 2002/02/28 08:25:55 sebastian Exp $ */ +/* $Id: db.c,v 1.71 2002/06/26 07:51:42 derick Exp $ */ #define IS_EXT_MODULE #ifdef HAVE_CONFIG_H @@ -295,7 +295,7 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ #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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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); }