[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqlnd/mysqlnd.c branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c trunk/ext/mysqlnd/mysqlnd.c trunk/ext/mysqlnd/mysqlnd_result.c
andrey Tue, 05 Oct 2010 17:03:50 + Revision: http://svn.php.net/viewvc?view=revisionrevision=304114 Log: Rename a method so it doesn't clash with a global symbol - a function Fix compiler waring by extening the type of a variable Changed paths: U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c U php/php-src/trunk/ext/mysqlnd/mysqlnd.c U php/php-src/trunk/ext/mysqlnd/mysqlnd_result.c Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c === --- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c 2010-10-05 16:54:14 UTC (rev 304113) +++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c 2010-10-05 17:03:50 UTC (rev 304114) @@ -1368,14 +1368,14 @@ /* }}} */ -/* {{{ mysqlnd_conn::stat */ +/* {{{ mysqlnd_conn::statistic */ static enum_func_status -MYSQLND_METHOD(mysqlnd_conn, stat)(MYSQLND * conn, char **message, unsigned int * message_len TSRMLS_DC) +MYSQLND_METHOD(mysqlnd_conn, statistic)(MYSQLND * conn, char **message, unsigned int * message_len TSRMLS_DC) { enum_func_status ret; MYSQLND_PACKET_STATS * stats_header; - DBG_ENTER(mysqlnd_conn::stat); + DBG_ENTER(mysqlnd_conn::statistic); DBG_INF_FMT(conn=%llu, conn-thread_id); ret = conn-m-simple_command(conn, COM_STATISTICS, NULL, 0, PROT_LAST, FALSE, TRUE TSRMLS_CC); @@ -1560,13 +1560,13 @@ STAT_CLOSE_IMPLICIT, STAT_CLOSE_DISCONNECT }; - enum_mysqlnd_collected_stats stat = close_type_to_stat_map[close_type]; + enum_mysqlnd_collected_stats statistic = close_type_to_stat_map[close_type]; DBG_ENTER(mysqlnd_conn::close); DBG_INF_FMT(conn=%llu, conn-thread_id); if (conn-state = CONN_READY) { - MYSQLND_INC_CONN_STATISTIC(conn-stats, stat); + MYSQLND_INC_CONN_STATISTIC(conn-stats, statistic); MYSQLND_DEC_CONN_STATISTIC(conn-stats, STAT_OPENED_CONNECTIONS); if (conn-persistent) { MYSQLND_DEC_CONN_STATISTIC(conn-stats, STAT_OPENED_PERSISTENT_CONNECTIONS); @@ -2256,7 +2256,7 @@ MYSQLND_METHOD(mysqlnd_conn, get_server_version), MYSQLND_METHOD(mysqlnd_conn, get_server_info), - MYSQLND_METHOD(mysqlnd_conn, stat), + MYSQLND_METHOD(mysqlnd_conn, statistic), MYSQLND_METHOD(mysqlnd_conn, get_host_info), MYSQLND_METHOD(mysqlnd_conn, get_proto_info), MYSQLND_METHOD(mysqlnd_conn, info), Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c === --- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c 2010-10-05 16:54:14 UTC (rev 304113) +++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c 2010-10-05 17:03:50 UTC (rev 304114) @@ -194,7 +194,7 @@ { MYSQLND_RES_BUFFERED *set = result-stored_data; unsigned int field_count = result-field_count; - int row; + int64_t row; DBG_ENTER(mysqlnd_res::free_buffered_data); DBG_INF_FMT(Freeing MYSQLND_LLU_SPEC row(s), set-row_count); @@ -211,7 +211,7 @@ int col; if (current_row != NULL) { - for (col = field_count - 1; col = 0; --col) { + for (col = (int64_t) field_count - 1; col = 0; --col) { if (current_row[col]) { zend_bool copy_ctor_called; mysqlnd_palloc_zval_ptr_dtor((current_row[col]), result-type, copy_ctor_called TSRMLS_CC); @@ -1229,7 +1229,7 @@ ret = FAIL; goto end; } - memset(set-data, 0, set-row_count * meta-field_count * sizeof(zval *)); + memset(set-data, 0, (size_t)(set-row_count * meta-field_count * sizeof(zval *))); } MYSQLND_INC_CONN_STATISTIC_W_VALUE(conn-stats, Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd.c === --- php/php-src/trunk/ext/mysqlnd/mysqlnd.c 2010-10-05 16:54:14 UTC (rev 304113) +++ php/php-src/trunk/ext/mysqlnd/mysqlnd.c 2010-10-05 17:03:50 UTC (rev 304114) @@ -1391,14 +1391,14 @@ /* }}} */ -/* {{{ mysqlnd_conn::stat */ +/* {{{ mysqlnd_conn::statistic */ static enum_func_status -MYSQLND_METHOD(mysqlnd_conn, stat)(MYSQLND * conn, char **message, unsigned int * message_len TSRMLS_DC) +MYSQLND_METHOD(mysqlnd_conn, statistic)(MYSQLND * conn, char **message, unsigned int * message_len TSRMLS_DC) { enum_func_status ret; MYSQLND_PACKET_STATS * stats_header; - DBG_ENTER(mysqlnd_conn::stat); + DBG_ENTER(mysqlnd_conn::statistic);
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqlnd/mysqlnd.c branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c trunk/ext/mysqlnd/mysqlnd.c trunk/ext/mysqlnd/mysqlnd_result.c
andrey Thu, 12 Aug 2010 11:38:08 + Revision: http://svn.php.net/viewvc?view=revisionrevision=302141 Log: ws + cs Changed paths: U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c U php/php-src/trunk/ext/mysqlnd/mysqlnd.c U php/php-src/trunk/ext/mysqlnd/mysqlnd_result.c Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c === --- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c 2010-08-12 11:10:42 UTC (rev 302140) +++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c 2010-08-12 11:38:08 UTC (rev 302141) @@ -550,7 +550,7 @@ err: PACKET_FREE(auth_packet); PACKET_FREE(ok_packet); - DBG_RETURN(ret); + DBG_RETURN(ret); } /* }}} */ @@ -769,13 +769,13 @@ spprintf(p, 0, %s via TCP/IP, conn-host); if (!p) { SET_OOM_ERROR(conn-error_info); - goto err; /* OOM */ + goto err; /* OOM */ } conn-host_info = mnd_pestrdup(p, conn-persistent); efree(p); /* allocated by spprintf */ if (!conn-host_info) { SET_OOM_ERROR(conn-error_info); - goto err; /* OOM */ + goto err; /* OOM */ } } } else { @@ -783,7 +783,7 @@ conn-host_info = mnd_pestrdup(Localhost via UNIX socket, conn-persistent); if (!conn-unix_socket || !conn-host_info) { SET_OOM_ERROR(conn-error_info); -goto err; /* OOM */ +goto err; /* OOM */ } conn-unix_socket_len = strlen(conn-unix_socket); } @@ -1211,7 +1211,7 @@ /* OOM */ SET_OOM_ERROR(conn-error_info); result-m.free_result(result, TRUE TSRMLS_CC); - DBG_RETURN(NULL); + DBG_RETURN(NULL); } result-unbuf-eof_reached = TRUE; @@ -1287,8 +1287,7 @@ PHPAPI ulong mysqlnd_old_escape_string(char *newstr, const char *escapestr, size_t escapestr_len TSRMLS_DC) { DBG_ENTER(mysqlnd_old_escape_string); - DBG_RETURN(mysqlnd_cset_escape_slashes(mysqlnd_find_charset_name(latin1), - newstr, escapestr, escapestr_len TSRMLS_CC)); + DBG_RETURN(mysqlnd_cset_escape_slashes(mysqlnd_find_charset_name(latin1), newstr, escapestr, escapestr_len TSRMLS_CC)); } /* }}} */ @@ -1438,8 +1437,7 @@ a protocol of giving back -1. Thus we have to follow it :( */ SET_ERROR_AFF_ROWS(conn); - } else if (PASS == (ret = conn-m-simple_command(conn, COM_PROCESS_KILL, buff, - 4, PROT_LAST, FALSE, TRUE TSRMLS_CC))) { + } else if (PASS == (ret = conn-m-simple_command(conn, COM_PROCESS_KILL, buff, 4, PROT_LAST, FALSE, TRUE TSRMLS_CC))) { CONN_SET_STATE(conn, CONN_QUIT_SENT); } DBG_RETURN(ret); @@ -1983,7 +1981,7 @@ PACKET_FREE(redundant_error_packet); DBG_INF_FMT(Server is %u, buggy, sends two ERR messages, mysqlnd_get_server_version(conn)); } else { -SET_OOM_ERROR(conn-error_info); +SET_OOM_ERROR(conn-error_info); } } } Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c === --- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c 2010-08-12 11:10:42 UTC (rev 302140) +++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c 2010-08-12 11:38:08 UTC (rev 302141) @@ -205,12 +205,11 @@ if (current_row == NULL || current_row[0] == NULL) { break;/* row that was never initialized */ } - mysqlnd_palloc_zval_ptr_dtor((current_row[col]), result-type, copy_ctor_called TSRMLS_CC); +mysqlnd_palloc_zval_ptr_dtor((current_row[col]), result-type, copy_ctor_called TSRMLS_CC); #if MYSQLND_DEBUG_MEMORY DBG_INF_FMT(Copy_ctor_called=%u, copy_ctor_called); #endif -MYSQLND_INC_GLOBAL_STATISTIC(copy_ctor_called? STAT_COPY_ON_WRITE_PERFORMED: - STAT_COPY_ON_WRITE_SAVED); +MYSQLND_INC_GLOBAL_STATISTIC(copy_ctor_called? STAT_COPY_ON_WRITE_PERFORMED: STAT_COPY_ON_WRITE_SAVED); } #if MYSQLND_DEBUG_MEMORY DBG_INF(Freeing current_row current_buffer); @@ -376,7 +375,7 @@ if (!rset_header) { SET_OOM_ERROR(conn-error_info); ret = FAIL; - break; + break; } SET_ERROR_AFF_ROWS(conn); @@ -505,7 +504,7 @@ if (!fields_eof) { SET_OOM_ERROR(conn-error_info); ret = FAIL; - break; + break; } if (FAIL == (ret = PACKET_READ(fields_eof, conn))) { DBG_ERR(Error ocurred while reading the EOF packet); @@ -1128,14 +1127,14 @@ if (!set) { SET_OOM_ERROR(conn-error_info); ret = FAIL; - goto end; + goto end; } if (free_rows) { set-row_buffers = mnd_pemalloc(free_rows * sizeof(MYSQLND_MEMORY_POOL_CHUNK *), to_cache); if (!set-row_buffers) { SET_OOM_ERROR(conn-error_info); ret = FAIL; - goto end; + goto end; } } set-persistent = to_cache; @@ -1277,7 +1276,7 @@ if (result-stored_data) { conn-error_info = result-stored_data-error_info; } else { - SET_OOM_ERROR(conn-error_info); + SET_OOM_ERROR(conn-error_info); } DBG_RETURN(NULL); } @@ -1310,9
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqlnd/mysqlnd.c branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c trunk/ext/mysqlnd/mysqlnd.c trunk/ext/mysqlnd/mysqlnd_result.c
andrey Thu, 15 Apr 2010 15:16:29 + Revision: http://svn.php.net/viewvc?view=revisionrevision=298037 Log: more WS Changed paths: U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c U php/php-src/trunk/ext/mysqlnd/mysqlnd.c U php/php-src/trunk/ext/mysqlnd/mysqlnd_result.c Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c === --- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c 2010-04-15 14:59:18 UTC (rev 298036) +++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c 2010-04-15 15:16:29 UTC (rev 298037) @@ -84,7 +84,7 @@ /* {{{ mysqlnd_conn::free_options */ static void -MYSQLND_METHOD(mysqlnd_conn, free_options)(MYSQLND *conn TSRMLS_DC) +MYSQLND_METHOD(mysqlnd_conn, free_options)(MYSQLND * conn TSRMLS_DC) { zend_bool pers = conn-persistent; @@ -115,7 +115,7 @@ /* {{{ mysqlnd_conn::free_contents */ static void -MYSQLND_METHOD(mysqlnd_conn, free_contents)(MYSQLND *conn TSRMLS_DC) +MYSQLND_METHOD(mysqlnd_conn, free_contents)(MYSQLND * conn TSRMLS_DC) { zend_bool pers = conn-persistent; @@ -190,7 +190,7 @@ /* {{{ mysqlnd_conn::dtor */ static void -MYSQLND_METHOD_PRIVATE(mysqlnd_conn, dtor)(MYSQLND *conn TSRMLS_DC) +MYSQLND_METHOD_PRIVATE(mysqlnd_conn, dtor)(MYSQLND * conn TSRMLS_DC) { DBG_ENTER(mysqlnd_conn::dtor); DBG_INF_FMT(conn=%llu, conn-thread_id); @@ -223,7 +223,7 @@ /* {{{ mysqlnd_conn::simple_command_handle_response */ static enum_func_status -MYSQLND_METHOD(mysqlnd_conn, simple_command_handle_response)(MYSQLND *conn, enum mysqlnd_packet_type ok_packet, +MYSQLND_METHOD(mysqlnd_conn, simple_command_handle_response)(MYSQLND * conn, enum mysqlnd_packet_type ok_packet, zend_bool silent, enum php_mysqlnd_server_command command, zend_bool ignore_upsert_status TSRMLS_DC) { @@ -315,7 +315,7 @@ /* {{{ mysqlnd_conn::simple_command */ static enum_func_status -MYSQLND_METHOD(mysqlnd_conn, simple_command)(MYSQLND *conn, enum php_mysqlnd_server_command command, +MYSQLND_METHOD(mysqlnd_conn, simple_command)(MYSQLND * conn, enum php_mysqlnd_server_command command, const char * const arg, size_t arg_len, enum mysqlnd_packet_type ok_packet, zend_bool silent, zend_bool ignore_upsert_status TSRMLS_DC) { @@ -388,7 +388,7 @@ /* {{{ _mysqlnd_restart_psession */ -PHPAPI void _mysqlnd_restart_psession(MYSQLND *conn TSRMLS_DC) +PHPAPI void _mysqlnd_restart_psession(MYSQLND * conn TSRMLS_DC) { DBG_ENTER(_mysqlnd_restart_psession); conn-m-restart_psession(conn TSRMLS_CC); @@ -398,7 +398,7 @@ /* {{{ _mysqlnd_end_psession */ -PHPAPI void _mysqlnd_end_psession(MYSQLND *conn TSRMLS_DC) +PHPAPI void _mysqlnd_end_psession(MYSQLND * conn TSRMLS_DC) { DBG_ENTER(_mysqlnd_end_psession); conn-m-end_psession(conn TSRMLS_CC); @@ -434,7 +434,7 @@ /* {{{ mysqlnd_conn::connect */ static enum_func_status -MYSQLND_METHOD(mysqlnd_conn, connect)(MYSQLND *conn, +MYSQLND_METHOD(mysqlnd_conn, connect)(MYSQLND * conn, const char *host, const char *user, const char *passwd, unsigned int passwd_len, const char *db, unsigned int db_len, @@ -813,7 +813,7 @@ Still the result from the query is PASS */ static enum_func_status -MYSQLND_METHOD(mysqlnd_conn, query)(MYSQLND *conn, const char *query, unsigned int query_len TSRMLS_DC) +MYSQLND_METHOD(mysqlnd_conn, query)(MYSQLND * conn, const char * query, unsigned int query_len TSRMLS_DC) { enum_func_status ret; DBG_ENTER(mysqlnd_conn::query); @@ -841,7 +841,7 @@ /* {{{ mysqlnd_conn::send_query */ static enum_func_status -MYSQLND_METHOD(mysqlnd_conn, send_query)(MYSQLND *conn, const char *query, unsigned int query_len TSRMLS_DC) +MYSQLND_METHOD(mysqlnd_conn, send_query)(MYSQLND * conn, const char * query, unsigned int query_len TSRMLS_DC) { enum_func_status ret; DBG_ENTER(mysqlnd_conn::send_query); @@ -1063,7 +1063,7 @@ /* {{{ mysqlnd_conn::list_fields */ MYSQLND_RES * -MYSQLND_METHOD(mysqlnd_conn, list_fields)(MYSQLND *conn, const char *table, const char *achtung_wild TSRMLS_DC) +MYSQLND_METHOD(mysqlnd_conn, list_fields)(MYSQLND * conn, const char *table, const char *achtung_wild TSRMLS_DC) { /* db + \0 + wild + \0 (for wild) */ char buff[MYSQLND_MAX_ALLOWED_DB_LEN * 4 * 2 + 1 + 1], *p; @@ -1115,7 +1115,7 @@ /* {{{ mysqlnd_conn::list_method */ MYSQLND_RES * -MYSQLND_METHOD(mysqlnd_conn, list_method)(MYSQLND *conn, const char *query, const char *achtung_wild, char *par1 TSRMLS_DC) +MYSQLND_METHOD(mysqlnd_conn, list_method)(MYSQLND * conn, const char * query, const char *achtung_wild, char *par1 TSRMLS_DC) { char *show_query = NULL; size_t show_query_len; @@ -1274,7 +1274,7 @@ /* {{{ mysqlnd_conn::stat */ static enum_func_status -MYSQLND_METHOD(mysqlnd_conn, stat)(MYSQLND *conn, char **message, unsigned int * message_len TSRMLS_DC) +MYSQLND_METHOD(mysqlnd_conn,
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqlnd/mysqlnd.c branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c trunk/ext/mysqlnd/mysqlnd.c trunk/ext/mysqlnd/mysqlnd_result.c
andrey Thu, 15 Apr 2010 15:28:00 + Revision: http://svn.php.net/viewvc?view=revisionrevision=298042 Log: Fix some int/uint comparison warnings Changed paths: U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c U php/php-src/trunk/ext/mysqlnd/mysqlnd.c U php/php-src/trunk/ext/mysqlnd/mysqlnd_result.c Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c === --- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c 2010-04-15 15:22:56 UTC (rev 298041) +++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c 2010-04-15 15:28:00 UTC (rev 298042) @@ -720,7 +720,7 @@ } #endif if (conn-options.init_commands) { - int current_command = 0; + unsigned int current_command = 0; for (; current_command conn-options.num_commands; ++current_command) { const char * const command = conn-options.init_commands[current_command]; MYSQLND_INC_CONN_STATISTIC(conn-stats, STAT_INIT_COMMAND_EXECUTED_COUNT); Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c === --- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c 2010-04-15 15:22:56 UTC (rev 298041) +++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c 2010-04-15 15:28:00 UTC (rev 298042) @@ -646,7 +646,7 @@ for (i = 0; i field_count; i++, field++, zend_hash_key++) { zval *data = result-unbuf-last_row_data[i]; - int len; + unsigned int len; if (Z_TYPE_P(data) != IS_NULL) { convert_to_string(data); @@ -755,7 +755,7 @@ for (i = 0; i field_count; i++, field++, zend_hash_key++) { zval *data = result-unbuf-last_row_data[i]; - int len = (Z_TYPE_P(data) == IS_NULL)? 0:Z_STRLEN_P(data); + unsigned int len = (Z_TYPE_P(data) == IS_NULL)? 0:Z_STRLEN_P(data); if (lengths) { lengths[i] = len; Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd.c === --- php/php-src/trunk/ext/mysqlnd/mysqlnd.c 2010-04-15 15:22:56 UTC (rev 298041) +++ php/php-src/trunk/ext/mysqlnd/mysqlnd.c 2010-04-15 15:28:00 UTC (rev 298042) @@ -720,7 +720,7 @@ } #endif if (conn-options.init_commands) { - int current_command = 0; + unsigned int current_command = 0; for (; current_command conn-options.num_commands; ++current_command) { const char * const command = conn-options.init_commands[current_command]; MYSQLND_INC_CONN_STATISTIC(conn-stats, STAT_INIT_COMMAND_EXECUTED_COUNT); Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_result.c === --- php/php-src/trunk/ext/mysqlnd/mysqlnd_result.c 2010-04-15 15:22:56 UTC (rev 298041) +++ php/php-src/trunk/ext/mysqlnd/mysqlnd_result.c 2010-04-15 15:28:00 UTC (rev 298042) @@ -646,7 +646,7 @@ for (i = 0; i field_count; i++, field++, zend_hash_key++) { zval *data = result-unbuf-last_row_data[i]; - int len; + unsigned int len; if (Z_TYPE_P(data) != IS_NULL) { convert_to_string(data); @@ -755,7 +755,7 @@ for (i = 0; i field_count; i++, field++, zend_hash_key++) { zval *data = result-unbuf-last_row_data[i]; - int len = (Z_TYPE_P(data) == IS_NULL)? 0:Z_STRLEN_P(data); + unsigned int len = (Z_TYPE_P(data) == IS_NULL)? 0:Z_STRLEN_P(data); if (lengths) { lengths[i] = len; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php