pajoye Thu Jun 11 14:36:48 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysqlnd mysqlnd_wireprotocol.c
Log:
- silent warning and make it less ambiguous
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_wireprotocol.c?r1=1.4.2.27&r2=1.4.2.28&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_wireprotocol.c
diff -u php-src/ext/mysqlnd/mysqlnd_wireprotocol.c:1.4.2.27
php-src/ext/mysqlnd/mysqlnd_wireprotocol.c:1.4.2.28
--- php-src/ext/mysqlnd/mysqlnd_wireprotocol.c:1.4.2.27 Thu Jun 11 08:35:47 2009
+++ php-src/ext/mysqlnd/mysqlnd_wireprotocol.c Thu Jun 11 14:36:48 2009
@@ -611,7 +611,7 @@
/* pad2 */
p+= 13;
- if (p - buf < packet->header.size) {
+ if ((size_t)(p - buf) < packet->header.size) {
/* scramble_buf is split into two parts */
memcpy(packet->scramble_buf + SCRAMBLE_LENGTH_323,
p, SCRAMBLE_LENGTH - SCRAMBLE_LENGTH_323);
@@ -625,7 +625,7 @@
DBG_INF_FMT("server_capabilities=%d charset_no=%d server_status=%d",
packet->server_capabilities,
packet->charset_no, packet->server_status);
- if (p - begin > packet->header.size) {
+ if ((size_t)(p - begin) > packet->header.size) {
DBG_ERR_FMT("GREET packet %d bytes shorter than expected", p -
begin - packet->header.size);
php_error_docref(NULL TSRMLS_CC, E_WARNING, "GREET packet
"MYSQLND_SZ_T_SPEC" bytes shorter than expected",
p - begin -
packet->header.size);
@@ -810,7 +810,7 @@
p+= 2;
/* There is a message */
- if (packet->header.size > p - buf && (i =
php_mysqlnd_net_field_length(&p))) {
+ if (packet->header.size > (size_t) (p - buf) && (i =
php_mysqlnd_net_field_length(&p))) {
packet->message = pestrndup((char *)p, MIN(i, sizeof(buf) - (p
- buf)), conn->persistent);
packet->message_len = i;
} else {
@@ -821,7 +821,7 @@
packet->affected_rows, packet->last_insert_id,
packet->server_status,
packet->warning_count);
- if (p - begin > packet->header.size) {
+ if ((size_t)(p - begin) > packet->header.size) {
DBG_ERR_FMT("OK packet %d bytes shorter than expected", p -
begin - packet->header.size);
php_error_docref(NULL TSRMLS_CC, E_WARNING, "OK packet
"MYSQLND_SZ_T_SPEC" bytes shorter than expected",
p - begin -
packet->header.size);
@@ -894,7 +894,7 @@
packet->server_status = 0;
}
- if (p - begin > packet->header.size) {
+ if ((size_t)(p - begin) > packet->header.size) {
DBG_ERR_FMT("EOF packet %d bytes shorter than expected", p -
begin - packet->header.size);
php_error_docref(NULL TSRMLS_CC, E_WARNING, "EOF packet
"MYSQLND_SZ_T_SPEC" bytes shorter than expected",
p - begin -
packet->header.size);
@@ -1044,7 +1044,7 @@
packet->warning_count = uint2korr(p);
p+=2;
/* Check for additional textual data */
- if (packet->header.size > (p - buf) && (len =
php_mysqlnd_net_field_length(&p))) {
+ if (packet->header.size > (size_t) (p - buf) && (len =
php_mysqlnd_net_field_length(&p))) {
packet->info_or_local_file = mnd_pemalloc(len +
1, conn->persistent);
memcpy(packet->info_or_local_file, p, len);
packet->info_or_local_file[len] = '\0';
@@ -1059,7 +1059,7 @@
/* Result set */
break;
}
- if (p - begin > packet->header.size) {
+ if ((size_t)(p - begin) > packet->header.size) {
DBG_ERR_FMT("RSET_HEADER packet %d bytes shorter than
expected", p - begin - packet->header.size);
php_error_docref(NULL TSRMLS_CC, E_WARNING, "GREET packet
"MYSQLND_SZ_T_SPEC" bytes shorter than expected",
p - begin -
packet->header.size);
@@ -1187,7 +1187,7 @@
NULL_LENGTH (0xFB) comes from COM_FIELD_LIST when the default value
is NULL.
Otherwise the string is length encoded.
*/
- if (packet->header.size > (p - buf) &&
+ if (packet->header.size > (size_t)(p - buf) &&
(len = php_mysqlnd_net_field_length(&p)) &&
len != MYSQLND_NULL_LENGTH)
{
@@ -1199,7 +1199,7 @@
p += len;
}
- if (p - begin > packet->header.size) {
+ if ((size_t)(p - begin) > packet->header.size) {
DBG_ERR_FMT("RSET field packet %d bytes shorter than expected",
p - begin - packet->header.size);
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Result set field
packet "MYSQLND_SZ_T_SPEC" bytes "
"shorter than expected", p -
begin - packet->header.size);
@@ -1943,7 +1943,7 @@
DBG_INF_FMT("Prepare packet read: stmt_id=%d fields=%d params=%d",
packet->stmt_id, packet->field_count,
packet->param_count);
- if (p - begin > packet->header.size) {
+ if ((size_t) (p - begin) > packet->header.size) {
DBG_ERR_FMT("PREPARE packet %d bytes shorter than expected", p
- begin - packet->header.size);
php_error_docref(NULL TSRMLS_CC, E_WARNING, "PREPARE packet
"MYSQLND_SZ_T_SPEC" bytes shorter than expected",
p - begin -
packet->header.size);
@@ -2003,7 +2003,7 @@
packet->error_info.sqlstate
TSRMLS_CC);
}
- if (p - begin > packet->header.size) {
+ if ((size_t)(p - begin) > packet->header.size) {
DBG_ERR_FMT("CHANGE_USER packet %d bytes shorter than
expected", p - begin - packet->header.size);
php_error_docref(NULL TSRMLS_CC, E_WARNING, "CHANGE_USER packet
"MYSQLND_SZ_T_SPEC" bytes shorter than expected",
p - begin -
packet->header.size);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
