abies Wed Jun 16 19:57:26 2004 EDT
Modified files:
/php-src/ext/com_dotnet com_com.c com_dotnet.c com_persist.c
com_variant.c php_com_dotnet_internal.h
/php-src/ext/spl spl_directory.c
/php-src/ext/sqlite sqlite.c
/php-src/ext/standard dir.c file.c fsock.c proc_open.c
streamsfuncs.c
Log:
64-bit bugsquash party
http://cvs.php.net/diff.php/php-src/ext/com_dotnet/com_com.c?r1=1.13&r2=1.14&ty=u
Index: php-src/ext/com_dotnet/com_com.c
diff -u php-src/ext/com_dotnet/com_com.c:1.13 php-src/ext/com_dotnet/com_com.c:1.14
--- php-src/ext/com_dotnet/com_com.c:1.13 Sun May 9 11:21:29 2004
+++ php-src/ext/com_dotnet/com_com.c Wed Jun 16 19:57:25 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: com_com.c,v 1.13 2004/05/09 15:21:29 wez Exp $ */
+/* $Id: com_com.c,v 1.14 2004/06/16 23:57:25 abies Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -37,7 +37,7 @@
php_com_dotnet_object *obj;
char *module_name, *typelib_name = NULL, *server_name = NULL;
char *user_name = NULL, *domain_name = NULL, *password = NULL;
- long module_name_len, typelib_name_len, server_name_len,
+ int module_name_len, typelib_name_len, server_name_len,
user_name_len, domain_name_len, password_len;
OLECHAR *moniker;
CLSID clsid;
@@ -287,7 +287,7 @@
{
CLSID clsid;
char *module_name;
- long module_name_len;
+ int module_name_len;
long code_page = COMG(code_page);
IUnknown *unk = NULL;
IDispatch *obj = NULL;
@@ -799,7 +799,7 @@
PHP_FUNCTION(com_load_typelib)
{
char *name;
- long namelen;
+ int namelen;
ITypeLib *pTL = NULL;
zend_bool cs = TRUE;
int codepage = COMG(code_page);
http://cvs.php.net/diff.php/php-src/ext/com_dotnet/com_dotnet.c?r1=1.6&r2=1.7&ty=u
Index: php-src/ext/com_dotnet/com_dotnet.c
diff -u php-src/ext/com_dotnet/com_dotnet.c:1.6 php-src/ext/com_dotnet/com_dotnet.c:1.7
--- php-src/ext/com_dotnet/com_dotnet.c:1.6 Thu Feb 12 05:43:19 2004
+++ php-src/ext/com_dotnet/com_dotnet.c Wed Jun 16 19:57:25 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: com_dotnet.c,v 1.6 2004/02/12 10:43:19 zeev Exp $ */
+/* $Id: com_dotnet.c,v 1.7 2004/06/16 23:57:25 abies Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -98,7 +98,7 @@
zval *object = getThis();
php_com_dotnet_object *obj;
char *assembly_name, *datatype_name;
- long assembly_name_len, datatype_name_len;
+ int assembly_name_len, datatype_name_len;
struct dotnet_runtime_stuff *stuff;
IObjectHandle *handle;
DISPPARAMS params;
http://cvs.php.net/diff.php/php-src/ext/com_dotnet/com_persist.c?r1=1.1&r2=1.2&ty=u
Index: php-src/ext/com_dotnet/com_persist.c
diff -u php-src/ext/com_dotnet/com_persist.c:1.1
php-src/ext/com_dotnet/com_persist.c:1.2
--- php-src/ext/com_dotnet/com_persist.c:1.1 Sun May 9 11:21:29 2004
+++ php-src/ext/com_dotnet/com_persist.c Wed Jun 16 19:57:25 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: com_persist.c,v 1.1 2004/05/09 15:21:29 wez Exp $ */
+/* $Id: com_persist.c,v 1.2 2004/06/16 23:57:25 abies Exp $ */
/* Infrastructure for working with persistent COM objects.
* Implements: IStream* wrapper for PHP streams.
@@ -375,7 +375,7 @@
{
HRESULT res;
char *filename, *fullpath = NULL;
- long filename_len;
+ int filename_len;
zend_bool remember = TRUE;
OLECHAR *olefilename = NULL;
CPH_FETCH();
@@ -438,7 +438,7 @@
{
HRESULT res;
char *filename, *fullpath;
- long filename_len;
+ int filename_len;
long flags = 0;
OLECHAR *olefilename;
CPH_FETCH();
http://cvs.php.net/diff.php/php-src/ext/com_dotnet/com_variant.c?r1=1.8&r2=1.9&ty=u
Index: php-src/ext/com_dotnet/com_variant.c
diff -u php-src/ext/com_dotnet/com_variant.c:1.8
php-src/ext/com_dotnet/com_variant.c:1.9
--- php-src/ext/com_dotnet/com_variant.c:1.8 Mon May 3 16:10:57 2004
+++ php-src/ext/com_dotnet/com_variant.c Wed Jun 16 19:57:25 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: com_variant.c,v 1.8 2004/05/03 20:10:57 wez Exp $ */
+/* $Id: com_variant.c,v 1.9 2004/06/16 23:57:25 abies Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -260,7 +260,7 @@
/* {{{ com_variant_create_instance - ctor for new VARIANT() */
PHP_FUNCTION(com_variant_create_instance)
{
- VARTYPE vt = VT_EMPTY;
+ /* VARTYPE == unsigned short */ long vt = VT_EMPTY;
long codepage = CP_ACP;
zval *object = getThis();
php_com_dotnet_object *obj;
@@ -290,7 +290,7 @@
if (ZEND_NUM_ARGS() >= 2) {
- res = VariantChangeType(&obj->v, &obj->v, 0, vt);
+ res = VariantChangeType(&obj->v, &obj->v, 0, (VARTYPE)vt);
if (FAILED(res)) {
char *werr, *msg;
@@ -788,7 +788,7 @@
Returns a variant date representation of a unix timestamp */
PHP_FUNCTION(variant_date_from_timestamp)
{
- int timestamp;
+ long timestamp;
SYSTEMTIME systime;
struct tm *tmv;
VARIANT res;
@@ -841,7 +841,7 @@
{
zval *zobj;
php_com_dotnet_object *obj;
- VARTYPE vt;
+ /* VARTYPE == unsigned short */ long vt;
HRESULT res;
if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
@@ -850,7 +850,7 @@
}
obj = CDNO_FETCH(zobj);
- res = VariantChangeType(&obj->v, &obj->v, 0, vt);
+ res = VariantChangeType(&obj->v, &obj->v, 0, (VARTYPE)vt);
if (SUCCEEDED(res)) {
if (vt != VT_DISPATCH && obj->typeinfo) {
@@ -876,7 +876,7 @@
{
zval *zobj;
php_com_dotnet_object *obj;
- VARTYPE vt;
+ /* VARTYPE == unsigned short */ long vt;
VARIANT vres;
HRESULT res;
@@ -887,7 +887,7 @@
obj = CDNO_FETCH(zobj);
VariantInit(&vres);
- res = VariantChangeType(&vres, &obj->v, 0, vt);
+ res = VariantChangeType(&vres, &obj->v, 0, (VARTYPE)vt);
if (SUCCEEDED(res)) {
php_com_wrap_variant(return_value, &vres, obj->code_page TSRMLS_CC);
http://cvs.php.net/diff.php/php-src/ext/com_dotnet/php_com_dotnet_internal.h?r1=1.11&r2=1.12&ty=u
Index: php-src/ext/com_dotnet/php_com_dotnet_internal.h
diff -u php-src/ext/com_dotnet/php_com_dotnet_internal.h:1.11
php-src/ext/com_dotnet/php_com_dotnet_internal.h:1.12
--- php-src/ext/com_dotnet/php_com_dotnet_internal.h:1.11 Sun May 9 11:21:29
2004
+++ php-src/ext/com_dotnet/php_com_dotnet_internal.h Wed Jun 16 19:57:25 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_com_dotnet_internal.h,v 1.11 2004/05/09 15:21:29 wez Exp $ */
+/* $Id: php_com_dotnet_internal.h,v 1.12 2004/06/16 23:57:25 abies Exp $ */
#ifndef PHP_COM_DOTNET_INTERNAL_H
#define PHP_COM_DOTNET_INTERNAL_H
@@ -36,7 +36,7 @@
VARIANT v;
ITypeInfo *typeinfo;
- int code_page;
+ long code_page;
unsigned int have_default_bind:1;
zend_class_entry *ce;
http://cvs.php.net/diff.php/php-src/ext/spl/spl_directory.c?r1=1.25&r2=1.26&ty=u
Index: php-src/ext/spl/spl_directory.c
diff -u php-src/ext/spl/spl_directory.c:1.25 php-src/ext/spl/spl_directory.c:1.26
--- php-src/ext/spl/spl_directory.c:1.25 Mon Mar 8 13:05:41 2004
+++ php-src/ext/spl/spl_directory.c Wed Jun 16 19:57:25 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_directory.c,v 1.25 2004/03/08 18:05:41 helly Exp $ */
+/* $Id: spl_directory.c,v 1.26 2004/06/16 23:57:25 abies Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -177,7 +177,7 @@
zval *object = getThis();
spl_ce_dir_object *intern;
char *path;
- long len;
+ int len;
php_set_error_handling(EH_THROW, zend_exception_get_default() TSRMLS_CC);
http://cvs.php.net/diff.php/php-src/ext/sqlite/sqlite.c?r1=1.144&r2=1.145&ty=u
Index: php-src/ext/sqlite/sqlite.c
diff -u php-src/ext/sqlite/sqlite.c:1.144 php-src/ext/sqlite/sqlite.c:1.145
--- php-src/ext/sqlite/sqlite.c:1.144 Thu May 13 10:19:10 2004
+++ php-src/ext/sqlite/sqlite.c Wed Jun 16 19:57:25 2004
@@ -17,7 +17,7 @@
| Marcus Boerger <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: sqlite.c,v 1.144 2004/05/13 14:19:10 stas Exp $
+ $Id: sqlite.c,v 1.145 2004/06/16 23:57:25 abies Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1071,7 +1071,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.144 2004/05/13 14:19:10 stas Exp $");
+ php_info_print_table_row(2, "PECL Module version", PHP_SQLITE_MODULE_VERSION "
$Id: sqlite.c,v 1.145 2004/06/16 23:57: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();
@@ -1157,7 +1157,7 @@
{
long mode = 0666;
char *filename, *fullpath, *hashkey;
- long filename_len, hashkeylen;
+ int filename_len, hashkeylen;
zval *errmsg = NULL;
struct php_sqlite_db *db = NULL;
list_entry *le;
@@ -1231,7 +1231,7 @@
{
long mode = 0666;
char *filename, *fullpath = NULL;
- long filename_len;
+ int filename_len;
zval *errmsg = NULL;
zval *object = getThis();
@@ -1286,7 +1286,7 @@
{
long mode = 0666;
char *filename, *fullpath = NULL;
- long filename_len;
+ int filename_len;
zval *errmsg = NULL;
php_set_error_handling(EH_THROW, sqlite_ce_exception TSRMLS_CC);
@@ -1533,7 +1533,7 @@
zval *zdb;
struct php_sqlite_db *db;
char *sql;
- long sql_len;
+ int sql_len;
long mode = PHPSQLITE_BOTH;
char *errtext = NULL;
zval *object = getThis();
@@ -1576,7 +1576,7 @@
zval *zdb;
struct php_sqlite_db *db;
char *tbl, *sql;
- long tbl_len;
+ int tbl_len;
char *errtext = NULL;
zval *object = getThis();
struct php_sqlite_result res;
@@ -1642,7 +1642,7 @@
zval *zdb;
struct php_sqlite_db *db;
char *sql;
- long sql_len;
+ int sql_len;
long mode = PHPSQLITE_BOTH;
char *errtext = NULL;
zval *object = getThis();
@@ -1685,7 +1685,7 @@
zval *zdb;
struct php_sqlite_db *db;
char *sql;
- long sql_len;
+ int sql_len;
char *errtext = NULL;
zval *object = getThis();
@@ -2041,7 +2041,7 @@
struct php_sqlite_db *db;
struct php_sqlite_result *rres;
char *sql;
- long sql_len;
+ int sql_len;
long mode = PHPSQLITE_BOTH;
char *errtext = NULL;
zend_bool decode_binary = 1;
@@ -2157,7 +2157,7 @@
struct php_sqlite_db *db;
struct php_sqlite_result *rres;
char *sql;
- long sql_len;
+ int sql_len;
char *errtext = NULL;
zend_bool decode_binary = 1;
zend_bool srow = 1;
@@ -2802,7 +2802,7 @@
PHP_FUNCTION(sqlite_create_aggregate)
{
char *funcname = NULL;
- long funcname_len;
+ int funcname_len;
zval *zstep, *zfinal, *zdb;
struct php_sqlite_db *db;
struct php_sqlite_agg_functions *funcs;
@@ -2852,7 +2852,7 @@
PHP_FUNCTION(sqlite_create_function)
{
char *funcname = NULL;
- long funcname_len;
+ int funcname_len;
zval *zcall, *zdb;
struct php_sqlite_db *db;
struct php_sqlite_agg_functions *funcs;
@@ -2920,7 +2920,7 @@
PHP_FUNCTION(sqlite_udf_decode_binary)
{
char *data = NULL;
- long datalen;
+ int datalen;
if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s!", &data,
&datalen)) {
return;
http://cvs.php.net/diff.php/php-src/ext/standard/dir.c?r1=1.140&r2=1.141&ty=u
Index: php-src/ext/standard/dir.c
diff -u php-src/ext/standard/dir.c:1.140 php-src/ext/standard/dir.c:1.141
--- php-src/ext/standard/dir.c:1.140 Mon Jun 7 14:30:16 2004
+++ php-src/ext/standard/dir.c Wed Jun 16 19:57:25 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: dir.c,v 1.140 2004/06/07 18:30:16 iliaa Exp $ */
+/* $Id: dir.c,v 1.141 2004/06/16 23:57:25 abies Exp $ */
/* {{{ includes/startup/misc */
@@ -176,7 +176,7 @@
static void _php_do_opendir(INTERNAL_FUNCTION_PARAMETERS, int createobject)
{
char *dirname;
- long dir_len;
+ int dir_len;
zval *zcontext = NULL;
php_stream_context *context = NULL;
php_stream *dirp;
http://cvs.php.net/diff.php/php-src/ext/standard/file.c?r1=1.381&r2=1.382&ty=u
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.381 php-src/ext/standard/file.c:1.382
--- php-src/ext/standard/file.c:1.381 Fri May 14 12:12:03 2004
+++ php-src/ext/standard/file.c Wed Jun 16 19:57:25 2004
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: file.c,v 1.381 2004/05/14 16:12:03 iliaa Exp $ */
+/* $Id: file.c,v 1.382 2004/06/16 23:57:25 abies Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -500,7 +500,7 @@
{
php_stream *stream;
char *filename;
- size_t filename_len;
+ int filename_len;
zval *data;
int numbytes = 0;
long flags = 0;
@@ -1287,7 +1287,8 @@
PHP_FUNCTION(mkdir)
{
zval *zcontext = NULL;
- long dir_len, mode = 0777;
+ long mode = 0777;
+ int dir_len;
zend_bool recursive = 0;
char *dir;
php_stream_context *context;
@@ -1307,9 +1308,9 @@
PHP_FUNCTION(rmdir)
{
char *dir;
- long dir_len;
zval *zcontext = NULL;
php_stream_context *context;
+ int dir_len;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|r", &dir, &dir_len,
&zcontext) == FAILURE) {
RETURN_FALSE;
@@ -1325,8 +1326,8 @@
Output a file or a URL */
PHP_FUNCTION(readfile)
{
- int size = 0;
char *filename;
+ int size = 0;
int filename_len;
zend_bool use_include_path = 0;
zval *zcontext = NULL;
http://cvs.php.net/diff.php/php-src/ext/standard/fsock.c?r1=1.119&r2=1.120&ty=u
Index: php-src/ext/standard/fsock.c
diff -u php-src/ext/standard/fsock.c:1.119 php-src/ext/standard/fsock.c:1.120
--- php-src/ext/standard/fsock.c:1.119 Thu Jan 8 03:17:32 2004
+++ php-src/ext/standard/fsock.c Wed Jun 16 19:57:25 2004
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: fsock.c,v 1.119 2004/01/08 08:17:32 andi Exp $ */
+/* $Id: fsock.c,v 1.120 2004/06/16 23:57:25 abies Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -32,7 +32,7 @@
static void php_fsockopen_stream(INTERNAL_FUNCTION_PARAMETERS, int persistent)
{
char *host;
- long host_len;
+ int host_len;
long port = -1;
zval *zerrno = NULL, *zerrstr = NULL;
double timeout = FG(default_socket_timeout);
http://cvs.php.net/diff.php/php-src/ext/standard/proc_open.c?r1=1.27&r2=1.28&ty=u
Index: php-src/ext/standard/proc_open.c
diff -u php-src/ext/standard/proc_open.c:1.27 php-src/ext/standard/proc_open.c:1.28
--- php-src/ext/standard/proc_open.c:1.27 Sat May 29 05:27:18 2004
+++ php-src/ext/standard/proc_open.c Wed Jun 16 19:57:25 2004
@@ -15,7 +15,7 @@
| Author: Wez Furlong <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: proc_open.c,v 1.27 2004/05/29 09:27:18 wez Exp $ */
+/* $Id: proc_open.c,v 1.28 2004/06/16 23:57:25 abies Exp $ */
#if 0 && (defined(__linux__) || defined(sun) || defined(__IRIX__))
# define _BSD_SOURCE /* linux wants this when XOPEN mode is on */
@@ -459,7 +459,7 @@
PHP_FUNCTION(proc_open)
{
char *command, *cwd=NULL;
- long command_len, cwd_len;
+ int command_len, cwd_len;
zval *descriptorspec;
zval *pipes;
zval *environment = NULL;
http://cvs.php.net/diff.php/php-src/ext/standard/streamsfuncs.c?r1=1.34&r2=1.35&ty=u
Index: php-src/ext/standard/streamsfuncs.c
diff -u php-src/ext/standard/streamsfuncs.c:1.34
php-src/ext/standard/streamsfuncs.c:1.35
--- php-src/ext/standard/streamsfuncs.c:1.34 Wed Feb 25 15:16:26 2004
+++ php-src/ext/standard/streamsfuncs.c Wed Jun 16 19:57:25 2004
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: streamsfuncs.c,v 1.34 2004/02/25 20:16:26 abies Exp $ */
+/* $Id: streamsfuncs.c,v 1.35 2004/06/16 23:57:25 abies Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -46,7 +46,7 @@
PHP_FUNCTION(stream_socket_client)
{
char *host;
- long host_len;
+ int host_len;
zval *zerrno = NULL, *zerrstr = NULL, *zcontext = NULL;
double timeout = FG(default_socket_timeout);
unsigned long conv;
@@ -133,7 +133,7 @@
PHP_FUNCTION(stream_socket_server)
{
char *host;
- long host_len;
+ int host_len;
zval *zerrno = NULL, *zerrstr = NULL, *zcontext = NULL;
php_stream *stream = NULL;
int err = 0;
@@ -274,7 +274,7 @@
zval *zstream;
long flags = 0;
char *data, *target_addr = NULL;
- long datalen, target_addr_len = 0;
+ int datalen, target_addr_len = 0;
php_sockaddr_storage sa;
socklen_t sl = 0;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
