svn: /php/php-src/ branches/PHP_5_3/ext/mysqlnd/mysqlnd_loaddata.c trunk/ext/mysqlnd/mysqlnd_loaddata.c

From: Date: Tue, 01 Feb 2011 19:30:22 +0000
Subject: svn: /php/php-src/ branches/PHP_5_3/ext/mysqlnd/mysqlnd_loaddata.c trunk/ext/mysqlnd/mysqlnd_loaddata.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-64489@lists.php.net to get a copy of this message
andrey Tue, 01 Feb 2011 19:30:22 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=307931 Log: Fix more warnings about size_t Changed paths: U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_loaddata.c U php/php-src/trunk/ext/mysqlnd/mysqlnd_loaddata.c Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_loaddata.c =================================================================== --- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_loaddata.c 2011-02-01 19:03:05 UTC (rev 307930) +++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_loaddata.c 2011-02-01 19:30:22 UTC (rev 307931) @@ -212,7 +212,7 @@ /* read data */ while ((bufsize = infile.local_infile_read (info, buf + MYSQLND_HEADER_SIZE, buflen - MYSQLND_HEADER_SIZE TSRMLS_CC)) > 0) { - if ((ret = conn->net->m.send(conn, buf, bufsize TSRMLS_CC)) < 0) { + if ((ret = conn->net->m.send(conn, buf, bufsize TSRMLS_CC)) == 0) { DBG_ERR_FMT("Error during read : %d %s %s", CR_SERVER_LOST, UNKNOWN_SQLSTATE, lost_conn); SET_CLIENT_ERROR(conn->error_info, CR_SERVER_LOST, UNKNOWN_SQLSTATE, lost_conn); goto infile_error; @@ -220,7 +220,7 @@ } /* send empty packet for eof */ - if ((ret = conn->net->m.send(conn, empty_packet, 0 TSRMLS_CC)) < 0) { + if ((ret = conn->net->m.send(conn, empty_packet, 0 TSRMLS_CC)) == 0) { SET_CLIENT_ERROR(conn->error_info, CR_SERVER_LOST, UNKNOWN_SQLSTATE, lost_conn); goto infile_error; } Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_loaddata.c =================================================================== --- php/php-src/trunk/ext/mysqlnd/mysqlnd_loaddata.c 2011-02-01 19:03:05 UTC (rev 307930) +++ php/php-src/trunk/ext/mysqlnd/mysqlnd_loaddata.c 2011-02-01 19:30:22 UTC (rev 307931) @@ -212,7 +212,7 @@ /* read data */ while ((bufsize = infile.local_infile_read (info, buf + MYSQLND_HEADER_SIZE, buflen - MYSQLND_HEADER_SIZE TSRMLS_CC)) > 0) { - if ((ret = conn->net->m.send(conn, buf, bufsize TSRMLS_CC)) < 0) { + if ((ret = conn->net->m.send(conn, buf, bufsize TSRMLS_CC)) == 0) { DBG_ERR_FMT("Error during read : %d %s %s", CR_SERVER_LOST, UNKNOWN_SQLSTATE, lost_conn); SET_CLIENT_ERROR(conn->error_info, CR_SERVER_LOST, UNKNOWN_SQLSTATE, lost_conn); goto infile_error; @@ -220,7 +220,7 @@ } /* send empty packet for eof */ - if ((ret = conn->net->m.send(conn, empty_packet, 0 TSRMLS_CC)) < 0) { + if ((ret = conn->net->m.send(conn, empty_packet, 0 TSRMLS_CC)) == 0) { SET_CLIENT_ERROR(conn->error_info, CR_SERVER_LOST, UNKNOWN_SQLSTATE, lost_conn); goto infile_error; }

« previous php.cvs (#64489) next »