ddhill Thu Mar 6 18:07:29 2003 EDT
Modified files:
/php4/ext/bz2 bz2.c
/php4/ext/dio dio.c
/php4/ext/domxml php_domxml.c
/php4/ext/fdf fdf.c
/php4/ext/ftp php_ftp.c
/php4/ext/iconv iconv.c
/php4/ext/ldap ldap.c
/php4/ext/mcrypt mcrypt.c
/php4/ext/mhash mhash.c
/php4/ext/openssl openssl.c
/php4/ext/pgsql pgsql.c
/php4/ext/posix posix.c
/php4/ext/sockets sockets.c
/php4/ext/standard fsock.c head.c html.c metaphone.c string.c
/php4/ext/sysvsem sysvsem.c
/php4/ext/zip zip.c
/php4/ext/zlib zlib.c
/php4/main output.c
Log:
64-bit correction to variables passed to zend_parse_parameters
@64-bit correction to variables passed to zend_parse_parameters (Dave)
Index: php4/ext/bz2/bz2.c
diff -u php4/ext/bz2/bz2.c:1.65 php4/ext/bz2/bz2.c:1.66
--- php4/ext/bz2/bz2.c:1.65 Sat Jan 18 16:31:04 2003
+++ php4/ext/bz2/bz2.c Thu Mar 6 18:07:22 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: bz2.c,v 1.65 2003/01/18 21:31:04 iliaa Exp $ */
+/* $Id: bz2.c,v 1.66 2003/03/06 23:07:22 ddhill Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -253,7 +253,7 @@
PHP_FUNCTION(bzread)
{
zval *bz;
- int len = 1024;
+ long len = 1024;
php_stream *stream;
if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|l", &bz,
&len)) {
Index: php4/ext/dio/dio.c
diff -u php4/ext/dio/dio.c:1.25 php4/ext/dio/dio.c:1.26
--- php4/ext/dio/dio.c:1.25 Fri Jan 24 00:21:08 2003
+++ php4/ext/dio/dio.c Thu Mar 6 18:07:22 2003
@@ -146,8 +146,8 @@
php_fd_t *f;
char *file_name;
int file_name_length;
- int flags;
- mode_t mode = 0;
+ long flags;
+ long mode = 0;
int fd;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sl|l", &file_name,
&file_name_length, &flags, &mode) == FAILURE) {
@@ -177,7 +177,7 @@
zval *r_fd;
php_fd_t *f;
char *data;
- int bytes = 1024;
+ long bytes = 1024;
ssize_t res;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|l", &r_fd, &bytes) ==
FAILURE) {
@@ -206,8 +206,8 @@
zval *r_fd;
php_fd_t *f;
char *data;
- size_t data_len;
- size_t trunc_len = 0;
+ int data_len;
+ long trunc_len = 0;
ssize_t res;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs|l", &r_fd, &data,
&data_len, &trunc_len) == FAILURE) {
@@ -230,7 +230,7 @@
{
zval *r_fd;
php_fd_t *f;
- off_t offset;
+ long offset;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &r_fd, &offset) ==
FAILURE) {
return;
@@ -289,8 +289,8 @@
{
zval *r_fd;
php_fd_t *f;
- off_t offset;
- int whence = SEEK_SET;
+ long offset;
+ long whence = SEEK_SET;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl|l", &r_fd, &offset,
&whence) == FAILURE) {
return;
@@ -308,7 +308,7 @@
zval *r_fd;
zval *arg = NULL;
php_fd_t *f;
- int cmd;
+ long cmd;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl|z", &r_fd, &cmd,
&arg) == FAILURE) {
return;
Index: php4/ext/domxml/php_domxml.c
diff -u php4/ext/domxml/php_domxml.c:1.238 php4/ext/domxml/php_domxml.c:1.239
--- php4/ext/domxml/php_domxml.c:1.238 Thu Mar 6 15:31:14 2003
+++ php4/ext/domxml/php_domxml.c Thu Mar 6 18:07:23 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_domxml.c,v 1.238 2003/03/06 20:31:14 sesser Exp $ */
+/* $Id: php_domxml.c,v 1.239 2003/03/06 23:07:23 ddhill Exp $ */
/* TODO
* - Support Notation Nodes
@@ -1971,7 +1971,8 @@
zval *rv = NULL;
zval *id;
xmlNode *n, *node;
- int ret, recursive = 0;;
+ int ret;
+ long recursive = 0;
DOMXML_GET_THIS_OBJ(n, id, le_domxmlnodep);
@@ -3565,7 +3566,8 @@
zval *arg1, *id, *rv = NULL;
xmlNodePtr node, srcnode;
xmlDocPtr docp;
- int ret, recursive = 0;
+ int ret;
+ long recursive = 0;
DOMXML_GET_THIS_OBJ(docp, id, le_domxmldocp);
@@ -3768,7 +3770,8 @@
int ret;
char *buffer;
int buffer_len;
- int mode = 0, prevSubstValue;
+ long mode = 0;
+ int prevSubstValue;
int oldvalue = xmlDoValidityCheckingDefaultValue;
int oldvalue_keepblanks;
int prevLoadExtDtdValue = xmlLoadExtDtdDefaultValue;
@@ -3854,7 +3857,8 @@
xmlDoc *docp = NULL;
int ret, file_len;
char *file;
- int mode = 0, prevSubstValue;
+ long mode = 0;
+ int prevSubstValue;
int oldvalue = xmlDoValidityCheckingDefaultValue;
int oldvalue_keepblanks;
zval *errors = NULL;
@@ -5253,7 +5257,8 @@
xmlDocPtr xmldocp;
char *filename;
int filename_len;
- int ret, compression = 0;
+ int ret;
+ long compression = 0;
DOMXML_GET_THIS(idxsl);
Index: php4/ext/fdf/fdf.c
diff -u php4/ext/fdf/fdf.c:1.72 php4/ext/fdf/fdf.c:1.73
--- php4/ext/fdf/fdf.c:1.72 Sun Feb 9 19:47:45 2003
+++ php4/ext/fdf/fdf.c Thu Mar 6 18:07:23 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: fdf.c,v 1.72 2003/02/10 00:47:45 hholzgra Exp $ */
+/* $Id: fdf.c,v 1.73 2003/03/06 23:07:23 ddhill Exp $ */
/* FdfTk lib 2.0 is a Complete C/C++ FDF Toolkit available from
http://beta1.adobe.com/ada/acrosdk/forms.html. */
@@ -551,7 +551,8 @@
PHP_FUNCTION(fdf_get_ap) {
zval *r_fdf;
char *fieldname, *filename;
- int fieldname_len, filename_len, face;
+ int fieldname_len, filename_len;
+ long face;
FDFDoc fdf;
FDFErc err;
FDFAppFace facenr;
@@ -938,7 +939,8 @@
PHP_FUNCTION(fdf_get_flags) {
zval *r_fdf;
char *fieldname;
- int fieldname_len, whichflags;
+ int fieldname_len;
+ long whichflags;
FDFDoc fdf;
FDFErc err;
ASUns32 flags;
@@ -994,7 +996,8 @@
PHP_FUNCTION(fdf_get_opt) {
zval *r_fdf;
char *fieldname;
- int fieldname_len, element = -1;
+ int fieldname_len;
+ long element = -1;
FDFDoc fdf;
FDFErc err;
Index: php4/ext/ftp/php_ftp.c
diff -u php4/ext/ftp/php_ftp.c:1.84 php4/ext/ftp/php_ftp.c:1.85
--- php4/ext/ftp/php_ftp.c:1.84 Fri Feb 28 02:25:14 2003
+++ php4/ext/ftp/php_ftp.c Thu Mar 6 18:07:24 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_ftp.c,v 1.84 2003/02/28 07:25:14 sniper Exp $ */
+/* $Id: php_ftp.c,v 1.85 2003/03/06 23:07:24 ddhill Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -151,7 +151,8 @@
{
ftpbuf_t *ftp;
char *host;
- int host_len, port = 0;
+ int host_len;
+ long port = 0;
long timeout_sec = FTP_DEFAULT_TIMEOUT;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|ll", &host, &host_len,
&port, &timeout_sec) == FAILURE) {
@@ -186,7 +187,8 @@
{
ftpbuf_t *ftp;
char *host;
- int host_len, port = 0;
+ int host_len;
+ long port = 0;
long timeout_sec = FTP_DEFAULT_TIMEOUT;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|ll", &host, &host_len,
&port, &timeout_sec) == FAILURE) {
Index: php4/ext/iconv/iconv.c
diff -u php4/ext/iconv/iconv.c:1.84 php4/ext/iconv/iconv.c:1.85
--- php4/ext/iconv/iconv.c:1.84 Tue Mar 4 12:18:40 2003
+++ php4/ext/iconv/iconv.c Thu Mar 6 18:07:24 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: iconv.c,v 1.84 2003/03/04 17:18:40 moriyoshi Exp $ */
+/* $Id: iconv.c,v 1.85 2003/03/06 23:07:24 ddhill Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1451,9 +1451,9 @@
PHP_FUNCTION(iconv_strlen)
{
char *charset;
- long charset_len;
+ int charset_len;
char *str;
- long str_len;
+ int str_len;
php_iconv_err_t err;
@@ -1481,9 +1481,9 @@
PHP_FUNCTION(iconv_substr)
{
char *charset;
- long charset_len;
+ int charset_len;
char *str;
- long str_len;
+ int str_len;
long offset, length;
zval *len_z = NULL;
@@ -1527,11 +1527,11 @@
PHP_FUNCTION(iconv_strpos)
{
char *charset;
- long charset_len;
+ int charset_len;
char *haystk;
- long haystk_len;
+ int haystk_len;
char *ndl;
- long ndl_len;
+ int ndl_len;
long offset;
php_iconv_err_t err;
@@ -1569,11 +1569,11 @@
PHP_FUNCTION(iconv_strrpos)
{
char *charset;
- long charset_len;
+ int charset_len;
char *haystk;
- long haystk_len;
+ int haystk_len;
char *ndl;
- long ndl_len;
+ int ndl_len;
php_iconv_err_t err;
@@ -1604,18 +1604,18 @@
PHP_FUNCTION(iconv_mime_encode)
{
char *field_name;
- long field_name_len;
+ int field_name_len;
char *field_value;
- long field_value_len;
+ int field_value_len;
char *scheme;
- long scheme_len;
+ int scheme_len;
char *in_charset;
- long in_charset_len;
+ int in_charset_len;
char *out_charset;
- long out_charset_len;
+ int out_charset_len;
long line_len = 76;
char *lfchars = "\r\n";
- long lfchars_len = sizeof("\r\n")-1;
+ int lfchars_len = sizeof("\r\n")-1;
php_iconv_enc_scheme_t scheme_id = PHP_ICONV_ENC_SCHEME_BASE64;
@@ -1668,9 +1668,9 @@
PHP_FUNCTION(iconv_mime_decode)
{
char *encoded_str;
- long encoded_str_len;
+ int encoded_str_len;
char *charset;
- long charset_len;
+ int charset_len;
smart_str retval = {0};
Index: php4/ext/ldap/ldap.c
diff -u php4/ext/ldap/ldap.c:1.134 php4/ext/ldap/ldap.c:1.135
--- php4/ext/ldap/ldap.c:1.134 Sat Feb 15 22:48:45 2003
+++ php4/ext/ldap/ldap.c Thu Mar 6 18:07:25 2003
@@ -22,7 +22,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: ldap.c,v 1.134 2003/02/16 03:48:45 wez Exp $ */
+/* $Id: ldap.c,v 1.135 2003/03/06 23:07:25 ddhill Exp $ */
#define IS_EXT_MODULE
#ifdef HAVE_CONFIG_H
@@ -286,7 +286,7 @@
php_info_print_table_start();
php_info_print_table_row(2, "LDAP Support", "enabled" );
- php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 1.134 2003/02/16
03:48:45 wez Exp $" );
+ php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 1.135 2003/03/06
23:07:25 ddhill Exp $" );
if (LDAPG(max_links) == -1) {
snprintf(tmp, 31, "%ld/unlimited", LDAPG(num_links));
@@ -345,11 +345,11 @@
{
char *host = NULL;
int hostlen;
- int port = 389; /* Default port */
+ long port = 389; /* Default port */
#ifdef HAVE_ORALDAP
char *wallet, *walletpasswd;
int walletlen, walletpasswdlen;
- int authmode;
+ long authmode;
int ssl=0;
#endif
ldap_linkdata *ld;
Index: php4/ext/mcrypt/mcrypt.c
diff -u php4/ext/mcrypt/mcrypt.c:1.82 php4/ext/mcrypt/mcrypt.c:1.83
--- php4/ext/mcrypt/mcrypt.c:1.82 Sat Jan 18 14:41:48 2003
+++ php4/ext/mcrypt/mcrypt.c Thu Mar 6 18:07:25 2003
@@ -16,7 +16,7 @@
| Derick Rethans <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: mcrypt.c,v 1.82 2003/01/18 19:41:48 iliaa Exp $ */
+/* $Id: mcrypt.c,v 1.83 2003/03/06 23:07:25 ddhill Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1210,7 +1210,7 @@
PHP_FUNCTION(mcrypt_create_iv)
{
char *iv;
- iv_source source = RANDOM;
+ long source = RANDOM;
long size;
int n = 0;
Index: php4/ext/mhash/mhash.c
diff -u php4/ext/mhash/mhash.c:1.42 php4/ext/mhash/mhash.c:1.43
--- php4/ext/mhash/mhash.c:1.42 Sun Feb 23 22:27:00 2003
+++ php4/ext/mhash/mhash.c Thu Mar 6 18:07:25 2003
@@ -107,7 +107,7 @@
Gets the block size of hash */
PHP_FUNCTION(mhash_get_block_size)
{
- int hash;
+ long hash;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &hash) == FAILURE) {
WRONG_PARAM_COUNT;
@@ -123,7 +123,7 @@
PHP_FUNCTION(mhash_get_hash_name)
{
char *name;
- int hash;
+ long hash;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &hash) == FAILURE) {
WRONG_PARAM_COUNT;
@@ -147,7 +147,7 @@
MHASH td;
int bsize;
unsigned char *hash_data;
- int hash;
+ long hash;
int data_len, key_len=0;
char *data, *key=NULL;
@@ -196,7 +196,7 @@
{
KEYGEN keystruct;
char salt[SALT_SIZE], *ret;
- int hash, bytes;
+ long hash, bytes;
char *password, *in_salt;
int password_len, salt_len;
Index: php4/ext/openssl/openssl.c
diff -u php4/ext/openssl/openssl.c:1.68 php4/ext/openssl/openssl.c:1.69
--- php4/ext/openssl/openssl.c:1.68 Fri Feb 28 12:23:45 2003
+++ php4/ext/openssl/openssl.c Thu Mar 6 18:07:26 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: openssl.c,v 1.68 2003/02/28 17:23:45 iliaa Exp $ */
+/* $Id: openssl.c,v 1.69 2003/03/06 23:07:26 ddhill Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -737,7 +737,7 @@
BIO * bio_out;
long certresource;
char * filename;
- long filename_len;
+ int filename_len;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs|b", &zcert,
&filename, &filename_len, ¬ext) == FAILURE) {
return;
@@ -1023,7 +1023,7 @@
STACK_OF(X509) * untrustedchain = NULL;
long purpose;
char * untrusted = NULL;
- long untrusted_len;
+ int untrusted_len;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zl|a!s", &zcert,
&purpose, &zcainfo, &untrusted, &untrusted_len)
== FAILURE) {
@@ -1371,7 +1371,7 @@
X509_REQ * csr;
zval * zcsr = NULL;
zend_bool notext = 1;
- char * filename = NULL; long filename_len;
+ char * filename = NULL; int filename_len;
BIO * bio_out;
long csr_resource;
@@ -1917,8 +1917,8 @@
{
struct php_x509_request req;
zval * zpkey, * args = NULL;
- char * passphrase = NULL; long passphrase_len = 0;
- char * filename = NULL; long filename_len = 0;
+ char * passphrase = NULL; int passphrase_len = 0;
+ char * filename = NULL; int filename_len = 0;
long key_resource = -1;
EVP_PKEY * key;
BIO * bio_out = NULL;
@@ -1973,7 +1973,7 @@
{
struct php_x509_request req;
zval * zpkey, * args = NULL, *out;
- char * passphrase = NULL; long passphrase_len = 0;
+ char * passphrase = NULL; int passphrase_len = 0;
long key_resource = -1;
EVP_PKEY * key;
BIO * bio_out = NULL;
@@ -2065,7 +2065,7 @@
zval *cert;
EVP_PKEY *pkey;
char * passphrase = "";
- long passphrase_len;
+ int passphrase_len;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z|s", &cert,
&passphrase, &passphrase_len) == FAILURE) {
return;
@@ -2095,9 +2095,9 @@
PKCS7 * p7 = NULL;
BIO * in = NULL, * datain = NULL;
long flags = 0;
- char * filename; long filename_len;
- char * extracerts = NULL; long extracerts_len;
- char * signersfilename = NULL; long signersfilename_len;
+ char * filename; int filename_len;
+ char * extracerts = NULL; int extracerts_len;
+ char * signersfilename = NULL; int signersfilename_len;
RETVAL_LONG(-1);
@@ -2196,8 +2196,8 @@
uint strindexlen;
ulong intindex;
char * strindex;
- char * infilename = NULL; long infilename_len;
- char * outfilename = NULL; long outfilename_len;
+ char * infilename = NULL; int infilename_len;
+ char * outfilename = NULL; int outfilename_len;
RETVAL_FALSE;
@@ -2351,9 +2351,9 @@
uint strindexlen;
HashPosition hpos;
char * strindex;
- char * infilename; long infilename_len;
- char * outfilename; long outfilename_len;
- char * extracertsfilename = NULL; long extracertsfilename_len;
+ char * infilename; int infilename_len;
+ char * outfilename; int outfilename_len;
+ char * extracertsfilename = NULL; int extracertsfilename_len;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sszza!|ls",
&infilename, &infilename_len, &outfilename,
&outfilename_len,
@@ -2455,8 +2455,8 @@
long certresval, keyresval;
BIO * in = NULL, * out = NULL, * datain = NULL;
PKCS7 * p7 = NULL;
- char * infilename; long infilename_len;
- char * outfilename; long outfilename_len;
+ char * infilename; int infilename_len;
+ char * outfilename; int outfilename_len;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ssz|z", &infilename,
&infilename_len,
&outfilename, &outfilename_len, &recipcert, &recipkey)
== FAILURE) {
@@ -2525,7 +2525,8 @@
int successful = 0;
long keyresource = -1;
char * data;
- long data_len, padding = RSA_PKCS1_PADDING;
+ int data_len;
+ long padding = RSA_PKCS1_PADDING;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "szz|l", &data,
&data_len, &crypted, &key, &padding) == FAILURE) {
return;
@@ -2584,7 +2585,7 @@
long padding = RSA_PKCS1_PADDING;
long keyresource = -1;
char * data;
- long data_len;
+ int data_len;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "szz|l", &data,
&data_len, &crypted, &key, &padding) == FAILURE) {
return;
@@ -2649,7 +2650,7 @@
long keyresource = -1;
long padding = RSA_PKCS1_PADDING;
char * data;
- long data_len;
+ int data_len;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "szz|l", &data,
&data_len, &crypted, &key, &padding) == FAILURE)
return;
@@ -2708,7 +2709,7 @@
long keyresource = -1;
long padding = RSA_PKCS1_PADDING;
char * data;
- long data_len;
+ int data_len;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "szz|l", &data,
&data_len, &crypted, &key, &padding) == FAILURE) {
return;
@@ -2792,7 +2793,7 @@
int siglen;
unsigned char *sigbuf;
long keyresource = -1;
- char * data; long data_len;
+ char * data; int data_len;
EVP_MD_CTX md_ctx;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "szz", &data, &data_len,
&signature, &key) == FAILURE) {
@@ -2833,8 +2834,8 @@
int err;
EVP_MD_CTX md_ctx;
long keyresource = -1;
- char * data; long data_len;
- char * signature; long signature_len;
+ char * data; int data_len;
+ char * signature; int signature_len;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ssz", &data, &data_len,
&signature, &signature_len, &key) == FAILURE) {
return;
@@ -2868,7 +2869,7 @@
long * key_resources; /* so we know what to cleanup */
int i, len1, len2, *eksl, nkeys;
unsigned char *buf = NULL, **eks;
- char * data; long data_len;
+ char * data; int data_len;
EVP_CIPHER_CTX ctx;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "szza/", &data,
&data_len, &sealdata, &ekeys, &pubkeys) == FAILURE) {
@@ -2978,8 +2979,8 @@
unsigned char *buf;
long keyresource = -1;
EVP_CIPHER_CTX ctx;
- char * data; long data_len;
- char * ekey; long ekey_len;
+ char * data; int data_len;
+ char * ekey; int ekey_len;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "szsz", &data, &data_len,
&opendata, &ekey, &ekey_len, &privkey) == FAILURE) {
return;
Index: php4/ext/pgsql/pgsql.c
diff -u php4/ext/pgsql/pgsql.c:1.263 php4/ext/pgsql/pgsql.c:1.264
--- php4/ext/pgsql/pgsql.c:1.263 Thu Feb 20 16:48:58 2003
+++ php4/ext/pgsql/pgsql.c Thu Mar 6 18:07:26 2003
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pgsql.c,v 1.263 2003/02/20 21:48:58 jerenkrantz Exp $ */
+/* $Id: pgsql.c,v 1.264 2003/03/06 23:07:26 ddhill Exp $ */
#include <stdlib.h>
@@ -1439,7 +1439,7 @@
PHP_FUNCTION(pg_result_seek)
{
zval *result;
- int row;
+ long row;
pgsql_result_handle *pg_result;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &result, &row) ==
FAILURE) {
@@ -2190,7 +2190,7 @@
PHP_FUNCTION(pg_lo_seek)
{
zval *pgsql_id = NULL;
- int offset = 0, whence = SEEK_CUR;
+ long offset = 0, whence = SEEK_CUR;
pgLofp *pgsql;
int argc = ZEND_NUM_ARGS();
@@ -2599,7 +2599,8 @@
PHP_FUNCTION(pg_escape_string)
{
char *from = NULL, *to = NULL;
- size_t from_len, to_len;
+ size_t to_len;
+ long from_len;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s",
&from, &from_len) ==
FAILURE) {
return;
@@ -2616,7 +2617,8 @@
PHP_FUNCTION(pg_escape_bytea)
{
char *from = NULL, *to = NULL;
- size_t from_len, to_len;
+ size_t to_len;
+ long from_len;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s",
&from, &from_len) ==
FAILURE) {
return;
@@ -2737,7 +2739,8 @@
PHP_FUNCTION(pg_unescape_bytea)
{
char *from = NULL, *to = NULL;
- size_t from_len, to_len;
+ size_t to_len;
+ long from_len;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s",
&from, &from_len) ==
FAILURE) {
return;
@@ -3905,7 +3908,7 @@
{
zval *pgsql_link, *values;
char *table_name;
- size_t table_name_len;
+ int table_name_len;
ulong option = 0;
PGconn *pg_link;
int id = -1;
@@ -4064,7 +4067,7 @@
{
zval *pgsql_link, *values;
char *table, *sql = NULL;
- ulong table_len;
+ int table_len;
ulong option = PGSQL_DML_EXEC;
PGconn *pg_link;
int id = -1, argc = ZEND_NUM_ARGS();
@@ -4213,7 +4216,7 @@
{
zval *pgsql_link, *values, *ids;
char *table, *sql = NULL;
- ulong table_len;
+ int table_len;
ulong option = PGSQL_DML_EXEC;
PGconn *pg_link;
int id = -1, argc = ZEND_NUM_ARGS();
@@ -4302,7 +4305,8 @@
{
zval *pgsql_link, *ids;
char *table, *sql = NULL;
- ulong table_len, option = PGSQL_DML_EXEC;
+ int table_len;
+ ulong option = PGSQL_DML_EXEC;
PGconn *pg_link;
int id = -1, argc = ZEND_NUM_ARGS();
@@ -4439,7 +4443,8 @@
{
zval *pgsql_link, *ids;
char *table, *sql = NULL;
- ulong table_len, option = PGSQL_DML_EXEC;
+ int table_len;
+ ulong option = PGSQL_DML_EXEC;
PGconn *pg_link;
int id = -1, argc = ZEND_NUM_ARGS();
Index: php4/ext/posix/posix.c
diff -u php4/ext/posix/posix.c:1.54 php4/ext/posix/posix.c:1.55
--- php4/ext/posix/posix.c:1.54 Sat Jan 18 19:45:45 2003
+++ php4/ext/posix/posix.c Thu Mar 6 18:07:26 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: posix.c,v 1.54 2003/01/19 00:45:45 iliaa Exp $ */
+/* $Id: posix.c,v 1.55 2003/03/06 23:07:26 ddhill Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -130,7 +130,7 @@
static PHP_MINFO_FUNCTION(posix)
{
php_info_print_table_start();
- php_info_print_table_row(2, "Revision", "$Revision: 1.54 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.55 $");
php_info_print_table_end();
}
/* }}} */
@@ -687,7 +687,8 @@
PHP_FUNCTION(posix_mkfifo)
{
char *path;
- long path_len, mode;
+ int path_len;
+ long mode;
int result;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sl", &path, &path_len,
&mode) == FAILURE)
Index: php4/ext/sockets/sockets.c
diff -u php4/ext/sockets/sockets.c:1.131 php4/ext/sockets/sockets.c:1.132
--- php4/ext/sockets/sockets.c:1.131 Sat Jan 18 14:28:06 2003
+++ php4/ext/sockets/sockets.c Thu Mar 6 18:07:26 2003
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sockets.c,v 1.131 2003/01/18 19:28:06 iliaa Exp $ */
+/* $Id: sockets.c,v 1.132 2003/03/06 23:07:26 ddhill Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -553,7 +553,8 @@
struct timeval *tv_p = NULL;
fd_set rfds, wfds, efds;
SOCKET 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;
@@ -600,7 +601,7 @@
PHP_FUNCTION(socket_create_listen)
{
php_socket *php_sock;
- int port, backlog = 128;
+ long port, backlog = 128;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l|l", &port, &backlog)
== FAILURE)
return;
@@ -699,7 +700,7 @@
{
zval *arg1;
php_socket *php_sock;
- int backlog = 0;
+ long backlog = 0;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|l", &arg1, &backlog)
== FAILURE)
return;
@@ -736,7 +737,8 @@
{
zval *arg1;
php_socket *php_sock;
- int retval, str_len, length;
+ int retval, str_len;
+ long length;
char *str;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs|l", &arg1, &str,
&str_len, &length) == FAILURE)
@@ -770,7 +772,8 @@
zval *arg1;
php_socket *php_sock;
char *tmpbuf;
- int retval, length, type = PHP_BINARY_READ;
+ int retval;
+ long length, type = PHP_BINARY_READ;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl|l", &arg1, &length,
&type) == FAILURE)
return;
@@ -915,7 +918,7 @@
Creates an endpoint for communication in the domain specified by domain, of type
specified by type */
PHP_FUNCTION(socket_create)
{
- int arg1, arg2, arg3;
+ long arg1, arg2, arg3;
php_socket *php_sock = (php_socket*)emalloc(sizeof(php_socket));
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "lll", &arg1, &arg2,
&arg3) == FAILURE) {
@@ -956,7 +959,8 @@
struct sockaddr_in sin;
struct sockaddr_un s_un;
char *addr;
- int retval, addr_len, port;
+ int retval, addr_len;
+ long port;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs|l", &arg1, &addr,
&addr_len, &port) == FAILURE)
return;
@@ -1004,7 +1008,7 @@
Returns a string describing an error */
PHP_FUNCTION(socket_strerror)
{
- int arg1;
+ long arg1;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &arg1) == FAILURE)
return;
@@ -1022,7 +1026,8 @@
struct sockaddr *sock_type = (struct sockaddr*) &sa_storage;
php_socket *php_sock;
char *addr;
- int addr_len, port = 0;
+ int addr_len;
+ int port = 0;
long retval = 0;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs|l", &arg1, &addr,
&addr_len, &port) == FAILURE)
@@ -1119,7 +1124,7 @@
{
zval *iovec_id;
php_iovec_t *vector;
- unsigned int iovec_position;
+ unsigned long iovec_position;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &iovec_id,
&iovec_position) == FAILURE)
return;
@@ -1142,7 +1147,7 @@
zval *iovec_id;
php_iovec_t *vector;
int new_val_len;
- unsigned int iovec_position;
+ unsigned long iovec_position;
char *new_val;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rls", &iovec_id,
&iovec_position, &new_val, &new_val_len) == FAILURE)
@@ -1173,7 +1178,7 @@
zval *iovec_id;
php_iovec_t *vector;
struct iovec *vector_array;
- int iov_len;
+ long iov_len;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &iovec_id,
&iov_len) == FAILURE)
return;
@@ -1201,7 +1206,8 @@
zval *iovec_id;
php_iovec_t *vector;
struct iovec *vector_array;
- unsigned int i, iov_pos;
+ unsigned int i;
+ unsigned long iov_pos;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &iovec_id,
&iov_pos) == FAILURE)
return;
@@ -1301,7 +1307,8 @@
zval *php_sock_res, *buf;
char *recv_buf;
php_socket *php_sock;
- int retval, len, flags;
+ int retval;
+ long len, flags;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rzll", &php_sock_res,
&buf, &len, &flags) == FAILURE)
return;
@@ -1342,7 +1349,8 @@
{
zval *arg1;
php_socket *php_sock;
- int buf_len, len, flags, retval;
+ int buf_len, retval;
+ long len, flags;
char *buf;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rsll", &arg1, &buf,
&buf_len, &len, &flags) == FAILURE)
@@ -1370,7 +1378,8 @@
struct sockaddr_un s_un;
struct sockaddr_in sin;
socklen_t slen;
- int retval, arg3, arg4;
+ int retval;
+ long arg3, arg4;
char *recv_buf, *address;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rzllz|z", &arg1, &arg2,
&arg3, &arg4, &arg5, &arg6) == FAILURE)
@@ -1445,7 +1454,8 @@
php_socket *php_sock;
struct sockaddr_un s_un;
struct sockaddr_in sin;
- int retval, buf_len, len, flags, addr_len,
port = 0;
+ int retval, buf_len, addr_len;
+ long len, flags, port = 0;
char *buf, *addr;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rslls|l", &arg1, &buf,
&buf_len, &len, &flags, &addr, &addr_len, &port) == FAILURE)
@@ -1645,7 +1655,8 @@
struct sockaddr sa;
char *addr;
socklen_t salen;
- int flags, addr_len, port;
+ int addr_len;
+ long flags, port;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rrls|l", &arg1, &arg2,
&flags, &addr, &addr_len, &port) == FAILURE)
return;
@@ -1729,7 +1740,8 @@
struct timeval tv;
socklen_t optlen;
php_socket *php_sock;
- int other_val, level, optname;
+ int other_val;
+ long level, optname;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rll", &arg1, &level,
&optname) == FAILURE)
return;
@@ -1788,7 +1800,8 @@
struct linger lv;
struct timeval tv;
php_socket *php_sock;
- int ov, optlen, retval, level, optname;
+ int ov, optlen, retval;
+ long level, optname;
void *opt_ptr;
HashTable *opt_ht;
@@ -1880,7 +1893,7 @@
zval *retval[2], *fds_array_zval;
php_socket *php_sock[2];
SOCKET fds_array[2];
- int domain, type, protocol;
+ long domain, type, protocol;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "lllz", &domain, &type,
&protocol, &fds_array_zval) == FAILURE)
return;
@@ -1932,7 +1945,7 @@
PHP_FUNCTION(socket_shutdown)
{
zval *arg1;
- int how_shutdown = 2;
+ long how_shutdown = 2;
php_socket *php_sock;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|l", &arg1,
&how_shutdown) == FAILURE)
Index: php4/ext/standard/fsock.c
diff -u php4/ext/standard/fsock.c:1.111 php4/ext/standard/fsock.c:1.112
--- php4/ext/standard/fsock.c:1.111 Fri Feb 28 14:53:20 2003
+++ php4/ext/standard/fsock.c Thu Mar 6 18:07:27 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: fsock.c,v 1.111 2003/02/28 19:53:20 wez Exp $ */
+/* $Id: fsock.c,v 1.112 2003/03/06 23:07:27 ddhill Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -33,7 +33,7 @@
{
char *host;
long host_len;
- int port = -1;
+ long port = -1;
zval *zerrno = NULL, *zerrstr = NULL;
double timeout = FG(default_socket_timeout);
unsigned long conv;
Index: php4/ext/standard/head.c
diff -u php4/ext/standard/head.c:1.67 php4/ext/standard/head.c:1.68
--- php4/ext/standard/head.c:1.67 Tue Dec 31 11:07:42 2002
+++ php4/ext/standard/head.c Thu Mar 6 18:07:27 2003
@@ -15,7 +15,7 @@
| Author: Rasmus Lerdorf <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: head.c,v 1.67 2002/12/31 16:07:42 sebastian Exp $ */
+/* $Id: head.c,v 1.68 2003/03/06 23:07:27 ddhill Exp $ */
#include <stdio.h>
@@ -142,7 +142,7 @@
PHP_FUNCTION(setcookie)
{
char *name, *value = NULL, *path = NULL, *domain = NULL;
- time_t expires = 0;
+ long expires = 0;
zend_bool secure = 0;
int name_len, value_len, path_len, domain_len;
Index: php4/ext/standard/html.c
diff -u php4/ext/standard/html.c:1.72 php4/ext/standard/html.c:1.73
--- php4/ext/standard/html.c:1.72 Sat Feb 22 15:33:11 2003
+++ php4/ext/standard/html.c Thu Mar 6 18:07:27 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: html.c,v 1.72 2003/02/22 20:33:11 iliaa Exp $ */
+/* $Id: html.c,v 1.73 2003/03/06 23:07:27 ddhill Exp $ */
#include "php.h"
#if PHP_WIN32
@@ -872,7 +872,8 @@
PHP_FUNCTION(html_entity_decode)
{
char *str, *hint_charset = NULL;
- int str_len, hint_charset_len, len, quote_style = ENT_COMPAT;
+ int str_len, hint_charset_len, len;
+ long quote_style = ENT_COMPAT;
char *replaced;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|ls", &str, &str_len,
@@ -898,7 +899,7 @@
Returns the internal translation table used by htmlspecialchars and htmlentities */
PHP_FUNCTION(get_html_translation_table)
{
- int which = HTML_SPECIALCHARS, quote_style = ENT_COMPAT;
+ long which = HTML_SPECIALCHARS, quote_style = ENT_COMPAT;
int i, j;
char ind[2];
enum entity_charset charset = determine_charset(NULL TSRMLS_CC);
Index: php4/ext/standard/metaphone.c
diff -u php4/ext/standard/metaphone.c:1.23 php4/ext/standard/metaphone.c:1.24
--- php4/ext/standard/metaphone.c:1.23 Sat Jan 18 15:01:46 2003
+++ php4/ext/standard/metaphone.c Thu Mar 6 18:07:27 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: metaphone.c,v 1.23 2003/01/18 20:01:46 iliaa Exp $ */
+/* $Id: metaphone.c,v 1.24 2003/03/06 23:07:27 ddhill Exp $ */
/*
Based on CPANs "Text-Metaphone-1.96" by Michael G Schwern <[EMAIL PROTECTED]>
@@ -35,7 +35,8 @@
{
char *str;
char *result = 0;
- int phones = 0, str_len;
+ int str_len;
+ long phones = 0;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &str, &str_len,
&phones) == FAILURE) {
Index: php4/ext/standard/string.c
diff -u php4/ext/standard/string.c:1.361 php4/ext/standard/string.c:1.362
--- php4/ext/standard/string.c:1.361 Mon Feb 24 17:19:36 2003
+++ php4/ext/standard/string.c Thu Mar 6 18:07:27 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: string.c,v 1.361 2003/02/24 22:19:36 moriyoshi Exp $ */
+/* $Id: string.c,v 1.362 2003/03/06 23:07:27 ddhill Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -202,7 +202,8 @@
static void php_spn_common_handler(INTERNAL_FUNCTION_PARAMETERS, int behavior)
{
char *s11, *s22;
- int len1, len2, start, len;
+ int len1, len2;
+ long start, len;
start = 0;
len = 0;
@@ -1228,7 +1229,7 @@
zval *tmp;
char *path, *ret = NULL;
int path_len;
- int opt = PHP_PATHINFO_ALL;
+ long opt = PHP_PATHINFO_ALL;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &path, &path_len,
&opt) == FAILURE) {
return;
Index: php4/ext/sysvsem/sysvsem.c
diff -u php4/ext/sysvsem/sysvsem.c:1.43 php4/ext/sysvsem/sysvsem.c:1.44
--- php4/ext/sysvsem/sysvsem.c:1.43 Sat Jan 18 19:45:50 2003
+++ php4/ext/sysvsem/sysvsem.c Thu Mar 6 18:07:27 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sysvsem.c,v 1.43 2003/01/19 00:45:50 iliaa Exp $ */
+/* $Id: sysvsem.c,v 1.44 2003/03/06 23:07:27 ddhill Exp $ */
/* Latest update build anc tested on Linux 2.2.14
*
@@ -161,7 +161,7 @@
Return an id for the semaphore with the given key, and allow max_acquire (default
1) processes to acquire it simultaneously */
PHP_FUNCTION(sem_get)
{
- int key, max_acquire, perm, auto_release = 1;
+ long key, max_acquire, perm, auto_release = 1;
int semid;
struct sembuf sop[3];
int count;
Index: php4/ext/zip/zip.c
diff -u php4/ext/zip/zip.c:1.35 php4/ext/zip/zip.c:1.36
--- php4/ext/zip/zip.c:1.35 Sat Jan 18 14:20:02 2003
+++ php4/ext/zip/zip.c Thu Mar 6 18:07:28 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zip.c,v 1.35 2003/01/18 19:20:02 iliaa Exp $ */
+/* $Id: zip.c,v 1.36 2003/03/06 23:07:28 ddhill Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -284,7 +284,7 @@
zval *zzip_ent;
php_zzip_dirent *entry = NULL;
char *buf = NULL;
- int len = 1024;
+ long len = 1024;
int ret = 0;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|l", &zzip_ent, &len)
== FAILURE) {
Index: php4/ext/zlib/zlib.c
diff -u php4/ext/zlib/zlib.c:1.164 php4/ext/zlib/zlib.c:1.165
--- php4/ext/zlib/zlib.c:1.164 Thu Mar 6 15:31:18 2003
+++ php4/ext/zlib/zlib.c Thu Mar 6 18:07:28 2003
@@ -18,7 +18,7 @@
| Jade Nicoletti <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: zlib.c,v 1.164 2003/03/06 20:31:18 sesser Exp $ */
+/* $Id: zlib.c,v 1.165 2003/03/06 23:07:28 ddhill Exp $ */
#define IS_EXT_MODULE
#ifdef HAVE_CONFIG_H
@@ -806,7 +806,7 @@
{
char *data, *s2;
int data_len;
- int level = Z_DEFAULT_COMPRESSION, coding = CODING_GZIP;
+ long level = Z_DEFAULT_COMPRESSION, coding = CODING_GZIP;
int status;
z_stream stream;
Index: php4/main/output.c
diff -u php4/main/output.c:1.148 php4/main/output.c:1.149
--- php4/main/output.c:1.148 Sun Feb 9 14:09:52 2003
+++ php4/main/output.c Thu Mar 6 18:07:28 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: output.c,v 1.148 2003/02/09 19:09:52 sniper Exp $ */
+/* $Id: output.c,v 1.149 2003/03/06 23:07:28 ddhill Exp $ */
#include "php.h"
#include "ext/standard/head.h"
@@ -712,7 +712,7 @@
PHP_FUNCTION(ob_start)
{
zval *output_handler=NULL;
- uint chunk_size=0;
+ long chunk_size=0;
zend_bool erase=1;
int argc = ZEND_NUM_ARGS();
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
