cvs: php4 /ext/filepro filepro.c

derick Thu Jun 27 02:54:51 2002 EDT Modified files: /php4/ext/filepro filepro.c Log: Unify error messages Index: php4/ext/filepro/filepro.c diff -u php4/ext/filepro/filepro.c:1.45 php4/ext/filepro/filepro.c:1.46 --- php4/ext/filepro/filepro.c:1.45 Thu Mar 14 06:26:10 2002 +++ php4/ext/filepro/filepro.c Thu Jun 27 02:54:51 2002 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: filepro.c,v 1.45 2002/03/14 11:26:10 sesser Exp $ */ +/* $Id: filepro.c,v 1.46 2002/06/27 06:54:51 derick Exp $ */ /* filePro 4.x support developed by Chad Robinson, chadr@brttech.com @@ -237,20 +237,20 @@ } if (!(fp = VCWD_FOPEN(workbuf, "r"))) { - php_error(E_WARNING, "filePro: cannot open map: [%d] %s", + php_error(E_WARNING, "%s(): Cannot open map: [%d] %s", get_active_function_name(TSRMLS_C), errno, strerror(errno)); RETURN_FALSE; } if (!fgets(readbuf, sizeof(readbuf), fp)) { fclose(fp); - php_error(E_WARNING, "filePro: cannot read map: [%d] %s", + php_error(E_WARNING, "%s(): Cannot read map: [%d] %s", get_active_function_name(TSRMLS_C), errno, strerror(errno)); RETURN_FALSE; } /* Get the field count, assume the file is readable! */ if (strcmp(php_strtok_r(readbuf, ":", &strtok_buf), "map")) { - php_error(E_WARNING, "filePro: map file corrupt or encrypted"); + php_error(E_WARNING, "%s(): Map file corrupt or encrypted", get_active_function_name(TSRMLS_C)); RETURN_FALSE; } FP_GLOBAL(fp_keysize) = atoi(php_strtok_r(NULL, ":", &strtok_buf)); @@ -261,7 +261,7 @@ for (i = 0; i < FP_GLOBAL(fp_fcount); i++) { if (!fgets(readbuf, sizeof(readbuf), fp)) { fclose(fp); - php_error(E_WARNING, "filePro: cannot read map: [%d] %s", + php_error(E_WARNING, "%s(): Cannot read map: [%d] %s", get_active_function_name(TSRMLS_C), errno, strerror(errno)); RETURN_FALSE; } @@ -317,7 +317,7 @@ if (!FP_GLOBAL(fp_database)) { php_error(E_WARNING, - "filePro: must set database directory first!\n"); + "%s(): Must set database directory first!", get_active_function_name(TSRMLS_C)); RETURN_FALSE; } @@ -335,7 +335,7 @@ } if (!(fp = VCWD_FOPEN(workbuf, "r"))) { - php_error(E_WARNING, "filePro: cannot open key: [%d] %s", + php_error(E_WARNING, "%s(): Cannot open key: [%d] %s", get_active_function_name(TSRMLS_C), errno, strerror(errno)); RETURN_FALSE; } @@ -375,7 +375,7 @@ if (!FP_GLOBAL(fp_database)) { php_error(E_WARNING, - "filePro: must set database directory first!\n"); + "%s(): Must set database directory first!", get_active_function_name(TSRMLS_C)); RETURN_FALSE; } @@ -386,7 +386,7 @@ } php_error(E_WARNING, - "filePro: unable to locate field number %d.\n", + "%s(): Unable to locate field number %d.", get_active_function_name(TSRMLS_C), Z_LVAL_P(fno)); RETVAL_FALSE; @@ -416,7 +416,7 @@ if (!FP_GLOBAL(fp_database)) { php_error(E_WARNING, - "filePro: must set database directory first!\n"); + "%s(): Must set database directory first!", get_active_function_name(TSRMLS_C)); RETURN_FALSE; } @@ -426,7 +426,7 @@ } } php_error(E_WARNING, - "filePro: unable to locate field number %d.\n", + "%s(): Unable to locate field number %d.", get_active_function_name(TSRMLS_C), Z_LVAL_P(fno)); RETVAL_FALSE; } @@ -455,7 +455,7 @@ if (!FP_GLOBAL(fp_database)) { php_error(E_WARNING, - "filePro: must set database directory first!\n"); + "%s(): Must set database directory first!", get_active_function_name(TSRMLS_C)); RETURN_FALSE; } @@ -465,7 +465,7 @@ } } php_error(E_WARNING, - "filePro: unable to locate field number %d.\n", + "%s(): Unable to locate field number %d.", get_active_function_name(TSRMLS_C), Z_LVAL_P(fno)); RETVAL_FALSE; } @@ -489,7 +489,7 @@ if (!FP_GLOBAL(fp_database)) { php_error(E_WARNING, - "filePro: must set database directory first!\n"); + "%s(): Must set database directory first!", get_active_function_name(TSRMLS_C)); RETURN_FALSE; } @@ -523,7 +523,7 @@ if (!FP_GLOBAL(fp_database)) { php_error(E_WARNING, - "filePro: must set database directory first!\n"); + "%s(): Must set database directory first!", get_active_function_name(TSRMLS_C)); RETURN_FALSE; } @@ -534,7 +534,7 @@ rnum = Z_LVAL_P(rno); if (rnum < 0 || fnum < 0 || fnum >= FP_GLOBAL(fp_fcount)) { - php_error(E_WARNING, "filepro: parameters out of range"); + php_error(E_WARNING, "%s(): Parameters out of range", get_active_function_name(TSRMLS_C)); RETURN_FALSE; } @@ -543,7 +543,7 @@ offset += lp->width; } if (!lp) { - php_error(E_WARNING, "filePro: cannot locate field"); + php_error(E_WARNING, "%s(): Cannot locate field", get_active_function_name(TSRMLS_C)); RETURN_FALSE; } @@ -559,7 +559,7 @@ } if (!(fp = VCWD_FOPEN(workbuf, "r"))) { - php_error(E_WARNING, "filePro: cannot open key: [%d] %s", + php_error(E_WARNING, "%s(): Cannot open key: [%d] %s", get_active_function_name(TSRMLS_C), errno, strerror(errno)); fclose(fp); RETURN_FALSE; @@ -568,7 +568,7 @@ readbuf = emalloc (lp->width+1); if (fread(readbuf, lp->width, 1, fp) != 1) { - php_error(E_WARNING, "filePro: cannot read data: [%d] %s", + php_error(E_WARNING, "%s(): Cannot read data: [%d] %s", get_active_function_name(TSRMLS_C), errno, strerror(errno)); efree(readbuf); fclose(fp);