com php-src: Fix compiler warnings in mysqlnd: ext/mysqlnd/mysq lnd_ps.c ext/mysqlnd/mysqlnd_result.c ext/mysqlnd/m ysqlnd_wireprotocol.h

From: Date: Sun, 03 Apr 2016 00:27:25 +0000
Subject: com php-src: Fix compiler warnings in mysqlnd: ext/mysqlnd/mysq lnd_ps.c ext/mysqlnd/mysqlnd_result.c ext/mysqlnd/m ysqlnd_wireprotocol.h
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-91586@lists.php.net to get a copy of this message
Commit: bb198ec9a6d37cd467795199d33c8fa4e0d754e6 Author: Kalle Sommer Nielsen <kalle@php.net> Sun, 3 Apr 2016 02:27:25 +0200 Parents: 82050dfd3cba70b866da871fa7cc05232cfabf63 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=bb198ec9a6d37cd467795199d33c8fa4e0d754e6 Log: Fix compiler warnings in mysqlnd Changed paths: M ext/mysqlnd/mysqlnd_ps.c M ext/mysqlnd/mysqlnd_result.c M ext/mysqlnd/mysqlnd_wireprotocol.h Diff: diff --git a/ext/mysqlnd/mysqlnd_ps.c b/ext/mysqlnd/mysqlnd_ps.c index 4c3ee8b...432bc78 100644 --- a/ext/mysqlnd/mysqlnd_ps.c +++ b/ext/mysqlnd/mysqlnd_ps.c @@ -1028,7 +1028,7 @@ MYSQLND_METHOD(mysqlnd_stmt, use_result)(MYSQLND_STMT * s) /* {{{ mysqlnd_fetch_row_cursor */ enum_func_status -mysqlnd_fetch_stmt_row_cursor(MYSQLND_RES * result, void * param, unsigned int flags, zend_bool * fetched_anything) +mysqlnd_fetch_stmt_row_cursor(MYSQLND_RES * result, void * param, const unsigned int flags, zend_bool * fetched_anything) { enum_func_status ret; MYSQLND_STMT * s = (MYSQLND_STMT *) param; diff --git a/ext/mysqlnd/mysqlnd_result.c b/ext/mysqlnd/mysqlnd_result.c index fa80ca1..c4aa537 100644 --- a/ext/mysqlnd/mysqlnd_result.c +++ b/ext/mysqlnd/mysqlnd_result.c @@ -1475,7 +1475,7 @@ MYSQLND_METHOD(mysqlnd_res, store_result)(MYSQLND_RES * result, } else if (flags & MYSQLND_STORE_COPY) { MYSQLND_RES_BUFFERED_C * set = (MYSQLND_RES_BUFFERED_C *) result->stored_data; set->current_row = 0; - set->initialized = mnd_pecalloc((set->row_count / 8) + 1, sizeof(zend_uchar), set->persistent); /* +1 for safety */ + set->initialized = mnd_pecalloc((unsigned int) ((set->row_count / 8) + 1), sizeof(zend_uchar), set->persistent); /* +1 for safety */ } } diff --git a/ext/mysqlnd/mysqlnd_wireprotocol.h b/ext/mysqlnd/mysqlnd_wireprotocol.h index 234e3c8..337143f 100644 --- a/ext/mysqlnd/mysqlnd_wireprotocol.h +++ b/ext/mysqlnd/mysqlnd_wireprotocol.h @@ -297,7 +297,7 @@ typedef struct st_mysqlnd_packet_sha256_pk_request_response { zend_ulong php_mysqlnd_net_field_length(const zend_uchar **packet); -zend_uchar * php_mysqlnd_net_store_length(zend_uchar *packet, uint64_t length); +zend_uchar * php_mysqlnd_net_store_length(zend_uchar *packet, const uint64_t length); size_t php_mysqlnd_net_store_length_size(uint64_t length); PHPAPI const extern char * const mysqlnd_empty_string;

« previous php.cvs (#91586) next »