andrey Thu, 12 Aug 2010 11:38:08 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=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, ©_ctor_called TSRMLS_CC);
+ mysqlnd_palloc_zval_ptr_dtor(&(current_row[col]), result->type, ©_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 +1309,7 @@
result->type == MYSQLND_RES_NORMAL? STAT_FLUSHED_NORMAL_SETS:
STAT_FLUSHED_PS_SETS);
- while ((PASS == result->m.fetch_row(result, NULL, 0, &fetched_anything TSRMLS_CC)) &&
- fetched_anything == TRUE)
- {
+ while ((PASS == result->m.fetch_row(result, NULL, 0, &fetched_anything TSRMLS_CC)) && fetched_anything == TRUE) {
/* do nothing */;
}
}
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd.c
===================================================================
--- php/php-src/trunk/ext/mysqlnd/mysqlnd.c 2010-08-12 11:10:42 UTC (rev 302140)
+++ php/php-src/trunk/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/trunk/ext/mysqlnd/mysqlnd_result.c
===================================================================
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_result.c 2010-08-12 11:10:42 UTC (rev 302140)
+++ php/php-src/trunk/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, ©_ctor_called TSRMLS_CC);
+ mysqlnd_palloc_zval_ptr_dtor(&(current_row[col]), result->type, ©_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 +1309,7 @@
result->type == MYSQLND_RES_NORMAL? STAT_FLUSHED_NORMAL_SETS:
STAT_FLUSHED_PS_SETS);
- while ((PASS == result->m.fetch_row(result, NULL, 0, &fetched_anything TSRMLS_CC)) &&
- fetched_anything == TRUE)
- {
+ while ((PASS == result->m.fetch_row(result, NULL, 0, &fetched_anything TSRMLS_CC)) && fetched_anything == TRUE) {
/* do nothing */;
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
