iliaa Wed May 18 18:40:56 2005 EDT
Modified files:
/php-src/ext/pdo php_pdo_driver.h
/php-src/ext/pdo_pgsql pgsql_driver.c pgsql_statement.c
/php-src/ext/pdo_mysql mysql_driver.c mysql_statement.c
Log:
Various compiler warning fixes.
http://cvs.php.net/diff.php/php-src/ext/pdo/php_pdo_driver.h?r1=1.56&r2=1.57&ty=u
Index: php-src/ext/pdo/php_pdo_driver.h
diff -u php-src/ext/pdo/php_pdo_driver.h:1.56
php-src/ext/pdo/php_pdo_driver.h:1.57
--- php-src/ext/pdo/php_pdo_driver.h:1.56 Mon Feb 28 17:37:13 2005
+++ php-src/ext/pdo/php_pdo_driver.h Wed May 18 18:40:55 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_pdo_driver.h,v 1.56 2005/02/28 22:37:13 helly Exp $ */
+/* $Id: php_pdo_driver.h,v 1.57 2005/05/18 22:40:55 iliaa Exp $ */
#ifndef PHP_PDO_DRIVER_H
#define PHP_PDO_DRIVER_H
@@ -105,7 +105,7 @@
PDO_FETCH_ORI_FIRST, /* scroll to the first row and fetch that */
PDO_FETCH_ORI_LAST, /* scroll to the last row and fetch
that */
PDO_FETCH_ORI_ABS, /* scroll to an absolute numbered row
and fetch that */
- PDO_FETCH_ORI_REL, /* scroll relative to the current row,
and fetch that */
+ PDO_FETCH_ORI_REL /* scroll relative to the current row,
and fetch that */
};
enum pdo_attribute_type {
@@ -132,7 +132,7 @@
enum pdo_cursor_type {
PDO_CURSOR_FWDONLY, /* forward only cursor (default) */
- PDO_CURSOR_SCROLL, /* scrollable cursor */
+ PDO_CURSOR_SCROLL /* scrollable cursor */
};
/* SQL-92 SQLSTATE error codes.
@@ -170,7 +170,7 @@
#define PDO_ERR_DISCONNECTED,
#define PDO_ERR_NO_PERM,
- PDO_ERR_CANT_MAP, /* no way to map native error to the
generic
+ PDO_ERR_CANT_MAP /* no way to map native error to the
generic
* codes; consult the
native error for more info */
};
#endif
@@ -178,7 +178,7 @@
enum pdo_error_mode {
PDO_ERRMODE_SILENT, /* just set error codes */
PDO_ERRMODE_WARNING, /* raise E_WARNING */
- PDO_ERRMODE_EXCEPTION, /* throw exceptions */
+ PDO_ERRMODE_EXCEPTION /* throw exceptions */
};
enum pdo_case_conversion {
@@ -327,7 +327,7 @@
PDO_PARAM_EVT_EXEC_PRE,
PDO_PARAM_EVT_EXEC_POST,
PDO_PARAM_EVT_FETCH_PRE,
- PDO_PARAM_EVT_FETCH_POST,
+ PDO_PARAM_EVT_FETCH_POST
};
typedef int (*pdo_stmt_param_hook_func)(pdo_stmt_t *stmt, struct
pdo_bound_param_data *param, enum pdo_param_event event_type TSRMLS_DC);
http://cvs.php.net/diff.php/php-src/ext/pdo_pgsql/pgsql_driver.c?r1=1.38&r2=1.39&ty=u
Index: php-src/ext/pdo_pgsql/pgsql_driver.c
diff -u php-src/ext/pdo_pgsql/pgsql_driver.c:1.38
php-src/ext/pdo_pgsql/pgsql_driver.c:1.39
--- php-src/ext/pdo_pgsql/pgsql_driver.c:1.38 Fri May 13 14:09:03 2005
+++ php-src/ext/pdo_pgsql/pgsql_driver.c Wed May 18 18:40:56 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pgsql_driver.c,v 1.38 2005/05/13 18:09:03 wez Exp $ */
+/* $Id: pgsql_driver.c,v 1.39 2005/05/18 22:40:56 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -215,7 +215,7 @@
/* TODO: if name != NULL, pull out last value for that sequence/column
*/
- *len = spprintf(&id, 0, "%ld", H->pgoid);
+ *len = spprintf(&id, 0, "%lld", H->pgoid);
return id;
}
http://cvs.php.net/diff.php/php-src/ext/pdo_pgsql/pgsql_statement.c?r1=1.21&r2=1.22&ty=u
Index: php-src/ext/pdo_pgsql/pgsql_statement.c
diff -u php-src/ext/pdo_pgsql/pgsql_statement.c:1.21
php-src/ext/pdo_pgsql/pgsql_statement.c:1.22
--- php-src/ext/pdo_pgsql/pgsql_statement.c:1.21 Fri May 13 14:09:03 2005
+++ php-src/ext/pdo_pgsql/pgsql_statement.c Wed May 18 18:40:56 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pgsql_statement.c,v 1.21 2005/05/13 18:09:03 wez Exp $ */
+/* $Id: pgsql_statement.c,v 1.22 2005/05/18 22:40:56 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -327,7 +327,6 @@
{
pdo_pgsql_stmt *S = (pdo_pgsql_stmt*)stmt->driver_data;
struct pdo_column_data *cols = stmt->columns;
- char *tmp_ptr;
size_t tmp_len;
if (!S->result) {
http://cvs.php.net/diff.php/php-src/ext/pdo_mysql/mysql_driver.c?r1=1.45&r2=1.46&ty=u
Index: php-src/ext/pdo_mysql/mysql_driver.c
diff -u php-src/ext/pdo_mysql/mysql_driver.c:1.45
php-src/ext/pdo_mysql/mysql_driver.c:1.46
--- php-src/ext/pdo_mysql/mysql_driver.c:1.45 Tue May 17 19:23:52 2005
+++ php-src/ext/pdo_mysql/mysql_driver.c Wed May 18 18:40:56 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mysql_driver.c,v 1.45 2005/05/17 23:23:52 iliaa Exp $ */
+/* $Id: mysql_driver.c,v 1.46 2005/05/18 22:40:56 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -46,7 +46,6 @@
pdo_mysql_db_handle *H = (pdo_mysql_db_handle *)dbh->driver_data;
pdo_error_type *pdo_err;
pdo_mysql_error_info *einfo;
- char *sqlstate = NULL;
if (stmt) {
pdo_mysql_stmt *S = (pdo_mysql_stmt*)stmt->driver_data;
http://cvs.php.net/diff.php/php-src/ext/pdo_mysql/mysql_statement.c?r1=1.24&r2=1.25&ty=u
Index: php-src/ext/pdo_mysql/mysql_statement.c
diff -u php-src/ext/pdo_mysql/mysql_statement.c:1.24
php-src/ext/pdo_mysql/mysql_statement.c:1.25
--- php-src/ext/pdo_mysql/mysql_statement.c:1.24 Tue Apr 19 16:53:54 2005
+++ php-src/ext/pdo_mysql/mysql_statement.c Wed May 18 18:40:56 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mysql_statement.c,v 1.24 2005/04/19 20:53:54 iliaa Exp $ */
+/* $Id: mysql_statement.c,v 1.25 2005/05/18 22:40:56 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -115,7 +115,6 @@
static int pdo_mysql_stmt_describe(pdo_stmt_t *stmt, int colno TSRMLS_DC)
{
pdo_mysql_stmt *S = (pdo_mysql_stmt*)stmt->driver_data;
- MYSQL_RES *R = S->result;
struct pdo_column_data *cols = stmt->columns;
unsigned int i;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
