com php-src: Fix loss of precision: ext/mysqli/mysqli_nonapi .c ext/mysqlnd/mysqlnd.c ext/mysqlnd/mysqlnd.h
| From: | Andrey Hristov | Date: | Wed, 04 Dec 2013 10:06:59 +0000 |
| Subject: | com php-src: Fix loss of precision: ext/mysqli/mysqli_nonapi .c ext/mysqlnd/mysqlnd.c ext/mysqlnd/mysqlnd.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-74240@lists.php.net to get a copy of this message | ||
Commit: 86aad979798a665e3f23aafb200390d51d44f8fa
Author: Andrey Hristov <andrey@php.net> Wed, 4 Dec 2013 12:06:59 +0200
Parents: d1314893fd1325ca6aa0831101896e31135a2658
Branches: PHP-5.4 PHP-5.5 PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=86aad979798a665e3f23aafb200390d51d44f8fa
Log:
Fix loss of precision
Changed paths:
M ext/mysqli/mysqli_nonapi.c
M ext/mysqlnd/mysqlnd.c
M ext/mysqlnd/mysqlnd.h
Diff:
diff --git a/ext/mysqli/mysqli_nonapi.c b/ext/mysqli/mysqli_nonapi.c
index e1557ef..35ea163 100644
--- a/ext/mysqli/mysqli_nonapi.c
+++ b/ext/mysqli/mysqli_nonapi.c
@@ -777,7 +777,7 @@ PHP_FUNCTION(mysqli_poll)
MYSQLND **new_r_array = NULL, **new_e_array = NULL, **new_dont_poll_array = NULL;
long sec = 0, usec = 0;
enum_func_status ret;
- uint desc_num;
+ int desc_num;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a!a!al|l", &r_array,
&e_array, &dont_poll_array, &sec, &usec) == FAILURE) {
return;
diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c
index 20e63e1..a09ebe1 100644
--- a/ext/mysqlnd/mysqlnd.c
+++ b/ext/mysqlnd/mysqlnd.c
@@ -1214,7 +1214,7 @@ static int mysqlnd_stream_array_from_fd_set(MYSQLND ** conn_array, fd_set *
fds
/* {{{ _mysqlnd_poll */
PHPAPI enum_func_status
-_mysqlnd_poll(MYSQLND **r_array, MYSQLND **e_array, MYSQLND ***dont_poll, long sec, long usec, uint
* desc_num TSRMLS_DC)
+_mysqlnd_poll(MYSQLND **r_array, MYSQLND **e_array, MYSQLND ***dont_poll, long sec, long usec, int
* desc_num TSRMLS_DC)
{
struct timeval tv;
struct timeval *tv_p = NULL;
diff --git a/ext/mysqlnd/mysqlnd.h b/ext/mysqlnd/mysqlnd.h
index e707c41..2d8f599 100644
--- a/ext/mysqlnd/mysqlnd.h
+++ b/ext/mysqlnd/mysqlnd.h
@@ -117,7 +117,7 @@ PHPAPI void _mysqlnd_debug(const char *mode TSRMLS_DC);
#define mysqlnd_reap_async_query(conn) ((conn)->data)->m->reap_query((conn)->data
TSRMLS_CC)
#define mysqlnd_unbuffered_skip_result(result) (result)->m.skip_result((result) TSRMLS_CC)
-PHPAPI enum_func_status _mysqlnd_poll(MYSQLND **r_array, MYSQLND **e_array, MYSQLND ***dont_poll,
long sec, long usec, uint * desc_num TSRMLS_DC);
+PHPAPI enum_func_status _mysqlnd_poll(MYSQLND **r_array, MYSQLND **e_array, MYSQLND ***dont_poll,
long sec, long usec, int * desc_num TSRMLS_DC);
#define mysqlnd_use_result(conn) ((conn)->data)->m->use_result((conn)->data TSRMLS_CC)
#define mysqlnd_store_result(conn) ((conn)->data)->m->store_result((conn)->data
TSRMLS_CC)