cvs: php4 /ext/fdf fdf.c

derick Thu Jun 27 02:46:51 2002 EDT Modified files: /php4/ext/fdf fdf.c Log: Unify error messages Index: php4/ext/fdf/fdf.c diff -u php4/ext/fdf/fdf.c:1.63 php4/ext/fdf/fdf.c:1.64 --- php4/ext/fdf/fdf.c:1.63 Tue Dec 11 10:29:13 2001 +++ php4/ext/fdf/fdf.c Thu Jun 27 02:46:51 2002 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: fdf.c,v 1.63 2001/12/11 15:29:13 sebastian Exp $ */ +/* $Id: fdf.c,v 1.64 2002/06/27 06:46:51 derick Exp $ */ /* FdfTk lib 2.0 is a Complete C/C++ FDF Toolkit available from http://beta1.adobe.com/ada/acrosdk/forms.html. */ @@ -196,7 +196,7 @@ err = FDFOpen(Z_STRVAL_PP(file), 0, &fdf); if(err != FDFErcOK || !fdf) { - php_error(E_WARNING, "Could not open fdf document: %s", Z_STRVAL_PP(file)); + php_error(E_WARNING, "%s(): Could not open fdf document: %s", get_active_function_name(TSRMLS_C), Z_STRVAL_PP(file)); RETURN_FALSE; } @@ -218,7 +218,7 @@ err = FDFCreate(&fdf); if(err != FDFErcOK || !fdf) { - php_error(E_WARNING, "Error creating new fdf document!"); + php_error(E_WARNING, "%s(): Error creating new fdf document!", get_active_function_name(TSRMLS_C)); RETURN_FALSE; } @@ -268,7 +268,7 @@ } if(err != FDFErcOK) { - php_error(E_WARNING, "Error getting value of %s", Z_STRVAL_PP(fieldname)); + php_error(E_WARNING, "%s(): Error getting value of %s", get_active_function_name(TSRMLS_C), Z_STRVAL_PP(fieldname)); efree(buffer); RETURN_FALSE; } @@ -298,7 +298,7 @@ err = FDFSetValue(fdf, Z_STRVAL_PP(fieldname), Z_STRVAL_PP(value), (ASBool) Z_LVAL_PP(isname)); if(err != FDFErcOK) { - php_error(E_WARNING, "Error setting field: %s to value: %s", Z_STRVAL_PP(fieldname), Z_STRVAL_PP(value)); + php_error(E_WARNING, "%s(): Error setting field: %s to value: %s", get_active_function_name(TSRMLS_C), Z_STRVAL_PP(fieldname), Z_STRVAL_PP(value)); RETURN_FALSE; } RETURN_TRUE; @@ -337,7 +337,7 @@ if(err != FDFErcOK) { efree(buffer); - php_error(E_WARNING,"Error getting next fieldname!"); + php_error(E_WARNING, "%s(): Error getting next fieldname!", get_active_function_name(TSRMLS_C)); RETURN_FALSE; } @@ -386,7 +386,7 @@ possible errors this function can return. Or create global error handler function. */ if(err != FDFErcOK) { - php_error(E_WARNING,"Error setting appearence of field: %s", Z_STRVAL_PP(fieldname)); + php_error(E_WARNING, "%s(): Error setting appearence of field: %s", get_active_function_name(TSRMLS_C), Z_STRVAL_PP(fieldname)); RETURN_FALSE; } @@ -413,7 +413,7 @@ err = FDFSetStatus(fdf, Z_STRVAL_PP(status)); if(err != FDFErcOK) { - php_error(E_WARNING,"Error setting fdf document status key to: %s", Z_STRVAL_PP(status)); + php_error(E_WARNING, "%s(): Error setting fdf document status key to: %s", get_active_function_name(TSRMLS_C), Z_STRVAL_PP(status)); RETURN_FALSE; } @@ -446,7 +446,7 @@ } if(err != FDFErcOK) { - php_error(E_WARNING,"Error getting fdf document status key!"); + php_error(E_WARNING, "%s(): Error getting fdf document status key!", get_active_function_name(TSRMLS_C)); efree(buf); RETURN_FALSE; } @@ -474,7 +474,7 @@ err = FDFSetFile(fdf, Z_STRVAL_PP(filename)); if(err != FDFErcOK) { - php_error(E_WARNING,"Error setting filename key to: %s", Z_STRVAL_PP(filename)); + php_error(E_WARNING, "%s(): Error setting filename key to: %s", get_active_function_name(TSRMLS_C), Z_STRVAL_PP(filename)); RETURN_FALSE; } @@ -507,7 +507,7 @@ } if(err != FDFErcOK) { - php_error(E_WARNING,"Error getting fdf document filename key!"); + php_error(E_WARNING, "%s(): Error getting fdf document filename key!", get_active_function_name(TSRMLS_C)); efree(buf); RETURN_FALSE; } @@ -534,7 +534,7 @@ convert_to_string_ex(filename); err = FDFSave(fdf, Z_STRVAL_PP(filename)); if(err != FDFErcOK) { - php_error(E_WARNING,"Error saving fdf document into filename: %s", Z_STRVAL_PP(filename)); + php_error(E_WARNING, "%s(): Error saving fdf document into filename: %s", get_active_function_name(TSRMLS_C), Z_STRVAL_PP(filename)); RETURN_FALSE; } @@ -574,7 +574,7 @@ err = FDFAddTemplate(fdf, Z_LVAL_PP(newpage), &filespec, Z_STRVAL_PP(template), Z_LVAL_PP(rename)); if(err != FDFErcOK) { - php_error(E_WARNING,"Error adding template: %s into fdf document", Z_STRVAL_PP(template)); + php_error(E_WARNING, "%s(): Error adding template: %s into fdf document", get_active_function_name(TSRMLS_C), Z_STRVAL_PP(template)); RETURN_FALSE; } @@ -602,7 +602,7 @@ err=FDFSetFlags(fdf, Z_STRVAL_PP(fieldname), Z_LVAL_PP(flags), Z_LVAL_PP(newflags)); if(err != FDFErcOK) { - php_error(E_WARNING,"Error setting flags for field: %s", Z_STRVAL_PP(fieldname)); + php_error(E_WARNING, "%s(): Error setting flags for field: %s", get_active_function_name(TSRMLS_C), Z_STRVAL_PP(fieldname)); RETURN_FALSE; } @@ -631,7 +631,7 @@ err = FDFSetOpt(fdf, Z_STRVAL_PP(fieldname), Z_LVAL_PP(element), Z_STRVAL_PP(value), Z_STRVAL_PP(name)); if(err != FDFErcOK) { - php_error(E_WARNING,"Error setting FDF option for field: %s", Z_STRVAL_PP(fieldname)); + php_error(E_WARNING, "%s(): Error setting FDF option for field: %s", get_active_function_name(TSRMLS_C), Z_STRVAL_PP(fieldname)); RETURN_FALSE; } RETURN_TRUE; @@ -659,7 +659,7 @@ err = FDFSetSubmitFormAction(fdf, Z_STRVAL_PP(fieldname), Z_LVAL_PP(trigger), Z_STRVAL_PP(url), Z_LVAL_PP(flags)); if(err != FDFErcOK) { - php_error(E_WARNING,"Error setting FDF submit action for field: %s", Z_STRVAL_PP(fieldname)); + php_error(E_WARNING, "%s(): Error setting FDF submit action for field: %s", get_active_function_name(TSRMLS_C), Z_STRVAL_PP(fieldname)); RETURN_FALSE; } RETURN_TRUE; @@ -686,7 +686,7 @@ err = FDFSetJavaScriptAction(fdf, Z_STRVAL_PP(fieldname), Z_LVAL_PP(trigger), Z_STRVAL_PP(script)); if(err != FDFErcOK) { - php_error(E_WARNING,"Error setting FDF javascript action for field: %s", Z_STRVAL_PP(fieldname)); + php_error(E_WARNING, "%s(): Error setting FDF javascript action for field: %s", get_active_function_name(TSRMLS_C), Z_STRVAL_PP(fieldname)); RETURN_FALSE; } RETURN_TRUE; @@ -712,7 +712,7 @@ err = FDFSetEncoding(fdf, Z_STRVAL_PP(enc)); if(err != FDFErcOK) { - php_error(E_WARNING,"Error setting FDF encoding: %s", Z_STRVAL_PP(enc)); + php_error(E_WARNING, "%s(): Error setting FDF encoding: %s", get_active_function_name(TSRMLS_C), Z_STRVAL_PP(enc)); RETURN_FALSE; } RETURN_TRUE;