cvs: php4 /ext/db db.c

helly Mon Aug 26 20:44:57 2002 EDT Modified files: /php4/ext/db db.c Log: -php_error_docref -nuke unused variable Index: php4/ext/db/db.c diff -u php4/ext/db/db.c:1.76 php4/ext/db/db.c:1.77 --- php4/ext/db/db.c:1.76 Mon Aug 26 20:20:37 2002 +++ php4/ext/db/db.c Mon Aug 26 20:44:57 2002 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: db.c,v 1.76 2002/08/27 00:20:37 helly Exp $ */ +/* $Id: db.c,v 1.77 2002/08/27 00:44:57 helly Exp $ */ #define IS_EXT_MODULE #ifdef HAVE_CONFIG_H @@ -295,7 +295,7 @@ DBM_MODE_TYPE imode; if (filename == NULL) { - php_error(E_WARNING, "%s(): NULL filename passed", get_active_function_name(TSRMLS_C)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "NULL filename passed"); return NULL; } @@ -341,7 +341,7 @@ lockfd = open(lockfn, O_RDWR|O_CREAT, 0644); close(lockfd); } else { - php_error(E_WARNING, "%s(): File appears to be locked [%s]", get_active_function_name(TSRMLS_C), lockfn); + php_error_docref1(NULL TSRMLS_CC, filename, E_WARNING, "File appears to be locked [%s]", lockfn); return -1; } #else /* NFS_HACK */ @@ -352,7 +352,7 @@ flock(lockfd, LOCK_EX); close(lockfd); } else { - php_error(E_WARNING, "%s(): Unable to establish lock: %s", get_active_function_name(TSRMLS_C), filename); + php_error_docref1(NULL TSRMLS_CC, filename, E_WARNING, "Unable to establish lock"); } #endif /* else NFS_HACK */ @@ -369,7 +369,7 @@ if (dbf) { info = (dbm_info *)emalloc(sizeof(dbm_info)); if (!info) { - php_error(E_ERROR, "%s(): problem allocating memory!", get_active_function_name(TSRMLS_C)); + php_error_docref1(NULL TSRMLS_CC, filename, E_ERROR, "Oroblem allocating memory!"); return NULL; } @@ -381,7 +381,7 @@ return info; } else { #if GDBM - 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)); + php_error_docref1(NULL TSRMLS_CC, filename, E_WARNING, "%d [%s], %d [%s]", 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, "%s(%s): errno = %d [%s]\n", get_active_function_name(TSRMLS_C), filename, errno, strerror(errno)); + php_error_docref1(NULL TSRMLS_CC, filename, E_WARNING, "errno = %d [%s]\n", errno, strerror(errno)); #endif if (errno) ret=errno; else ret = -1; #else #if PHP_DEBUG - php_error(E_WARNING, "%s(%s): errno = %d [%s]\n", get_active_function_name(TSRMLS_C), filename, errno, strerror(errno)); + php_error1(NULL TSRMLS_CC, filename, E_WARNING, "errno = %d [%s]\n", errno, strerror(errno)); #endif if (errno) ret=errno; else ret = -1; @@ -439,7 +439,6 @@ */ void php_dbm_close(zend_rsrc_list_entry *rsrc TSRMLS_DC) { - int ret = 0; dbm_info *info = (dbm_info *)rsrc->ptr; DBM_TYPE dbf; int lockfd; @@ -487,7 +486,7 @@ info = php_find_dbm(id TSRMLS_CC); if (!info) { - php_error(E_WARNING, "%s(): not a valid database identifier %d", get_active_function_name(TSRMLS_C), Z_LVAL_P(id)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid database identifier %d", Z_LVAL_P(id)); RETURN_FALSE; } @@ -513,7 +512,7 @@ info = php_find_dbm(id TSRMLS_CC); if (!info) { - php_error(E_WARNING, "%s(): not a valid database identifier %d", get_active_function_name(TSRMLS_C), Z_LVAL_P(id)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid database identifier %d", Z_LVAL_P(id)); RETURN_FALSE; } @@ -549,7 +548,7 @@ dbf = info->dbf; if (!dbf) { - php_error(E_WARNING, "%s(): Unable to locate dbm file", get_active_function_name(TSRMLS_C)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to locate dbm file"); ret = 1; } else { if (!replace_mode) { @@ -581,7 +580,7 @@ info = php_find_dbm(id TSRMLS_CC); if (!info) { - php_error(E_WARNING, "%s(): not a valid database identifier %d", get_active_function_name(TSRMLS_C), Z_LVAL_P(id)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid database identifier %d", Z_LVAL_P(id)); RETURN_FALSE; } @@ -612,7 +611,7 @@ dbf = info->dbf; if (!dbf) { - php_error(E_WARNING, "%s(): Unable to locate dbm file", get_active_function_name(TSRMLS_C)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to locate dbm file"); return(NULL); } @@ -657,7 +656,7 @@ info = php_find_dbm(id TSRMLS_CC); if (!info) { - php_error(E_WARNING, "%s(): not a valid database identifier %d", get_active_function_name(TSRMLS_C), Z_LVAL_P(id)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid database identifier %d", Z_LVAL_P(id)); RETURN_FALSE; } @@ -681,7 +680,7 @@ dbf = info->dbf; if (!dbf) { - php_error(E_WARNING, "%s(): Unable to locate dbm file", get_active_function_name(TSRMLS_C)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to locate dbm file"); return(0); } @@ -706,7 +705,7 @@ info = php_find_dbm(id TSRMLS_CC); if (!info) { - php_error(E_WARNING, "%s(): not a valid database identifier %d", get_active_function_name(TSRMLS_C), Z_LVAL_P(id)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid database identifier %d", Z_LVAL_P(id)); RETURN_FALSE; } @@ -730,7 +729,7 @@ dbf = info->dbf; if (!dbf) { - php_error(E_WARNING, "%s(): Unable to locate dbm file", get_active_function_name(TSRMLS_C)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to locate dbm file"); return(0); } @@ -753,7 +752,7 @@ info = php_find_dbm(id TSRMLS_CC); if (!info) { - php_error(E_WARNING, "%s(): not a valid database identifier %d", get_active_function_name(TSRMLS_C), Z_LVAL_P(id)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid database identifier %d", Z_LVAL_P(id)); RETURN_FALSE; } @@ -775,7 +774,7 @@ dbf = info->dbf; if (!dbf) { - php_error(E_WARNING, "%s(): Unable to locate dbm file", get_active_function_name(TSRMLS_C)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to locate dbm file"); return(NULL); } @@ -815,7 +814,7 @@ info = php_find_dbm(id TSRMLS_CC); if (!info) { - php_error(E_WARNING, "%s(): not a valid database identifier %d", get_active_function_name(TSRMLS_C), Z_LVAL_P(id)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid database identifier %d", Z_LVAL_P(id)); RETURN_FALSE; } @@ -844,7 +843,7 @@ dbf = info->dbf; if (!dbf) { - php_error(E_WARNING, "%s(): Unable to locate dbm file", get_active_function_name(TSRMLS_C)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to locate dbm file"); return(NULL); }