cvs: php-src(PHP_4_3) /ext/sybase_ct php_sybase_ct.c
| From: | Andrey Hristov | Date: | Thu, 28 Aug 2003 20:29:14 +0000 |
| Subject: | cvs: php-src(PHP_4_3) /ext/sybase_ct php_sybase_ct.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-23476@lists.php.net to get a copy of this message | ||
andrey Thu Aug 28 16:29:14 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/sybase_ct php_sybase_ct.c
Log:
format string fix and \n at the end of the message is not needed
Index: php-src/ext/sybase_ct/php_sybase_ct.c
diff -u php-src/ext/sybase_ct/php_sybase_ct.c:1.73.2.7
php-src/ext/sybase_ct/php_sybase_ct.c:1.73.2.8
--- php-src/ext/sybase_ct/php_sybase_ct.c:1.73.2.7 Thu Aug 28 12:31:51 2003
+++ php-src/ext/sybase_ct/php_sybase_ct.c Thu Aug 28 16:29:13 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_sybase_ct.c,v 1.73.2.7 2003/08/28 16:31:51 sniper Exp $ */
+/* $Id: php_sybase_ct.c,v 1.73.2.8 2003/08/28 20:29:13 andrey Exp $ */
#ifdef HAVE_CONFIG_H
@@ -1437,7 +1437,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: %d],
giving up\n", deadlock_count- 1, SybCtG(deadlock_retry_count));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Sybase: Retried deadlock %d times [max: %d],
giving up", deadlock_count- 1, SybCtG(deadlock_retry_count));
if (result != NULL) {
_free_sybase_result(result);
}
@@ -1904,7 +1904,7 @@
}
if (Z_LVAL_PP(row) < 0 || Z_LVAL_PP(row) >= result->num_rows) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Sybase: Bad row offset (%d)",
Z_LVAL_PP(row));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Sybase: Bad row offset (%ld)",
Z_LVAL_PP(row));
RETURN_FALSE;
}