felipe Sat Mar 22 20:37:08 2008 UTC
Modified files:
/php-src/ext/pdo pdo_sql_parser.re
/php-src/ext/pdo_sqlite sqlite_statement.c
/php-src/ext/sqlite pdo_sqlite2.c
/php-src/ext/standard exec.c
Log:
- Fixed compilation warnings
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_sql_parser.re?r1=1.43&r2=1.44&diff_format=u
Index: php-src/ext/pdo/pdo_sql_parser.re
diff -u php-src/ext/pdo/pdo_sql_parser.re:1.43
php-src/ext/pdo/pdo_sql_parser.re:1.44
--- php-src/ext/pdo/pdo_sql_parser.re:1.43 Mon Dec 31 07:09:33 2007
+++ php-src/ext/pdo/pdo_sql_parser.re Sat Mar 22 20:37:08 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pdo_sql_parser.re,v 1.43 2007/12/31 07:09:33 sebastian Exp $ */
+/* $Id: pdo_sql_parser.re,v 1.44 2008/03/22 20:37:08 felipe Exp $ */
#include "php.h"
#include "php_pdo_driver.h"
@@ -205,7 +205,7 @@
size_t len;
char *buf = NULL;
- len =
php_stream_copy_to_mem(stm, &buf, PHP_STREAM_COPY_ALL, 0);
+ len =
php_stream_copy_to_mem(stm, (void *)&buf, PHP_STREAM_COPY_ALL, 0);
if
(!stmt->dbh->methods->quoter(stmt->dbh, buf, len, &plc->quoted, &plc->qlen,
param->param_type TSRMLS_CC)) {
/* bork */
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/sqlite_statement.c?r1=1.25&r2=1.26&diff_format=u
Index: php-src/ext/pdo_sqlite/sqlite_statement.c
diff -u php-src/ext/pdo_sqlite/sqlite_statement.c:1.25
php-src/ext/pdo_sqlite/sqlite_statement.c:1.26
--- php-src/ext/pdo_sqlite/sqlite_statement.c:1.25 Fri Mar 7 17:02:48 2008
+++ php-src/ext/pdo_sqlite/sqlite_statement.c Sat Mar 22 20:37:08 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sqlite_statement.c,v 1.25 2008/03/07 17:02:48 scottmac Exp $ */
+/* $Id: sqlite_statement.c,v 1.26 2008/03/22 20:37:08 felipe Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -127,7 +127,7 @@
SEPARATE_ZVAL(¶m->parameter);
Z_TYPE_P(param->parameter) = IS_STRING;
Z_STRLEN_P(param->parameter) = php_stream_copy_to_mem(stm,
-
&Z_STRVAL_P(param->parameter), PHP_STREAM_COPY_ALL, 0);
+ (void
*)&Z_STRVAL_P(param->parameter), PHP_STREAM_COPY_ALL, 0);
} else {
pdo_raise_impl_error(stmt->dbh, stmt, "HY105", "Expected a stream resource"
TSRMLS_CC);
return 0;
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite/pdo_sqlite2.c?r1=1.17&r2=1.18&diff_format=u
Index: php-src/ext/sqlite/pdo_sqlite2.c
diff -u php-src/ext/sqlite/pdo_sqlite2.c:1.17
php-src/ext/sqlite/pdo_sqlite2.c:1.18
--- php-src/ext/sqlite/pdo_sqlite2.c:1.17 Mon Dec 31 07:12:15 2007
+++ php-src/ext/sqlite/pdo_sqlite2.c Sat Mar 22 20:37:08 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pdo_sqlite2.c,v 1.17 2007/12/31 07:12:15 sebastian Exp $ */
+/* $Id: pdo_sqlite2.c,v 1.18 2008/03/22 20:37:08 felipe Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
@@ -374,7 +374,7 @@
}
}
-static char *pdo_sqlite2_last_insert_id(pdo_dbh_t *dbh, const char *name,
unsigned int *len TSRMLS_DC)
+static char *pdo_sqlite2_last_insert_id(pdo_dbh_t *dbh, const char *name, int
*len TSRMLS_DC)
{
pdo_sqlite2_db_handle *H = (pdo_sqlite2_db_handle *)dbh->driver_data;
char *id;
@@ -515,7 +515,8 @@
pdo_sqlite2_fetch_error_func,
pdo_sqlite2_get_attribute,
NULL, /* check_liveness: not needed */
- get_driver_methods
+ get_driver_methods,
+ NULL
};
static char *make_filename_safe(const char *filename TSRMLS_DC)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/exec.c?r1=1.130&r2=1.131&diff_format=u
Index: php-src/ext/standard/exec.c
diff -u php-src/ext/standard/exec.c:1.130 php-src/ext/standard/exec.c:1.131
--- php-src/ext/standard/exec.c:1.130 Fri Mar 21 08:28:09 2008
+++ php-src/ext/standard/exec.c Sat Mar 22 20:37:08 2008
@@ -16,7 +16,7 @@
| Ilia Alshanetsky <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: exec.c,v 1.130 2008/03/21 08:28:09 tony2001 Exp $ */
+/* $Id: exec.c,v 1.131 2008/03/22 20:37:08 felipe Exp $ */
#include <stdio.h>
#include "php.h"
@@ -484,7 +484,7 @@
}
stream = php_stream_fopen_from_pipe(in, "rb");
- total_readbytes = php_stream_copy_to_mem(stream, &ret,
PHP_STREAM_COPY_ALL, 0);
+ total_readbytes = php_stream_copy_to_mem(stream, (void *)&ret,
PHP_STREAM_COPY_ALL, 0);
php_stream_close(stream);
if (total_readbytes > 0) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
