iliaa Mon, 02 Nov 2009 13:33:24 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=290146
Log:
Fixed compiler warnings
Changed paths:
U php/php-src/branches/PHP_5_2/ext/pgsql/pgsql.c
U php/php-src/branches/PHP_5_3/ext/pgsql/pgsql.c
U php/php-src/trunk/ext/pgsql/pgsql.c
Modified: php/php-src/branches/PHP_5_2/ext/pgsql/pgsql.c
===================================================================
--- php/php-src/branches/PHP_5_2/ext/pgsql/pgsql.c 2009-11-02 13:02:48 UTC
(rev 290145)
+++ php/php-src/branches/PHP_5_2/ext/pgsql/pgsql.c 2009-11-02 13:33:24 UTC
(rev 290146)
@@ -363,7 +363,7 @@
if (PGG(log_notices)) {
php_error_docref(NULL TSRMLS_CC, E_NOTICE, "%s",
notice->message);
}
- zend_hash_index_update(&PGG(notices), (int)resource_id, (void
**)¬ice, sizeof(php_pgsql_notice *), NULL);
+ zend_hash_index_update(&PGG(notices), (ulong)resource_id, (void
**)¬ice, sizeof(php_pgsql_notice *), NULL);
}
}
/* }}} */
@@ -761,13 +761,14 @@
*/
if (!(connect_type & PGSQL_CONNECT_FORCE_NEW)
&&
zend_hash_find(&EG(regular_list),str.c,str.len+1,(void **)
&index_ptr)==SUCCESS) {
- int type,link;
+ int type;
+ ulong link;
void *ptr;
if (Z_TYPE_P(index_ptr) != le_index_ptr) {
RETURN_FALSE;
}
- link = (int) index_ptr->ptr;
+ link = (uintptr_t) index_ptr->ptr;
ptr = zend_list_find(link,&type); /* check if the
link is still there */
if (ptr && (type==le_link || type==le_plink)) {
Z_LVAL_P(return_value) = link;
@@ -1754,14 +1755,15 @@
if (return_oid) {
+#if UINT_MAX > LONG_MAX /* Oid is unsigned int, we don't need this code, where
LONG is wider */
if (oid > LONG_MAX) {
smart_str oidstr = {0};
smart_str_append_unsigned(&oidstr, oid);
smart_str_0(&oidstr);
RETURN_STRINGL(oidstr.c, oidstr.len, 0);
- } else {
+ } else
+#endif
RETURN_LONG((long)oid);
- }
}
/* try to lookup the table name in the resource list */
@@ -1859,7 +1861,7 @@
case PHP_PG_FIELD_TYPE_OID:
oid = PQftype(pgsql_result, Z_LVAL_PP(field));
-
+#if UINT_MAX > LONG_MAX
if (oid > LONG_MAX) {
smart_str s = {0};
smart_str_append_unsigned(&s, oid);
@@ -1867,8 +1869,8 @@
Z_STRVAL_P(return_value) = s.c;
Z_STRLEN_P(return_value) = s.len;
Z_TYPE_P(return_value) = IS_STRING;
- }
- else
+ } else
+#endif
{
Z_LVAL_P(return_value) = (long)oid;
Z_TYPE_P(return_value) = IS_LONG;
@@ -5767,8 +5769,8 @@
{
zval *row;
char *field_name, *element, *data;
- size_t num_fields, element_len, data_len;
- int pg_numrows, pg_row;
+ size_t num_fields, element_len;
+ int data_len, pg_numrows, pg_row;
uint i;
assert(Z_TYPE_P(ret_array) == IS_ARRAY);
Modified: php/php-src/branches/PHP_5_3/ext/pgsql/pgsql.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/pgsql/pgsql.c 2009-11-02 13:02:48 UTC
(rev 290145)
+++ php/php-src/branches/PHP_5_3/ext/pgsql/pgsql.c 2009-11-02 13:33:24 UTC
(rev 290146)
@@ -819,7 +819,7 @@
if (PGG(log_notices)) {
php_error_docref(NULL TSRMLS_CC, E_NOTICE, "%s",
notice->message);
}
- zend_hash_index_update(&PGG(notices), (int)resource_id, (void
**)¬ice, sizeof(php_pgsql_notice *), NULL);
+ zend_hash_index_update(&PGG(notices), (ulong)resource_id, (void
**)¬ice, sizeof(php_pgsql_notice *), NULL);
}
}
/* }}} */
@@ -1217,13 +1217,14 @@
*/
if (!(connect_type & PGSQL_CONNECT_FORCE_NEW)
&&
zend_hash_find(&EG(regular_list),str.c,str.len+1,(void **)
&index_ptr)==SUCCESS) {
- int type,link;
+ int type;
+ ulong link;
void *ptr;
if (Z_TYPE_P(index_ptr) != le_index_ptr) {
RETURN_FALSE;
}
- link = (int) index_ptr->ptr;
+ link = (uintptr_t) index_ptr->ptr;
ptr = zend_list_find(link,&type); /* check if the
link is still there */
if (ptr && (type==le_link || type==le_plink)) {
Z_LVAL_P(return_value) = link;
@@ -2166,14 +2167,15 @@
if (return_oid) {
+#if UINT_MAX > LONG_MAX /* Oid is unsigned int, we don't need this code, where
LONG is wider */
if (oid > LONG_MAX) {
smart_str oidstr = {0};
smart_str_append_unsigned(&oidstr, oid);
smart_str_0(&oidstr);
RETURN_STRINGL(oidstr.c, oidstr.len, 0);
- } else {
+ } else
+#endif
RETURN_LONG((long)oid);
- }
}
/* try to lookup the table name in the resource list */
@@ -2271,7 +2273,7 @@
case PHP_PG_FIELD_TYPE_OID:
oid = PQftype(pgsql_result, field);
-
+#if UINT_MAX > LONG_MAX
if (oid > LONG_MAX) {
smart_str s = {0};
smart_str_append_unsigned(&s, oid);
@@ -2279,7 +2281,9 @@
Z_STRVAL_P(return_value) = s.c;
Z_STRLEN_P(return_value) = s.len;
Z_TYPE_P(return_value) = IS_STRING;
- } else {
+ } else
+#endif
+ {
Z_LVAL_P(return_value) = (long)oid;
Z_TYPE_P(return_value) = IS_LONG;
}
Modified: php/php-src/trunk/ext/pgsql/pgsql.c
===================================================================
--- php/php-src/trunk/ext/pgsql/pgsql.c 2009-11-02 13:02:48 UTC (rev 290145)
+++ php/php-src/trunk/ext/pgsql/pgsql.c 2009-11-02 13:33:24 UTC (rev 290146)
@@ -819,7 +819,7 @@
if (PGG(log_notices)) {
php_error_docref(NULL TSRMLS_CC, E_NOTICE, "%s",
notice->message);
}
- zend_hash_index_update(&PGG(notices), (int)resource_id, (void
**)¬ice, sizeof(php_pgsql_notice *), NULL);
+ zend_hash_index_update(&PGG(notices), (ulong)resource_id, (void
**)¬ice, sizeof(php_pgsql_notice *), NULL);
}
}
/* }}} */
@@ -1207,13 +1207,14 @@
*/
if (!(connect_type & PGSQL_CONNECT_FORCE_NEW)
&&
zend_hash_find(&EG(regular_list),str.c,str.len+1,(void **)
&index_ptr)==SUCCESS) {
- int type,link;
+ int type;
+ ulong link;
void *ptr;
if (Z_TYPE_P(index_ptr) != le_index_ptr) {
RETURN_FALSE;
}
- link = (int) index_ptr->ptr;
+ link = (uintptr_t) index_ptr->ptr;
ptr = zend_list_find(link,&type); /* check if the
link is still there */
if (ptr && (type==le_link || type==le_plink)) {
Z_LVAL_P(return_value) = link;
@@ -2156,14 +2157,15 @@
if (return_oid) {
+#if UINT_MAX > LONG_MAX /* Oid is unsigned int, we don't need this code, where
LONG is wider */
if (oid > LONG_MAX) {
smart_str oidstr = {0};
smart_str_append_unsigned(&oidstr, oid);
smart_str_0(&oidstr);
RETURN_STRINGL(oidstr.c, oidstr.len, 0);
- } else {
+ } else
+#endif
RETURN_LONG((long)oid);
- }
}
/* try to lookup the table name in the resource list */
@@ -2261,7 +2263,7 @@
case PHP_PG_FIELD_TYPE_OID:
oid = PQftype(pgsql_result, field);
-
+#if UINT_MAX > LONG_MAX
if (oid > LONG_MAX) {
smart_str s = {0};
smart_str_append_unsigned(&s, oid);
@@ -2269,7 +2271,9 @@
Z_STRVAL_P(return_value) = s.c;
Z_STRLEN_P(return_value) = s.len;
Z_TYPE_P(return_value) = IS_STRING;
- } else {
+ } else
+#endif
+ {
Z_LVAL_P(return_value) = (long)oid;
Z_TYPE_P(return_value) = IS_LONG;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
