abies Wed Feb 25 15:16:29 2004 EDT
Modified files:
/php-src/ext/bcmath bcmath.c
/php-src/ext/ftp php_ftp.c
/php-src/ext/mysqli mysqli_nonapi.c mysqli_report.c
/php-src/ext/oci8 oci8.c
/php-src/ext/soap soap.c
/php-src/ext/spl spl_iterators.c
/php-src/ext/sqlite sqlite.c
/php-src/ext/standard dir.c file.c streamsfuncs.c string.c
sunfuncs.c var.c
/php-src/ext/w32api w32api.c
/php-src/ext/pgsql pgsql.c
Log:
Wordsize fixes
http://cvs.php.net/diff.php/php-src/ext/bcmath/bcmath.c?r1=1.58&r2=1.59&ty=u
Index: php-src/ext/bcmath/bcmath.c
diff -u php-src/ext/bcmath/bcmath.c:1.58 php-src/ext/bcmath/bcmath.c:1.59
--- php-src/ext/bcmath/bcmath.c:1.58 Thu Jan 8 03:14:16 2004
+++ php-src/ext/bcmath/bcmath.c Wed Feb 25 15:16:15 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: bcmath.c,v 1.58 2004/01/08 08:14:16 andi Exp $ */
+/* $Id: bcmath.c,v 1.59 2004/02/25 20:16:15 abies Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -367,7 +367,7 @@
char *left, *right, *modulous;
int left_len, right_len, modulous_len;
bc_num first, second, mod, result;
- int scale = BCG(bc_precision);
+ long scale = BCG(bc_precision);
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sss|l", &left,
&left_len, &right, &right_len, &modulous, &modulous_len, &scale) == FAILURE) {
WRONG_PARAM_COUNT;
http://cvs.php.net/diff.php/php-src/ext/ftp/php_ftp.c?r1=1.99&r2=1.100&ty=u
Index: php-src/ext/ftp/php_ftp.c
diff -u php-src/ext/ftp/php_ftp.c:1.99 php-src/ext/ftp/php_ftp.c:1.100
--- php-src/ext/ftp/php_ftp.c:1.99 Thu Jan 8 03:15:27 2004
+++ php-src/ext/ftp/php_ftp.c Wed Feb 25 15:16:21 2004
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_ftp.c,v 1.99 2004/01/08 08:15:27 andi Exp $ */
+/* $Id: php_ftp.c,v 1.100 2004/02/25 20:16:21 abies Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -444,7 +444,7 @@
{
zval *z_ftp, *zresponse = NULL;
ftpbuf_t *ftp;
- int size, ret;
+ long size, ret;
char *response = NULL;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl|z", &z_ftp, &size,
&zresponse) == FAILURE) {
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_nonapi.c?r1=1.31&r2=1.32&ty=u
Index: php-src/ext/mysqli/mysqli_nonapi.c
diff -u php-src/ext/mysqli/mysqli_nonapi.c:1.31 php-src/ext/mysqli/mysqli_nonapi.c:1.32
--- php-src/ext/mysqli/mysqli_nonapi.c:1.31 Mon Feb 23 11:49:18 2004
+++ php-src/ext/mysqli/mysqli_nonapi.c Wed Feb 25 15:16:22 2004
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: mysqli_nonapi.c,v 1.31 2004/02/23 16:49:18 georg Exp $
+ $Id: mysqli_nonapi.c,v 1.32 2004/02/25 20:16:22 abies Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -38,7 +38,7 @@
zval *object = getThis();
char *hostname = NULL, *username=NULL,
*passwd=NULL, *dbname=NULL, *socket=NULL;
unsigned int hostname_len, username_len, passwd_len, dbname_len,
socket_len;
- unsigned int port=0;
+ long port=0;
if (getThis() && !ZEND_NUM_ARGS()) {
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_report.c?r1=1.6&r2=1.7&ty=u
Index: php-src/ext/mysqli/mysqli_report.c
diff -u php-src/ext/mysqli/mysqli_report.c:1.6 php-src/ext/mysqli/mysqli_report.c:1.7
--- php-src/ext/mysqli/mysqli_report.c:1.6 Wed Jan 28 17:51:54 2004
+++ php-src/ext/mysqli/mysqli_report.c Wed Feb 25 15:16:22 2004
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: mysqli_report.c,v 1.6 2004/01/28 22:51:54 georg Exp $
+ $Id: mysqli_report.c,v 1.7 2004/02/25 20:16:22 abies Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -31,7 +31,7 @@
sets report level */
PHP_FUNCTION(mysqli_report)
{
- int flags;
+ long flags;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &flags) == FAILURE) {
http://cvs.php.net/diff.php/php-src/ext/oci8/oci8.c?r1=1.253&r2=1.254&ty=u
Index: php-src/ext/oci8/oci8.c
diff -u php-src/ext/oci8/oci8.c:1.253 php-src/ext/oci8/oci8.c:1.254
--- php-src/ext/oci8/oci8.c:1.253 Fri Feb 20 07:47:56 2004
+++ php-src/ext/oci8/oci8.c Wed Feb 25 15:16:23 2004
@@ -22,7 +22,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: oci8.c,v 1.253 2004/02/20 12:47:56 tony2001 Exp $ */
+/* $Id: oci8.c,v 1.254 2004/02/25 20:16:23 abies Exp $ */
/* TODO list:
*
@@ -786,7 +786,7 @@
php_info_print_table_start();
php_info_print_table_row(2, "OCI8 Support", "enabled");
- php_info_print_table_row(2, "Revision", "$Revision: 1.253 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.254 $");
sprintf(buf, "%ld", num_persistent);
php_info_print_table_row(2, "Active Persistent Links", buf);
@@ -5012,7 +5012,7 @@
oci_descriptor *descr;
ub4 offset = 1;
ub4 loblen;
- int lob_type = OCI_TEMP_CLOB;
+ long lob_type = OCI_TEMP_CLOB;
oci_debug ("oci_write_temporary_lob");
http://cvs.php.net/diff.php/php-src/ext/soap/soap.c?r1=1.93&r2=1.94&ty=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.93 php-src/ext/soap/soap.c:1.94
--- php-src/ext/soap/soap.c:1.93 Wed Feb 25 09:37:05 2004
+++ php-src/ext/soap/soap.c Wed Feb 25 15:16:24 2004
@@ -17,7 +17,7 @@
| Dmitry Stogov <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: soap.c,v 1.93 2004/02/25 14:37:05 dmitry Exp $ */
+/* $Id: soap.c,v 1.94 2004/02/25 20:16:24 abies Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -967,7 +967,7 @@
PHP_METHOD(soapserver,setpersistence)
{
soapServicePtr service;
- int value;
+ long value;
SOAP_SERVER_BEGIN_CODE();
http://cvs.php.net/diff.php/php-src/ext/spl/spl_iterators.c?r1=1.21&r2=1.22&ty=u
Index: php-src/ext/spl/spl_iterators.c
diff -u php-src/ext/spl/spl_iterators.c:1.21 php-src/ext/spl/spl_iterators.c:1.22
--- php-src/ext/spl/spl_iterators.c:1.21 Wed Feb 25 09:58:47 2004
+++ php-src/ext/spl/spl_iterators.c Wed Feb 25 15:16:24 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_iterators.c,v 1.21 2004/02/25 14:58:47 zeev Exp $ */
+/* $Id: spl_iterators.c,v 1.22 2004/02/25 20:16:24 abies Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -318,7 +318,7 @@
spl_recursive_it_object *intern;
zval *iterator;
zend_class_entry *ce_iterator;
- int mode = RIT_LEAVES_ONLY;
+ long mode = RIT_LEAVES_ONLY;
php_set_error_handling(EH_THROW, zend_exception_get_default() TSRMLS_CC);
@@ -401,7 +401,7 @@
SPL_METHOD(RecursiveIteratorIterator, getSubIterator)
{
spl_recursive_it_object *object =
(spl_recursive_it_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
- int level = object->level;
+ long level = object->level;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &level) == FAILURE)
{
return;
http://cvs.php.net/diff.php/php-src/ext/sqlite/sqlite.c?r1=1.124&r2=1.125&ty=u
Index: php-src/ext/sqlite/sqlite.c
diff -u php-src/ext/sqlite/sqlite.c:1.124 php-src/ext/sqlite/sqlite.c:1.125
--- php-src/ext/sqlite/sqlite.c:1.124 Tue Feb 24 10:47:38 2004
+++ php-src/ext/sqlite/sqlite.c Wed Feb 25 15:16:25 2004
@@ -17,7 +17,7 @@
| Marcus Boerger <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: sqlite.c,v 1.124 2004/02/24 15:47:38 abies Exp $
+ $Id: sqlite.c,v 1.125 2004/02/25 20:16:25 abies Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1054,7 +1054,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, "SQLite support", "enabled");
- php_info_print_table_row(2, "PECL Module version", PHP_SQLITE_MODULE_VERSION "
$Id: sqlite.c,v 1.124 2004/02/24 15:47:38 abies Exp $");
+ php_info_print_table_row(2, "PECL Module version", PHP_SQLITE_MODULE_VERSION "
$Id: sqlite.c,v 1.125 2004/02/25 20:16:25 abies Exp $");
php_info_print_table_row(2, "SQLite Library", sqlite_libversion());
php_info_print_table_row(2, "SQLite Encoding", sqlite_libencoding());
php_info_print_table_end();
@@ -1202,7 +1202,7 @@
}
/* now we need to open the database */
- php_sqlite_open(fullpath, mode, hashkey, return_value, errmsg, NULL TSRMLS_CC);
+ php_sqlite_open(fullpath, (int)mode, hashkey, return_value, errmsg, NULL
TSRMLS_CC);
efree(fullpath);
efree(hashkey);
@@ -1254,7 +1254,7 @@
}
}
- php_sqlite_open(fullpath ? fullpath : filename, mode, NULL, return_value,
errmsg, object TSRMLS_CC);
+ php_sqlite_open(fullpath ? fullpath : filename, (int)mode, NULL, return_value,
errmsg, object TSRMLS_CC);
if (fullpath) {
efree(fullpath);
@@ -1294,7 +1294,7 @@
}
}
- php_sqlite_open(filename, mode, NULL, return_value, errmsg, return_value
TSRMLS_CC);
+ php_sqlite_open(filename, (int)mode, NULL, return_value, errmsg, return_value
TSRMLS_CC);
php_std_error_handling();
}
@@ -1434,7 +1434,7 @@
/* }}} */
/* {{{ sqlite_query */
-void sqlite_query(zval *object, struct php_sqlite_db *db, char *sql, long sql_len,
long mode, int buffered, zval *return_value, struct php_sqlite_result **prres
TSRMLS_DC)
+void sqlite_query(zval *object, struct php_sqlite_db *db, char *sql, long sql_len,
int mode, int buffered, zval *return_value, struct php_sqlite_result **prres TSRMLS_DC)
{
struct php_sqlite_result res, *rres;
int ret;
@@ -1539,7 +1539,7 @@
return;
}
- sqlite_query(object, db, sql, sql_len, mode, 0, return_value, NULL TSRMLS_CC);
+ sqlite_query(object, db, sql, sql_len, (int)mode, 0, return_value, NULL
TSRMLS_CC);
}
/* }}} */
@@ -1646,7 +1646,7 @@
return;
}
- sqlite_query(object, db, sql, sql_len, mode, 1, return_value, NULL TSRMLS_CC);
+ sqlite_query(object, db, sql, sql_len, (int)mode, 1, return_value, NULL
TSRMLS_CC);
}
/* }}} */
@@ -2006,7 +2006,7 @@
}
rres = (struct php_sqlite_result *)emalloc(sizeof(*rres));
- sqlite_query(NULL, db, sql, sql_len, mode, 0, NULL, &rres TSRMLS_CC);
+ sqlite_query(NULL, db, sql, sql_len, (int)mode, 0, NULL, &rres TSRMLS_CC);
if (db->last_err_code != SQLITE_OK) {
if (rres) {
efree(rres);
http://cvs.php.net/diff.php/php-src/ext/standard/dir.c?r1=1.133&r2=1.134&ty=u
Index: php-src/ext/standard/dir.c
diff -u php-src/ext/standard/dir.c:1.133 php-src/ext/standard/dir.c:1.134
--- php-src/ext/standard/dir.c:1.133 Wed Jan 28 17:21:53 2004
+++ php-src/ext/standard/dir.c Wed Feb 25 15:16:26 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: dir.c,v 1.133 2004/01/28 22:21:53 pollita Exp $ */
+/* $Id: dir.c,v 1.134 2004/02/25 20:16:26 abies Exp $ */
/* {{{ includes/startup/misc */
@@ -450,7 +450,7 @@
{
char *dirn;
int dirn_len;
- int flags = 0;
+ long flags = 0;
php_stream_dirent **namelist;
int n, i;
zval *zcontext = NULL;
http://cvs.php.net/diff.php/php-src/ext/standard/file.c?r1=1.379&r2=1.380&ty=u
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.379 php-src/ext/standard/file.c:1.380
--- php-src/ext/standard/file.c:1.379 Sun Jan 25 01:09:36 2004
+++ php-src/ext/standard/file.c Wed Feb 25 15:16:26 2004
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: file.c,v 1.379 2004/01/25 06:09:36 sniper Exp $ */
+/* $Id: file.c,v 1.380 2004/02/25 20:16:26 abies Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -502,7 +502,8 @@
char *filename;
size_t filename_len;
zval *data;
- int numbytes = 0, flags = 0;
+ int numbytes = 0;
+ long flags = 0;
zval *zcontext = NULL;
php_stream_context *context = NULL;
http://cvs.php.net/diff.php/php-src/ext/standard/streamsfuncs.c?r1=1.33&r2=1.34&ty=u
Index: php-src/ext/standard/streamsfuncs.c
diff -u php-src/ext/standard/streamsfuncs.c:1.33
php-src/ext/standard/streamsfuncs.c:1.34
--- php-src/ext/standard/streamsfuncs.c:1.33 Mon Feb 23 11:26:34 2004
+++ php-src/ext/standard/streamsfuncs.c Wed Feb 25 15:16:26 2004
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: streamsfuncs.c,v 1.33 2004/02/23 16:26:34 abies Exp $ */
+/* $Id: streamsfuncs.c,v 1.34 2004/02/25 20:16:26 abies Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -657,7 +657,8 @@
struct timeval *tv_p = NULL;
fd_set rfds, wfds, efds;
int max_fd = 0;
- int retval, sets = 0, usec = 0;
+ int retval, sets = 0;
+ long usec = 0;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a!a!a!z!|l", &r_array,
&w_array, &e_array, &sec, &usec) == FAILURE)
return;
http://cvs.php.net/diff.php/php-src/ext/standard/string.c?r1=1.411&r2=1.412&ty=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.411 php-src/ext/standard/string.c:1.412
--- php-src/ext/standard/string.c:1.411 Mon Feb 23 15:34:59 2004
+++ php-src/ext/standard/string.c Wed Feb 25 15:16:26 2004
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: string.c,v 1.411 2004/02/23 20:34:59 pollita Exp $ */
+/* $Id: string.c,v 1.412 2004/02/25 20:16:26 abies Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -1649,7 +1649,8 @@
{
zval *zneedle;
char *needle, *haystack;
- int needle_len, haystack_len, offset = 0;
+ int needle_len, haystack_len;
+ long offset = 0;
char *p, *e, ord_needle[2];
char *needle_dup, *haystack_dup;
http://cvs.php.net/diff.php/php-src/ext/standard/sunfuncs.c?r1=1.5&r2=1.6&ty=u
Index: php-src/ext/standard/sunfuncs.c
diff -u php-src/ext/standard/sunfuncs.c:1.5 php-src/ext/standard/sunfuncs.c:1.6
--- php-src/ext/standard/sunfuncs.c:1.5 Thu Jan 8 03:17:34 2004
+++ php-src/ext/standard/sunfuncs.c Wed Feb 25 15:16:26 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sunfuncs.c,v 1.5 2004/01/08 08:17:34 andi Exp $ */
+/* $Id: sunfuncs.c,v 1.6 2004/02/25 20:16:26 abies Exp $ */
/*
The sun position algorithm taken from the 'US Naval Observatory's
@@ -156,7 +156,8 @@
{
zval *date;
double latitude, longitude, zenith, gmt_offset, ret;
- int time, N, retformat;
+ int time, N;
+ long retformat;
char retstr[6];
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z|ldddd", &date,
&retformat, &latitude, &longitude, &zenith, &gmt_offset) == FAILURE) {
http://cvs.php.net/diff.php/php-src/ext/standard/var.c?r1=1.183&r2=1.184&ty=u
Index: php-src/ext/standard/var.c
diff -u php-src/ext/standard/var.c:1.183 php-src/ext/standard/var.c:1.184
--- php-src/ext/standard/var.c:1.183 Mon Feb 16 06:21:31 2004
+++ php-src/ext/standard/var.c Wed Feb 25 15:16:26 2004
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: var.c,v 1.183 2004/02/16 11:21:31 stas Exp $ */
+/* $Id: var.c,v 1.184 2004/02/25 20:16:26 abies Exp $ */
/* {{{ includes
@@ -741,7 +741,7 @@
if (!php_var_unserialize(&return_value, &p, p + Z_STRLEN_PP(buf),
&var_hash TSRMLS_CC)) {
PHP_VAR_UNSERIALIZE_DESTROY(var_hash);
zval_dtor(return_value);
- php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Error at offset %d
of %d bytes", p - Z_STRVAL_PP(buf), Z_STRLEN_PP(buf));
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Error at offset
%ld of %ld bytes", p - Z_STRVAL_PP(buf), Z_STRLEN_PP(buf));
RETURN_FALSE;
}
PHP_VAR_UNSERIALIZE_DESTROY(var_hash);
http://cvs.php.net/diff.php/php-src/ext/w32api/w32api.c?r1=1.13&r2=1.14&ty=u
Index: php-src/ext/w32api/w32api.c
diff -u php-src/ext/w32api/w32api.c:1.13 php-src/ext/w32api/w32api.c:1.14
--- php-src/ext/w32api/w32api.c:1.13 Sat Jan 17 07:59:55 2004
+++ php-src/ext/w32api/w32api.c Wed Feb 25 15:16:27 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: w32api.c,v 1.13 2004/01/17 12:59:55 sniper Exp $ */
+/* $Id: w32api.c,v 1.14 2004/02/25 20:16:27 abies Exp $ */
/*
* Win32 API Extension for PHP
@@ -1506,7 +1506,7 @@
int function_name_len;
w32api_func_handle **fh = NULL;
- if(zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l",
+ if(zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s",
&function_name,
&function_name_len) ==
FAILURE)
{
@@ -1532,7 +1532,7 @@
int function_definition_len;
w32api_func_handle **fh = NULL;
- if(zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l",
+ if(zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s",
&function_definition,
&function_definition_len) ==
FAILURE)
{
http://cvs.php.net/diff.php/php-src/ext/pgsql/pgsql.c?r1=1.305&r2=1.306&ty=u
Index: php-src/ext/pgsql/pgsql.c
diff -u php-src/ext/pgsql/pgsql.c:1.305 php-src/ext/pgsql/pgsql.c:1.306
--- php-src/ext/pgsql/pgsql.c:1.305 Thu Feb 12 05:43:22 2004
+++ php-src/ext/pgsql/pgsql.c Wed Feb 25 15:16:27 2004
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pgsql.c,v 1.305 2004/02/12 10:43:22 zeev Exp $ */
+/* $Id: pgsql.c,v 1.306 2004/02/25 20:16:27 abies Exp $ */
#include <stdlib.h>
@@ -1401,7 +1401,7 @@
/* }}} */
/* {{{ void php_pgsql_fetch_hash */
-static void php_pgsql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int result_type, int
into_object)
+static void php_pgsql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, long result_type, int
into_object)
{
zval *result;
PGresult *pgsql_result;
@@ -3254,12 +3254,13 @@
PHP_FUNCTION(pg_get_notify)
{
zval *pgsql_link;
- int id = -1, result_type = PGSQL_ASSOC;
+ int id = -1;
+ long result_type = PGSQL_ASSOC;
PGconn *pgsql;
PGnotify *pgsql_notify;
if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS()
TSRMLS_CC, "r|l",
- &pgsql_link) ==
FAILURE) {
+ &pgsql_link,
&result_type) == FAILURE) {
RETURN_FALSE;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
