ws + cs

diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c
index 9d4d2192045f490ad972819661ac41e40463a25c..a84b485910c0c011bd654144a5318077eaa9fe00 100644 (file)
--- a/ext/mysqlnd/mysqlnd.c
+++ b/ext/mysqlnd/mysqlnd.c
@@ -550,7 +550,7 @@ mysqlnd_connect_run_authentication(
 err:
        PACKET_FREE(auth_packet);
        PACKET_FREE(ok_packet);
-       DBG_RETURN(ret);        
+       DBG_RETURN(ret);
 }
 /* }}} */
 
@@ -769,13 +769,13 @@ MYSQLND_METHOD(mysqlnd_conn, connect)(MYSQLND * conn,
                                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 @@ MYSQLND_METHOD(mysqlnd_conn, connect)(MYSQLND * conn,
                        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 @@ MYSQLND_METHOD(mysqlnd_conn, list_fields)(MYSQLND * conn, const char *table, con
                /* 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 @@ MYSQLND_METHOD(mysqlnd_conn, sqlstate)(const MYSQLND * const conn TSRMLS_DC)
 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 @@ MYSQLND_METHOD(mysqlnd_conn, kill)(MYSQLND * conn, unsigned int pid TSRMLS_DC)
                  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 @@ MYSQLND_METHOD(mysqlnd_conn, change_user)(MYSQLND * const conn,
                                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);
                        }
                }
        }

diff --git a/ext/mysqlnd/mysqlnd_result.c b/ext/mysqlnd/mysqlnd_result.c
index e4a15478d34cb49b545cf693afeacd4b6dde7c30..a160d93a03b5ae15f7a57166a56a62d6afb78132 100644 (file)
--- a/ext/mysqlnd/mysqlnd_result.c
+++ b/ext/mysqlnd/mysqlnd_result.c
@@ -205,12 +205,11 @@ MYSQLND_METHOD(mysqlnd_res, free_buffered_data)(MYSQLND_RES * result TSRMLS_DC)
                                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 @@ mysqlnd_query_read_result_set_header(MYSQLND *conn, MYSQLND_STMT * s TSRMLS_DC)
                if (!rset_header) {
                        SET_OOM_ERROR(conn->error_info);
                        ret = FAIL;
-                       break;          
+                       break;
                }
 
                SET_ERROR_AFF_ROWS(conn);
@@ -505,7 +504,7 @@ mysqlnd_query_read_result_set_header(MYSQLND *conn, MYSQLND_STMT * s TSRMLS_DC)
                                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 @@ MYSQLND_METHOD(mysqlnd_res, store_result_fetch_data)(MYSQLND * const conn, MYSQL
        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 @@ MYSQLND_METHOD(mysqlnd_res, store_result)(MYSQLND_RES * result,
                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 @@ MYSQLND_METHOD(mysqlnd_res, skip_result)(MYSQLND_RES * const result TSRMLS_DC)
                                                                        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 */;
                }
        }