Correcting int/long mismatched - 64bit issues.

diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c
index a7c81fa4d7c01f62f289a712abce7668205c1cb5..cc3e7ebed6ecaad84fb5c5457fd433ce05182838 100644 (file)
--- a/ext/pgsql/pgsql.c
+++ b/ext/pgsql/pgsql.c
@@ -1727,7 +1727,7 @@ PHP_FUNCTION(pg_lo_unlink)
        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 @@ PHP_FUNCTION(pg_lo_open)
        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 @@ PHP_FUNCTION(pg_lo_export)
 {
        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_copy_from)
 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 @@ PHP_FUNCTION(pg_escape_bytea)
 {
        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 @@ PHP_FUNCTION(pg_unescape_bytea)
 {
        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 @@ PHPAPI int php_pgsql_meta_data(PGconn *pg_link, const char *table_name, zval *me
        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 @@ PHPAPI int php_pgsql_insert(PGconn *pg_link, const char *table, zval *var_array,
        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 @@ PHP_FUNCTION(pg_insert)
 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;

diff --git a/ext/standard/url_scanner.c b/ext/standard/url_scanner.c
index 32a59ea7d5fb74e1174ead13547d247ab14d5e9e..b77931eaa500ba0a384f7385f6aaca91fd0dd34c 100644 (file)
--- a/ext/standard/url_scanner.c
+++ b/ext/standard/url_scanner.c
@@ -88,7 +88,7 @@ static char *url_attr_addon(const char *tag,const char *attr,const char *val,con
 
 /* {{{ 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];
 

diff --git a/ext/standard/url_scanner_ex.c b/ext/standard/url_scanner_ex.c
index c03597c70fcaa4335e666dd4637ff2a8b6ebdc6b..78d145b659e88b6427a370827126f95ae582f935 100644 (file)
--- a/ext/standard/url_scanner_ex.c
+++ b/ext/standard/url_scanner_ex.c
@@ -860,7 +860,7 @@ char *php_url_scanner_adapt_single_url(const char *url, size_t urllen, const cha
 }
 
 
-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;