sniper Thu Aug 18 09:34:09 2005 EDT Modified files: /php-src/ext/oci8 oci8.c /php-src/ext/openssl openssl.c /php-src/ext/oracle oracle.c /php-src/ext/pcre php_pcre.c /php-src/ext/session mod_files.c /php-src/ext/simplexml simplexml.c /php-src/ext/snmp winsnmp.c /php-src/ext/standard assert.c php_fopen_wrapper.c /php-src/ext/sybase_ct php_sybase_ct.c Log: Nuked EOLs from error messages
http://cvs.php.net/diff.php/php-src/ext/oci8/oci8.c?r1=1.269&r2=1.270&ty=u Index: php-src/ext/oci8/oci8.c diff -u php-src/ext/oci8/oci8.c:1.269 php-src/ext/oci8/oci8.c:1.270 --- php-src/ext/oci8/oci8.c:1.269 Wed Aug 3 10:07:32 2005 +++ php-src/ext/oci8/oci8.c Thu Aug 18 09:33:54 2005 @@ -22,7 +22,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: oci8.c,v 1.269 2005/08/03 14:07:32 sniper Exp $ */ +/* $Id: oci8.c,v 1.270 2005/08/18 13:33:54 sniper Exp $ */ /* TODO list: * @@ -126,7 +126,7 @@ #define CALL_OCI(call) \ { \ if (OCI(in_call)) { \ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "OCI8 Recursive call!\n"); \ + php_error_docref(NULL TSRMLS_CC, E_WARNING, "OCI8 Recursive call!"); \ exit(-1); \ } else { \ OCI(in_call)=1; \ @@ -139,7 +139,7 @@ { \ if (OCI(in_call)) { \ retcode=-1; \ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "OCI8 Recursive call!\n"); \ + php_error_docref(NULL TSRMLS_CC, E_WARNING, "OCI8 Recursive call!"); \ exit(-1); \ } else { \ OCI(in_call)=1; \ @@ -786,7 +786,7 @@ php_info_print_table_start(); php_info_print_table_row(2, "OCI8 Support", "enabled"); - php_info_print_table_row(2, "Revision", "$Revision: 1.269 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.270 $"); sprintf(buf, "%ld", num_persistent); php_info_print_table_row(2, "Active Persistent Links", buf); http://cvs.php.net/diff.php/php-src/ext/openssl/openssl.c?r1=1.98&r2=1.99&ty=u Index: php-src/ext/openssl/openssl.c diff -u php-src/ext/openssl/openssl.c:1.98 php-src/ext/openssl/openssl.c:1.99 --- php-src/ext/openssl/openssl.c:1.98 Wed Aug 3 10:07:35 2005 +++ php-src/ext/openssl/openssl.c Thu Aug 18 09:33:58 2005 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: openssl.c,v 1.98 2005/08/03 14:07:35 sniper Exp $ */ +/* $Id: openssl.c,v 1.99 2005/08/18 13:33:58 sniper Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -3274,7 +3274,7 @@ if (cafile || capath) { if (!SSL_CTX_load_verify_locations(ctx, cafile, capath)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to set verify locations `%s' `%s'\n", cafile, capath); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to set verify locations `%s' `%s'", cafile, capath); return NULL; } } http://cvs.php.net/diff.php/php-src/ext/oracle/oracle.c?r1=1.95&r2=1.96&ty=u Index: php-src/ext/oracle/oracle.c diff -u php-src/ext/oracle/oracle.c:1.95 php-src/ext/oracle/oracle.c:1.96 --- php-src/ext/oracle/oracle.c:1.95 Wed Aug 3 10:07:36 2005 +++ php-src/ext/oracle/oracle.c Thu Aug 18 09:33:59 2005 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: oracle.c,v 1.95 2005/08/03 14:07:36 sniper Exp $ */ +/* $Id: oracle.c,v 1.96 2005/08/18 13:33:59 sniper Exp $ */ /* comment out the next line if you're on Oracle 7.x and don't have the olog call. */ @@ -565,7 +565,7 @@ #endif ) { ORA(db_err_conn) = *db_conn; - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Oracle: Connection Failed: %s\n",ora_error(&db_conn->lda)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Oracle: Connection Failed: %s",ora_error(&db_conn->lda)); efree(hashed_details); efree(db_conn); RETURN_FALSE; http://cvs.php.net/diff.php/php-src/ext/pcre/php_pcre.c?r1=1.168&r2=1.169&ty=u Index: php-src/ext/pcre/php_pcre.c diff -u php-src/ext/pcre/php_pcre.c:1.168 php-src/ext/pcre/php_pcre.c:1.169 --- php-src/ext/pcre/php_pcre.c:1.168 Wed Aug 3 10:07:37 2005 +++ php-src/ext/pcre/php_pcre.c Thu Aug 18 09:34:00 2005 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_pcre.c,v 1.168 2005/08/03 14:07:37 sniper Exp $ */ +/* $Id: php_pcre.c,v 1.169 2005/08/18 13:34:00 sniper Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -792,7 +792,7 @@ /* Run the code */ if (zend_eval_string(code.c, &retval, compiled_string_description TSRMLS_CC) == FAILURE) { efree(compiled_string_description); - php_error_docref(NULL TSRMLS_CC,E_ERROR, "Failed evaluating code:\n%s", code.c); + php_error_docref(NULL TSRMLS_CC,E_ERROR, "Failed evaluating code: %s%s", PHP_EOL, code.c); /* zend_error() does not return in this case */ } efree(compiled_string_description); http://cvs.php.net/diff.php/php-src/ext/session/mod_files.c?r1=1.100&r2=1.101&ty=u Index: php-src/ext/session/mod_files.c diff -u php-src/ext/session/mod_files.c:1.100 php-src/ext/session/mod_files.c:1.101 --- php-src/ext/session/mod_files.c:1.100 Wed Aug 3 10:07:43 2005 +++ php-src/ext/session/mod_files.c Thu Aug 18 09:34:01 2005 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: mod_files.c,v 1.100 2005/08/03 14:07:43 sniper Exp $ */ +/* $Id: mod_files.c,v 1.101 2005/08/18 13:34:01 sniper Exp $ */ #include "php.h" @@ -193,7 +193,7 @@ dir = opendir(dirname); if (!dir) { - php_error_docref(NULL TSRMLS_CC, E_NOTICE, "ps_files_cleanup_dir: opendir(%s) failed: %s (%d)\n", dirname, strerror(errno), errno); + php_error_docref(NULL TSRMLS_CC, E_NOTICE, "ps_files_cleanup_dir: opendir(%s) failed: %s (%d)", dirname, strerror(errno), errno); return (0); } http://cvs.php.net/diff.php/php-src/ext/simplexml/simplexml.c?r1=1.156&r2=1.157&ty=u Index: php-src/ext/simplexml/simplexml.c diff -u php-src/ext/simplexml/simplexml.c:1.156 php-src/ext/simplexml/simplexml.c:1.157 --- php-src/ext/simplexml/simplexml.c:1.156 Tue Aug 16 11:09:44 2005 +++ php-src/ext/simplexml/simplexml.c Thu Aug 18 09:34:01 2005 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: simplexml.c,v 1.156 2005/08/16 15:09:44 dmitry Exp $ */ +/* $Id: simplexml.c,v 1.157 2005/08/18 13:34:01 sniper Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -421,7 +421,7 @@ } change_node_zval(newnode, value TSRMLS_CC); } else if (counter > 1) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot assign to an array of nodes (duplicate subnodes or attr detected)\n"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot assign to an array of nodes (duplicate subnodes or attr detected)"); } else { if (attribs) { switch (Z_TYPE_P(value)) { @@ -1763,7 +1763,7 @@ { php_info_print_table_start(); php_info_print_table_header(2, "Simplexml support", "enabled"); - php_info_print_table_row(2, "Revision", "$Revision: 1.156 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.157 $"); php_info_print_table_row(2, "Schema support", #ifdef LIBXML_SCHEMAS_ENABLED "enabled"); http://cvs.php.net/diff.php/php-src/ext/snmp/winsnmp.c?r1=1.16&r2=1.17&ty=u Index: php-src/ext/snmp/winsnmp.c diff -u php-src/ext/snmp/winsnmp.c:1.16 php-src/ext/snmp/winsnmp.c:1.17 --- php-src/ext/snmp/winsnmp.c:1.16 Mon Feb 17 08:29:57 2003 +++ php-src/ext/snmp/winsnmp.c Thu Aug 18 09:34:02 2005 @@ -100,7 +100,7 @@ for the session are also required. */ if ((session = SnmpMgrOpen(agent, community, timeout, retries)) == NULL){ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "error on SnmpMgrOpen %d\n", GetLastError()); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "error on SnmpMgrOpen %d", GetLastError()); } /* Determine and perform the requested operation.*/ @@ -119,12 +119,12 @@ if (!SnmpMgrRequest(session, requestType, &variableBindings, &errorStatus, &errorIndex)){ /* The API is indicating an error. */ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "error on SnmpMgrRequest %d\n", GetLastError()); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "error on SnmpMgrRequest %d", GetLastError()); } else { /* The API succeeded, errors may be indicated from the remote agent. */ if (errorStatus > 0){ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error: errorStatus=%d, errorIndex=%d\n", + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error: errorStatus=%d, errorIndex=%d", errorStatus, errorIndex); } else { /* Display the resulting variable bindings.*/ @@ -165,7 +165,7 @@ if (!SnmpMgrRequest(session, requestType, &variableBindings, &errorStatus, &errorIndex)){ /* The API is indicating an error.*/ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "error on SnmpMgrRequest %d\n", GetLastError()); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "error on SnmpMgrRequest %d", GetLastError()); break; } else @@ -183,7 +183,7 @@ /* Test for general error conditions or sucesss. */ if (errorStatus > 0){ - php_error_docref(NULL TSRMLS_CC, E_ERROR,"Error: errorStatus=%d, errorIndex=%d \n", errorStatus, errorIndex); + php_error_docref(NULL TSRMLS_CC, E_ERROR,"Error: errorStatus=%d, errorIndex=%d", errorStatus, errorIndex); break; } else @@ -218,7 +218,7 @@ /* Close SNMP session with the remote agent.*/ if (!SnmpMgrClose(session)){ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "error on SnmpMgrClose %d\n", GetLastError()); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "error on SnmpMgrClose %d", GetLastError()); } } /* }}} */ http://cvs.php.net/diff.php/php-src/ext/standard/assert.c?r1=1.61&r2=1.62&ty=u Index: php-src/ext/standard/assert.c diff -u php-src/ext/standard/assert.c:1.61 php-src/ext/standard/assert.c:1.62 --- php-src/ext/standard/assert.c:1.61 Thu Aug 11 19:35:57 2005 +++ php-src/ext/standard/assert.c Thu Aug 18 09:34:02 2005 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: assert.c,v 1.61 2005/08/11 23:35:57 andrei Exp $ */ +/* $Id: assert.c,v 1.62 2005/08/18 13:34:02 sniper Exp $ */ /* {{{ includes/startup/misc */ @@ -161,7 +161,7 @@ compiled_string_description = zend_make_compiled_string_description("assert code" TSRMLS_CC); if (zend_eval_string(myeval, &retval, compiled_string_description TSRMLS_CC) == FAILURE) { efree(compiled_string_description); - php_error_docref(NULL TSRMLS_CC, E_ERROR, "Failure evaluating code:\n%s", myeval); + php_error_docref(NULL TSRMLS_CC, E_ERROR, "Failure evaluating code: %s%s", PHP_EOL, myeval); /* php_error_docref() does not return in this case. */ } if (free_tmp) { http://cvs.php.net/diff.php/php-src/ext/standard/php_fopen_wrapper.c?r1=1.45&r2=1.46&ty=u Index: php-src/ext/standard/php_fopen_wrapper.c diff -u php-src/ext/standard/php_fopen_wrapper.c:1.45 php-src/ext/standard/php_fopen_wrapper.c:1.46 --- php-src/ext/standard/php_fopen_wrapper.c:1.45 Wed Aug 3 10:08:09 2005 +++ php-src/ext/standard/php_fopen_wrapper.c Thu Aug 18 09:34:04 2005 @@ -17,7 +17,7 @@ | Hartmut Holzgraefe <[EMAIL PROTECTED]> | +----------------------------------------------------------------------+ */ -/* $Id: php_fopen_wrapper.c,v 1.45 2005/08/03 14:08:09 sniper Exp $ */ +/* $Id: php_fopen_wrapper.c,v 1.46 2005/08/18 13:34:04 sniper Exp $ */ #include <stdio.h> #include <stdlib.h> @@ -132,14 +132,14 @@ if ((temp_filter = php_stream_filter_create(p, NULL, php_stream_is_persistent(stream) TSRMLS_CC))) { php_stream_filter_append(&stream->readfilters, temp_filter); } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to create filter (%s)\n", p); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to create filter (%s)", p); } } if (write_chain) { if ((temp_filter = php_stream_filter_create(p, NULL, php_stream_is_persistent(stream) TSRMLS_CC))) { php_stream_filter_append(&stream->writefilters, temp_filter); } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to create filter (%s)\n", p); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to create filter (%s)", p); } } p = php_strtok_r(NULL, "|", &token); http://cvs.php.net/diff.php/php-src/ext/sybase_ct/php_sybase_ct.c?r1=1.103&r2=1.104&ty=u Index: php-src/ext/sybase_ct/php_sybase_ct.c diff -u php-src/ext/sybase_ct/php_sybase_ct.c:1.103 php-src/ext/sybase_ct/php_sybase_ct.c:1.104 --- php-src/ext/sybase_ct/php_sybase_ct.c:1.103 Sat Aug 6 01:42:51 2005 +++ php-src/ext/sybase_ct/php_sybase_ct.c Thu Aug 18 09:34:04 2005 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_sybase_ct.c,v 1.103 2005/08/06 05:42:51 fmk Exp $ */ +/* $Id: php_sybase_ct.c,v 1.104 2005/08/18 13:34:04 sniper Exp $ */ #ifdef HAVE_CONFIG_H @@ -1577,7 +1577,7 @@ /* Retry deadlocks up until deadlock_retry_count times */ if (sybase_ptr->deadlock && SybCtG(deadlock_retry_count) != -1 && ++deadlock_count > SybCtG(deadlock_retry_count)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Sybase: Retried deadlock %d times [max: %ld], giving up\n", deadlock_count- 1, SybCtG(deadlock_retry_count)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Sybase: Retried deadlock %d times [max: %ld], giving up", deadlock_count- 1, SybCtG(deadlock_retry_count)); if (result != NULL) { _free_sybase_result(result); } @@ -1654,7 +1654,7 @@ /* Did we fetch up until the end? */ if (result->last_retcode != CS_END_DATA && result->last_retcode != CS_END_RESULTS) { - /* php_error_docref(NULL TSRMLS_CC, E_WARNING, "Sybase: Cancelling the rest of the results\n"); */ + /* php_error_docref(NULL TSRMLS_CC, E_WARNING, "Sybase: Cancelling the rest of the results"); */ ct_cancel(NULL, result->sybase_ptr->cmd, CS_CANCEL_ALL); php_sybase_finish_results(result); }
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php