iliaa Thu Nov 16 17:33:39 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/mbstring/libmbfl/filters mbfilter_cp51932.c
/php-src/ext/pdo_firebird firebird_driver.c
/php-src/ext/pdo_pgsql pgsql_statement.c
Log:
Fixed compiler warnings
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/libmbfl/filters/mbfilter_cp51932.c?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/mbstring/libmbfl/filters/mbfilter_cp51932.c
diff -u php-src/ext/mbstring/libmbfl/filters/mbfilter_cp51932.c:1.1.2.1
php-src/ext/mbstring/libmbfl/filters/mbfilter_cp51932.c:1.1.2.2
--- php-src/ext/mbstring/libmbfl/filters/mbfilter_cp51932.c:1.1.2.1 Fri Nov
3 01:11:35 2006
+++ php-src/ext/mbstring/libmbfl/filters/mbfilter_cp51932.c Thu Nov 16
17:33:39 2006
@@ -111,7 +111,7 @@
int
mbfl_filt_conv_cp51932_wchar(int c, mbfl_convert_filter *filter)
{
- int c1, s, w, n;
+ int c1, s, w;
switch (filter->status) {
case 0:
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_firebird/firebird_driver.c?r1=1.17.2.2&r2=1.17.2.2.2.1&diff_format=u
Index: php-src/ext/pdo_firebird/firebird_driver.c
diff -u php-src/ext/pdo_firebird/firebird_driver.c:1.17.2.2
php-src/ext/pdo_firebird/firebird_driver.c:1.17.2.2.2.1
--- php-src/ext/pdo_firebird/firebird_driver.c:1.17.2.2 Sun Jan 1 12:50:11 2006
+++ php-src/ext/pdo_firebird/firebird_driver.c Thu Nov 16 17:33:39 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: firebird_driver.c,v 1.17.2.2 2006/01/01 12:50:11 sniper Exp $ */
+/* $Id: firebird_driver.c,v 1.17.2.2.2.1 2006/11/16 17:33:39 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -38,8 +38,10 @@
/* map driver specific error message to PDO error */
void _firebird_error(pdo_dbh_t *dbh, pdo_stmt_t *stmt, char const *file, long
line TSRMLS_DC) /* {{{ */
{
+#if 0
pdo_firebird_db_handle *H = stmt ? ((pdo_firebird_stmt
*)stmt->driver_data)->H
: (pdo_firebird_db_handle *)dbh->driver_data;
+#endif
pdo_error_type *const error_code = stmt ? &stmt->error_code :
&dbh->error_code;
#if 0
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_pgsql/pgsql_statement.c?r1=1.31.2.12.2.3&r2=1.31.2.12.2.4&diff_format=u
Index: php-src/ext/pdo_pgsql/pgsql_statement.c
diff -u php-src/ext/pdo_pgsql/pgsql_statement.c:1.31.2.12.2.3
php-src/ext/pdo_pgsql/pgsql_statement.c:1.31.2.12.2.4
--- php-src/ext/pdo_pgsql/pgsql_statement.c:1.31.2.12.2.3 Tue Sep 19
15:45:21 2006
+++ php-src/ext/pdo_pgsql/pgsql_statement.c Thu Nov 16 17:33:39 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pgsql_statement.c,v 1.31.2.12.2.3 2006/09/19 15:45:21 iliaa Exp $ */
+/* $Id: pgsql_statement.c,v 1.31.2.12.2.4 2006/11/16 17:33:39 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -215,8 +215,9 @@
static int pgsql_stmt_param_hook(pdo_stmt_t *stmt, struct pdo_bound_param_data
*param,
enum pdo_param_event event_type TSRMLS_DC)
{
- pdo_pgsql_stmt *S = (pdo_pgsql_stmt*)stmt->driver_data;
#if HAVE_PQPREPARE
+ pdo_pgsql_stmt *S = (pdo_pgsql_stmt*)stmt->driver_data;
+
if (S->stmt_name && param->is_param) {
switch (event_type) {
case PDO_PARAM_EVT_FREE:
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
