ddhill Mon Mar 10 15:30:33 2003 EDT Modified files: /php4/ext/pgsql pgsql.c /php4/ext/standard url_scanner.c url_scanner_ex.c Log: Correcting int/long mismatched - 64bit issues. Index: php4/ext/pgsql/pgsql.c diff -u php4/ext/pgsql/pgsql.c:1.265 php4/ext/pgsql/pgsql.c:1.266 --- php4/ext/pgsql/pgsql.c:1.265 Fri Mar 7 00:15:20 2003 +++ php4/ext/pgsql/pgsql.c Mon Mar 10 15:30:32 2003 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pgsql.c,v 1.265 2003/03/07 05:15:20 sniper Exp $ */ +/* $Id: pgsql.c,v 1.266 2003/03/10 20:30:32 ddhill Exp $ */ #include <stdlib.h> @@ -1727,7 +1727,7 @@ zval *pgsql_link = NULL; long oid_long; char *oid_string, *end_ptr; - size_t oid_strlen; + int oid_strlen; PGconn *pgsql; Oid oid; int id = -1; @@ -1794,7 +1794,7 @@ zval *pgsql_link = NULL; long oid_long; char *oid_string, *end_ptr, *mode_string; - size_t oid_strlen, mode_strlen; + int oid_strlen, mode_strlen; PGconn *pgsql; Oid oid; int id = -1, pgsql_mode=0, pgsql_lofd; @@ -2099,7 +2099,7 @@ { zval *pgsql_link = NULL; char *file_out, *oid_string, *end_ptr; - size_t oid_strlen; + int oid_strlen; int id = -1, name_len; long oid_long; Oid oid; @@ -2599,8 +2599,8 @@ PHP_FUNCTION(pg_escape_string) { char *from = NULL, *to = NULL; - size_t to_len; - long from_len; + int to_len; + int from_len; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &from, &from_len) == FAILURE) { return; @@ -2618,7 +2618,7 @@ { char *from = NULL, *to = NULL; size_t to_len; - long from_len; + int from_len; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &from, &from_len) == FAILURE) { return; @@ -2740,7 +2740,7 @@ { char *from = NULL, *to = NULL; size_t to_len; - long from_len; + int from_len; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &from, &from_len) == FAILURE) { return; @@ -3077,7 +3077,7 @@ PGresult *pg_result; char *tmp_name; smart_str querystr = {0}; - size_t new_len; + int new_len; int i, num_rows; zval *elem; @@ -3969,7 +3969,8 @@ char buf[256]; char *fld; smart_str querystr = {0}; - int key_type, fld_len, ret = FAILURE; + int key_type, ret = FAILURE; + uint fld_len; ulong num_idx; HashPosition pos; @@ -4099,7 +4100,7 @@ static inline int build_assignment_string(smart_str *querystr, HashTable *ht, const char *pad, int pad_len TSRMLS_DC) { HashPosition pos; - size_t fld_len; + uint fld_len; int key_type; ulong num_idx; char *fld; Index: php4/ext/standard/url_scanner.c diff -u php4/ext/standard/url_scanner.c:1.40 php4/ext/standard/url_scanner.c:1.41 --- php4/ext/standard/url_scanner.c:1.40 Tue Dec 31 11:07:56 2002 +++ php4/ext/standard/url_scanner.c Mon Mar 10 15:30:33 2003 @@ -15,7 +15,7 @@ | Author: Hartmut Holzgraefe <[EMAIL PROTECTED]> | +----------------------------------------------------------------------+ */ -/* $Id: url_scanner.c,v 1.40 2002/12/31 16:07:56 sebastian Exp $ */ +/* $Id: url_scanner.c,v 1.41 2003/03/10 20:30:33 ddhill Exp $ */ #include "php.h" @@ -88,7 +88,7 @@ /* {{{ url_adapt_ext */ -char *url_adapt_ext(const char *src, size_t srclen, const char *name, const char *val, size_t *newlen) +char *url_adapt_ext(const char *src, uint srclen, const char *name, const char *val, size_t *newlen) { char buf[1024]; Index: php4/ext/standard/url_scanner_ex.c diff -u php4/ext/standard/url_scanner_ex.c:1.74 php4/ext/standard/url_scanner_ex.c:1.75 --- php4/ext/standard/url_scanner_ex.c:1.74 Wed Feb 12 09:56:13 2003 +++ php4/ext/standard/url_scanner_ex.c Mon Mar 10 15:30:33 2003 @@ -860,7 +860,7 @@ } -static char *url_adapt_ext(const char *src, size_t srclen, size_t *newlen, zend_bool do_flush TSRMLS_DC) +static char *url_adapt_ext(const char *src, uint srclen, uint *newlen, zend_bool do_flush TSRMLS_DC) { url_adapt_state_ex_t *ctx; char *retval;
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php