[prev in list] [next in list] [prev in thread] [next in thread] 

List:       pecl-cvs
Subject:    [PECL-CVS] cvs: pecl /pdo_pgsql pgsql_driver.c
From:       "Marcus Boerger" <helly () php ! net>
Date:       2004-07-28 0:51:48
Message-ID: cvshelly1090975908 () cvsserver
[Download RAW message or body]

helly		Tue Jul 27 20:51:48 2004 EDT

  Modified files:              
    /pecl/pdo_pgsql	pgsql_driver.c 
  Log:
  - Trim error messages
  
http://cvs.php.net/diff.php/pecl/pdo_pgsql/pgsql_driver.c?r1=1.20&r2=1.21&ty=u
Index: pecl/pdo_pgsql/pgsql_driver.c
diff -u pecl/pdo_pgsql/pgsql_driver.c:1.20 pecl/pdo_pgsql/pgsql_driver.c:1.21
--- pecl/pdo_pgsql/pgsql_driver.c:1.20	Tue Jul 27 20:40:01 2004
+++ pecl/pdo_pgsql/pgsql_driver.c	Tue Jul 27 20:51:48 2004
@@ -16,7 +16,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: pgsql_driver.c,v 1.20 2004/07/28 00:40:01 helly Exp $ */
+/* $Id: pgsql_driver.c,v 1.21 2004/07/28 00:51:48 helly Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -33,6 +33,20 @@
 #include "php_pdo_pgsql_int.h"
 #include "zend_exceptions.h"
 
+static char * _pdo_pgsql_trim_message(const char *message)
+{
+	register int i = strlen(message)-1;
+
+	if (i>1 && (message[i-1] == '\r' || message[i-1] == '\n') && message[i] == '.') {
+		--i;
+	}
+	while (i>0 && (message[i] == '\r' || message[i] == '\n')) {
+		--i;
+	}
+	++i;
+	return estrndup(message, i);
+}
+
 int _pdo_pgsql_error(pdo_dbh_t *dbh, pdo_stmt_t *stmt, int errcode, const char \
*file, int line TSRMLS_DC) /* {{{ */  {
 	pdo_pgsql_db_handle *H = (pdo_pgsql_db_handle *)dbh->driver_data;
@@ -60,7 +74,7 @@
 	}
 
 	if (errmsg) {
-		einfo->errmsg = estrdup(errmsg);
+		einfo->errmsg = _pdo_pgsql_trim_message(errmsg);
 	}
 
 	if (!dbh->methods) {

-- 
PECL CVS Mailing List 
To unsubscribe, visit: http://www.php.net/unsub.php


[prev in list] [next in list] [prev in thread] [next in thread]