Mirrors
/
php
mirror of https://github.com/php/php-src
3
0
Fork 0
Code Releases Activity
Browse Source

Unify error messages

experimental/new_apache_hooks
Derick Rethans 24 years ago
parent
a954dd6ee9
commit
51dfe5eebe
3 changed files with 66 additions and 66 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 78
      ext/fbsql/php_fbsql.c
  2. 34
      ext/fdf/fdf.c
  3. 20
      ext/ftp/php_ftp.c

78
ext/fbsql/php_fbsql.c
View File

@ -262,7 +262,7 @@ ZEND_GET_MODULE(fbsql)
#define CHECK_LINK(link) { \
if (link==-1) { \
if (FB_SQL_G(generateWarnings)) \
php_error(E_WARNING, "FrontBase: A link to the server could not be established"); \
php_error(E_WARNING, "%s(): A link to the server could not be established", get_active_function_name(TSRMLS_C)); \
RETURN_FALSE; \
} \
}
@ -526,14 +526,14 @@ static void php_fbsql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent)
if ((FB_SQL_G(maxLinks) != -1 && FB_SQL_G(linkCount) == FB_SQL_G(maxLinks)))
{
if (FB_SQL_G(generateWarnings))
php_error(E_WARNING, "FrontBase link limit %d exceeded ", FB_SQL_G(maxLinks));
php_error(E_WARNING, "%s(): FrontBase link limit %d exceeded ", get_active_function_name(TSRMLS_C), FB_SQL_G(maxLinks));
RETURN_FALSE;
}
if ((FB_SQL_G(maxPersistent) != -1 && FB_SQL_G(persistentCount) == FB_SQL_G(maxPersistent)))
{
if (FB_SQL_G(generateWarnings))
php_error(E_WARNING, "FrontBase persistent link limit %d exceeded ", FB_SQL_G(maxPersistent));
php_error(E_WARNING, "%s(): FrontBase persistent link limit %d exceeded ", get_active_function_name(TSRMLS_C), FB_SQL_G(maxPersistent));
RETURN_FALSE;
}
@ -575,7 +575,7 @@ static void php_fbsql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent)
if ((FB_SQL_G(maxLinks) != -1 && FB_SQL_G(linkCount) == FB_SQL_G(maxLinks)))
{
if (FB_SQL_G(generateWarnings))
php_error(E_WARNING, "FrontBase link limit %d exceeded ", FB_SQL_G(maxLinks));
php_error(E_WARNING, "%s(): FrontBase link limit %d exceeded ", get_active_function_name(TSRMLS_C), FB_SQL_G(maxLinks));
RETURN_FALSE;
}
@ -722,7 +722,7 @@ static int php_fbsql_select_db(char *databaseName, PHPFBLink *link TSRMLS_DC)
if (c == NULL)
{
if (FB_SQL_G(generateWarnings))
php_error(E_WARNING, fbcdcClassErrorMessage());
php_error(E_WARNING, "%s(): %s", get_active_function_name(TSRMLS_C), fbcdcClassErrorMessage());
return 0;
}
md = fbcdcCreateSession(c, "PHP", link->userName, link->userPassword, link->userName);
@ -733,9 +733,9 @@ static int php_fbsql_select_db(char *databaseName, PHPFBLink *link TSRMLS_DC)
if (FB_SQL_G(generateWarnings))
{
if (emg)
php_error(E_WARNING, emg);
php_error(E_WARNING, "%s(): %s", get_active_function_name(TSRMLS_C), emg);
else
php_error(E_WARNING, "No message");
php_error(E_WARNING, "%s(): No message", get_active_function_name(TSRMLS_C));
}
link->errorText = strdup(emg);
link->errorNo = fbcemdErrorCodeAtIndex(emd, 0);;
@ -1050,7 +1050,7 @@ static void php_fbsql_read_lob(INTERNAL_FUNCTION_PARAMETERS, int lob_type)
convert_to_string_ex(lob_handle);
if (Z_STRLEN_PP(lob_handle) != 27 || Z_STRVAL_PP(lob_handle)[0] != '@') {
if (FB_SQL_G(generateWarnings)) php_error(E_WARNING, "The handle is invalid");
if (FB_SQL_G(generateWarnings)) php_error(E_WARNING, "%s(): The handle is invalid", get_active_function_name(TSRMLS_C));
RETURN_FALSE;
}
@ -1113,7 +1113,7 @@ static void php_fbsql_lob_size(INTERNAL_FUNCTION_PARAMETERS, int lob_type)
convert_to_string_ex(lob_handle);
if (Z_STRLEN_PP(lob_handle) != 27 || Z_STRVAL_PP(lob_handle)[0] != '@') {
if (FB_SQL_G(generateWarnings)) php_error(E_WARNING, "The handle is invalid");
if (FB_SQL_G(generateWarnings)) php_error(E_WARNING, "%s(): The handle is invalid", get_active_function_name(TSRMLS_C));
RETURN_FALSE;
}
@ -1349,8 +1349,8 @@ PHP_FUNCTION(fbsql_select_db)
int port = atoi(name);
if (port == 0 || port > 64535) {
if (FB_SQL_G(generateWarnings)) {
php_error(E_WARNING, "Cannot connect to FBExec for database '%s'", name);
php_error(E_WARNING, fbcehClassErrorMessage());
php_error(E_WARNING, "%s(): Cannot connect to FBExec for database '%s'", get_active_function_name(TSRMLS_C), name);
php_error(E_WARNING, "%s(): %s", get_active_function_name(TSRMLS_C), fbcehClassErrorMessage());
}
RETURN_FALSE;
}
@ -1465,14 +1465,14 @@ PHP_FUNCTION(fbsql_create_db)
else if (status == FBStopping) txt = "stopping";
else if (status == FBNoExec ) txt = "no exec";
if (FB_SQL_G(generateWarnings))
php_error(E_WARNING, "Could not create %s@%s, database is %s", databaseName, phpLink->hostName, txt);
php_error(E_WARNING, "%s(): Could not create %s@%s, database is %s", get_active_function_name(TSRMLS_C), databaseName, phpLink->hostName, txt);
RETURN_FALSE;
}
if (!fbcehCreateDatabaseNamedWithOptions(phpLink->execHandler, databaseName, ""))
{
char* error = fbechErrorMessage(phpLink->execHandler);
if (FB_SQL_G(generateWarnings))
php_error(E_WARNING, "Could not create %s@%s. %s.", databaseName, phpLink->hostName, error);
php_error(E_WARNING, "%s(): Could not create %s@%s. %s.", get_active_function_name(TSRMLS_C), databaseName, phpLink->hostName, error);
RETURN_FALSE;
}
for (i=0; i < 20; i++)
@ -1488,7 +1488,7 @@ PHP_FUNCTION(fbsql_create_db)
if (status != FBRunning)
{
if (FB_SQL_G(generateWarnings))
php_error(E_WARNING, "Database %s@%s created -- status unknown", databaseName, phpLink->hostName);
php_error(E_WARNING, "%s(): Database %s@%s created -- status unknown", get_active_function_name(TSRMLS_C), databaseName, phpLink->hostName);
RETURN_FALSE;
}
RETURN_TRUE;
@ -1539,7 +1539,7 @@ PHP_FUNCTION(fbsql_drop_db)
else if (status == FBStopping ) txt = "stopping";
else if (status == FBNoExec ) txt = "no exec";
if (FB_SQL_G(generateWarnings))
php_error(E_WARNING, "Could not drop %s@%s, database is %s.", databaseName, phpLink->hostName, txt);
php_error(E_WARNING, "%s(): Could not drop %s@%s, database is %s.", get_active_function_name(TSRMLS_C), databaseName, phpLink->hostName, txt);
RETURN_FALSE;
}
@ -1547,7 +1547,7 @@ PHP_FUNCTION(fbsql_drop_db)
{
char* error = fbechErrorMessage(phpLink->execHandler);
if (FB_SQL_G(generateWarnings))
php_error(E_WARNING, "Could not drop %s@%s. %s.", databaseName, phpLink->hostName, error);
php_error(E_WARNING, "%s(): Could not drop %s@%s. %s.", get_active_function_name(TSRMLS_C), databaseName, phpLink->hostName, error);
RETURN_FALSE;
}
for (i=0; i < 20; i++)
@ -1563,7 +1563,7 @@ PHP_FUNCTION(fbsql_drop_db)
if (status != FBUnknownStatus)
{
if (FB_SQL_G(generateWarnings))
php_error(E_WARNING, "Database %s@%s dropped -- status unknown", databaseName, phpLink->hostName);
php_error(E_WARNING, "%s(): Database %s@%s dropped -- status unknown", get_active_function_name(TSRMLS_C), databaseName, phpLink->hostName);
RETURN_FALSE;
}
}
@ -1612,7 +1612,7 @@ PHP_FUNCTION(fbsql_start_db)
else if (status == FBStopping) txt = "stopping";
else if (status == FBNoExec ) txt = "no exec";
if (FB_SQL_G(generateWarnings))
php_error(E_WARNING, "Could not start %s@%s, as database is %s.", databaseName, phpLink->hostName, txt);
php_error(E_WARNING, "%s(): Could not start %s@%s, as database is %s.", get_active_function_name(TSRMLS_C), databaseName, phpLink->hostName, txt);
RETURN_FALSE;
}
@ -1622,7 +1622,7 @@ PHP_FUNCTION(fbsql_start_db)
{
char* error = fbechErrorMessage(phpLink->execHandler);
if (FB_SQL_G(generateWarnings))
php_error(E_WARNING, "Could not start %s@%s. %s.", databaseName, phpLink->hostName, error);
php_error(E_WARNING, "%s(): Could not start %s@%s. %s.", get_active_function_name(TSRMLS_C), databaseName, phpLink->hostName, error);
RETURN_FALSE;
}
}
@ -1640,7 +1640,7 @@ PHP_FUNCTION(fbsql_start_db)
if (status != FBRunning)
{
if (FB_SQL_G(generateWarnings))
php_error(E_WARNING, "Database %s@%s started -- status unknown", databaseName, phpLink->hostName);
php_error(E_WARNING, "%s(): Database %s@%s started -- status unknown", get_active_function_name(TSRMLS_C), databaseName, phpLink->hostName);
RETURN_FALSE;
}
RETURN_TRUE;
@ -1688,7 +1688,7 @@ PHP_FUNCTION(fbsql_stop_db)
if (!fbcdcStopDatabase(phpLink->connection))
{
if (FB_SQL_G(generateWarnings))
php_error(E_WARNING, "Cannot stop database %s@%s", databaseName, phpLink->hostName);
php_error(E_WARNING, "%s(): Cannot stop database %s@%s", get_active_function_name(TSRMLS_C), databaseName, phpLink->hostName);
RETURN_FALSE;
}
@ -1765,7 +1765,7 @@ int mdOk(PHPFBLink* link, FBCMetaData* md, char* sql)
{
link->errorNo = 1;
link->errorText = strdup("Connection to database server was lost");
if (FB_SQL_G(generateWarnings)) php_error(E_WARNING, link->errorText);
if (FB_SQL_G(generateWarnings)) php_error(E_WARNING, "%s(): %s", get_active_function_name(TSRMLS_C), link->errorText);
result = 0;
}
else if (fbcmdErrorsFound(md))
@ -1775,9 +1775,9 @@ int mdOk(PHPFBLink* link, FBCMetaData* md, char* sql)
if (FB_SQL_G(generateWarnings))
{
if (emg)
php_error(E_WARNING, "Error in statement: '%s' %s", sql, emg);
php_error(E_WARNING, "%s(): Error in statement: '%s' %s", get_active_function_name(TSRMLS_C), sql, emg);
else
php_error(E_WARNING, "No message");
php_error(E_WARNING, "%s(): No message", get_active_function_name(TSRMLS_C));
}
link->errorText = strdup(emg);
link->errorNo = fbcemdErrorCodeAtIndex(emd, 0);;
@ -2432,7 +2432,7 @@ void phpfbColumnAsString (PHPFBResult* result, int column, void* data , int* len
break;
default:
php_error(E_ERROR, "Unimplemented type");
php_error(E_ERROR, "%s(): Unimplemented type", get_active_function_name(TSRMLS_C));
break;
}
}
@ -2477,13 +2477,13 @@ void phpfbSqlResult(INTERNAL_FUNCTION_PARAMETERS, PHPFBResult* result, int rowIn
else if (!phpfbFetchRow(result, rowIndex))
{
if (FB_SQL_G(generateWarnings))
php_error(E_WARNING, "No such row %d in result set %d", rowIndex, rowIndex);
php_error(E_WARNING, "%s(): No such row %d in result set %d", get_active_function_name(TSRMLS_C), rowIndex, rowIndex);
RETURN_FALSE;
}
else if (columnIndex >= result->columnCount)
{
if (FB_SQL_G(generateWarnings))
php_error(E_WARNING, "No such column %d in result set %d", columnIndex, rowIndex);
php_error(E_WARNING, "%s(): No such column %d in result set %d", get_active_function_name(TSRMLS_C), columnIndex, rowIndex);
RETURN_FALSE;
}
else
@ -2564,7 +2564,7 @@ PHP_FUNCTION(fbsql_result)
if (columnIndex < 0)
{
if (FB_SQL_G(generateWarnings))
php_error(E_WARNING, "Illegal column index - %d", columnIndex);
php_error(E_WARNING, "%s(): Illegal column index - %d", get_active_function_name(TSRMLS_C), columnIndex);
RETURN_FALSE;
}
}
@ -2797,7 +2797,7 @@ static void php_fbsql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int result_type)
if (((result_type & FBSQL_NUM) != FBSQL_NUM) && ((result_type & FBSQL_ASSOC) != FBSQL_ASSOC))
{
if (FB_SQL_G(generateWarnings))
php_error(E_WARNING, "Illegal result type use FBSQL_NUM, FBSQL_ASSOC, or FBSQL_BOTH.");
php_error(E_WARNING, "%s(): Illegal result type use FBSQL_NUM, FBSQL_ASSOC, or FBSQL_BOTH.", get_active_function_name(TSRMLS_C));
RETURN_FALSE;
}
if (array_init(return_value)==FAILURE)
@ -2966,7 +2966,7 @@ PHP_FUNCTION(fbsql_data_seek)
if (rowIndex < 0)
{
if (FB_SQL_G(generateWarnings))
php_error(E_WARNING, "Illegal row_index (%i)", rowIndex);
php_error(E_WARNING, "%s(): Illegal row_index (%i)", get_active_function_name(TSRMLS_C), rowIndex);
RETURN_FALSE;
}
@ -3043,7 +3043,7 @@ PHP_FUNCTION(fbsql_fetch_field)
if (column < 0 || column >= result->columnCount)
{
if (FB_SQL_G(generateWarnings))
php_error(E_WARNING, "%d no such column in result", column);
php_error(E_WARNING, "%s(): %d no such column in result", get_active_function_name(TSRMLS_C), column);
RETURN_FALSE;
}
}
@ -3100,7 +3100,7 @@ PHP_FUNCTION(fbsql_field_seek)
if (column < 0 || column >= result->columnCount)
{
if (FB_SQL_G(generateWarnings))
php_error(E_WARNING, "%d no such column in result", column);
php_error(E_WARNING, "%s(): %d no such column in result", get_active_function_name(TSRMLS_C), column);
RETURN_FALSE;
}
}
@ -3143,7 +3143,7 @@ PHP_FUNCTION(fbsql_field_name)
if (column < 0 || column >= result->columnCount)
{
if (FB_SQL_G(generateWarnings))
php_error(E_WARNING, "%d no such column in result", column);
php_error(E_WARNING, "%s(): %d no such column in result", get_active_function_name(TSRMLS_C), column);
RETURN_FALSE;
}
}
@ -3192,7 +3192,7 @@ PHP_FUNCTION(fbsql_field_table)
if (column < 0 || column >= result->columnCount)
{
if (FB_SQL_G(generateWarnings))
php_error(E_WARNING, "%d no such column in result", column);
php_error(E_WARNING, "%s(): %d no such column in result", get_active_function_name(TSRMLS_C), column);
RETURN_FALSE;
}
}
@ -3233,7 +3233,7 @@ PHP_FUNCTION(fbsql_field_len)
if (column < 0 || column >= result->columnCount)
{
if (FB_SQL_G(generateWarnings))
php_error(E_WARNING, "%d no such column in result", column);
php_error(E_WARNING, "%s(): %d no such column in result", get_active_function_name(TSRMLS_C), column);
RETURN_FALSE;
}
}
@ -3285,7 +3285,7 @@ PHP_FUNCTION(fbsql_field_type)
if (column < 0 || column >= result->columnCount)
{
if (FB_SQL_G(generateWarnings))
php_error(E_WARNING, "%d no such column in result", column);
php_error(E_WARNING, "%s(): %d no such column in result", get_active_function_name(TSRMLS_C), column);
RETURN_FALSE;
}
}
@ -3339,7 +3339,7 @@ PHP_FUNCTION(fbsql_field_flags)
if (column < 0 || column >= result->columnCount)
{
if (FB_SQL_G(generateWarnings))
php_error(E_WARNING, "%d no such column in result", column);
php_error(E_WARNING, "%s(): %d no such column in result", get_active_function_name(TSRMLS_C), column);
RETURN_FALSE;
}
}
@ -3417,7 +3417,7 @@ PHP_FUNCTION(fbsql_table_name)
if (index < 0)
{
if (FB_SQL_G(generateWarnings))
php_error(E_WARNING, "Illegal index (%i)", index);
php_error(E_WARNING, "%s(): Illegal index (%i)", get_active_function_name(TSRMLS_C), index);
RETURN_FALSE;
}
@ -3483,7 +3483,7 @@ PHP_FUNCTION(fbsql_get_autostart_info)
ZEND_FETCH_RESOURCE2(phpLink, PHPFBLink *, fbsql_link_index, id, "FrontBase-Link", le_link, le_plink);
if (phpLink->execHandler == NULL) {
if (FB_SQL_G(generateWarnings)) php_error(E_WARNING, "No valid Exec handler available for this connection");
if (FB_SQL_G(generateWarnings)) php_error(E_WARNING, "%s(): No valid Exec handler available for this connection", get_active_function_name(TSRMLS_C));
RETURN_FALSE;
}
else {

34
ext/fdf/fdf.c
View File

@ -196,7 +196,7 @@ PHP_FUNCTION(fdf_open)
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 @@ PHP_FUNCTION(fdf_create)
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 @@ PHP_FUNCTION(fdf_get_value)
}
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 @@ PHP_FUNCTION(fdf_set_value)
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 @@ PHP_FUNCTION(fdf_next_field_name)
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 @@ PHP_FUNCTION(fdf_set_ap)
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 @@ PHP_FUNCTION(fdf_set_status)
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 @@ PHP_FUNCTION(fdf_get_status)
}
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 @@ PHP_FUNCTION(fdf_set_file)
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 @@ PHP_FUNCTION(fdf_get_file)
}
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 @@ PHP_FUNCTION(fdf_save)
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 @@ PHP_FUNCTION(fdf_add_template)
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 @@ PHP_FUNCTION(fdf_set_flags)
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 @@ PHP_FUNCTION(fdf_set_opt)
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 @@ PHP_FUNCTION(fdf_set_submit_form_action)
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 @@ PHP_FUNCTION(fdf_set_javascript_action)
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 @@ PHP_FUNCTION(fdf_set_encoding)
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;

20
ext/ftp/php_ftp.c
View File

@ -108,7 +108,7 @@ PHP_MINFO_FUNCTION(ftp)
#define XTYPE(xtype, mode) { \
if (mode != FTPTYPE_ASCII && mode != FTPTYPE_IMAGE) { \
php_error(E_WARNING, "%s(): mode must be FTP_ASCII or FTP_BINARY", get_active_function_name(TSRMLS_C)); \
php_error(E_WARNING, "%s(): Mode must be FTP_ASCII or FTP_BINARY", get_active_function_name(TSRMLS_C)); \
RETURN_FALSE; \
} \
xtype = mode; \
@ -129,7 +129,7 @@ PHP_FUNCTION(ftp_connect)
}
if (timeout_sec <= 0) {
php_error(E_WARNING, "%s(): timeout has to be greater than 0",
php_error(E_WARNING, "%s(): Timeout has to be greater than 0",
get_active_function_name(TSRMLS_C));
RETURN_FALSE;
}
@ -418,7 +418,7 @@ PHP_FUNCTION(ftp_fget)
}
if (php_stream_error(stream)) {
php_error(E_WARNING, "%s(): error writing %s", get_active_function_name(TSRMLS_C), Z_STRVAL_P(z_file));
php_error(E_WARNING, "%s(): Error writing %s", get_active_function_name(TSRMLS_C), Z_STRVAL_P(z_file));
RETURN_FALSE;
}
@ -476,7 +476,7 @@ PHP_FUNCTION(ftp_get)
if (!ftp_get(ftp, tmpstream, remote, xtype) || php_stream_error(tmpstream)) {
php_stream_close(tmpstream);
php_error(E_WARNING, "ftp_get: %s", ftp->inbuf);
php_error(E_WARNING, "%s(): %s", get_active_function_name(TSRMLS_C), ftp->inbuf);
RETURN_FALSE;
}
@ -484,13 +484,13 @@ PHP_FUNCTION(ftp_get)
if (outstream == NULL) {
php_stream_close(tmpstream);
php_error(E_WARNING, "%s(): error opening %s", get_active_function_name(TSRMLS_C), local);
php_error(E_WARNING, "%s(): Error opening %s", get_active_function_name(TSRMLS_C), local);
RETURN_FALSE;
}
php_stream_rewind(tmpstream);
if (php_stream_copy_to_stream(tmpstream, outstream, PHP_STREAM_COPY_ALL) == 0) {
php_error(E_WARNING, "%s(): error writing %s", get_active_function_name(TSRMLS_C), local);
php_error(E_WARNING, "%s(): Error writing %s", get_active_function_name(TSRMLS_C), local);
RETVAL_FALSE;
}
else
@ -713,12 +713,12 @@ PHP_FUNCTION(ftp_set_option)
switch (option) {
case PHP_FTP_OPT_TIMEOUT_SEC:
if (Z_TYPE_P(z_value) != IS_LONG) {
php_error(E_WARNING, "%s(): option TIMEOUT_SEC expects value of type long, %s given",
php_error(E_WARNING, "%s(): Option TIMEOUT_SEC expects value of type long, %s given",
get_active_function_name(TSRMLS_C), zend_zval_type_name(z_value));
RETURN_FALSE;
}
if (Z_LVAL_P(z_value) <= 0) {
php_error(E_WARNING, "%s(): timeout has to be greater than 0",
php_error(E_WARNING, "%s(): Timeout has to be greater than 0",
get_active_function_name(TSRMLS_C));
RETURN_FALSE;
}
@ -726,7 +726,7 @@ PHP_FUNCTION(ftp_set_option)
RETURN_TRUE;
break;
default:
php_error(E_WARNING, "%s(): unknown option '%d'", get_active_function_name(TSRMLS_C), option);
php_error(E_WARNING, "%s(): Unknown option '%d'", get_active_function_name(TSRMLS_C), option);
RETURN_FALSE;
break;
}
@ -752,7 +752,7 @@ PHP_FUNCTION(ftp_get_option)
RETURN_LONG(ftp->timeout_sec);
break;
default:
php_error(E_WARNING, "%s(): unknown option '%d'", get_active_function_name(TSRMLS_C), option);
php_error(E_WARNING, "%s(): Unknown option '%d'", get_active_function_name(TSRMLS_C), option);
RETURN_FALSE;
break;
}

Write Preview
Loading…
Cancel
Save