PHP mysqlnd svn commit: r105 - trunk/ext/mysqli/mysqlnd

[ahristov]

Author: ahristov
Date: 2007-03-12 14:42:55 +0100 (Mon, 12 Mar 2007)
New Revision: 105

Modified:
   trunk/ext/mysqli/mysqlnd/mysqlnd_ps.c
Log:
Whitespace cleanup


Modified: trunk/ext/mysqli/mysqlnd/mysqlnd_ps.c
===================================================================
--- trunk/ext/mysqli/mysqlnd/mysqlnd_ps.c	2007-03-12 13:37:32 UTC (rev 104)
+++ trunk/ext/mysqli/mysqlnd/mysqlnd_ps.c	2007-03-12 13:42:55 UTC (rev 105)
@@ -100,7 +100,7 @@
 		result->conn->references--;
 	}
 	result->conn		= NULL;	/* store result does not reference  the connection */
-	result->data 		= emalloc(next_extend * sizeof(zval **));
+	result->data		= emalloc(next_extend * sizeof(zval **));
 	result->row_buffers = emalloc(next_extend * sizeof(zend_uchar *));
 
 	free_rows = next_extend;
@@ -145,7 +145,7 @@
 		*/
 	}
 	/* Finally clean */
-	if (row_packet.eof) { 
+	if (row_packet.eof) {
 		conn->upsert_status.warning_count = row_packet.warning_count;
 		conn->upsert_status.server_status = row_packet.server_status;
 	}
@@ -289,8 +289,8 @@
 
 	if (stmt_to_prepare->param_count) {
 		if (FAIL == mysqlnd_stmt_skip_metadata(stmt_to_prepare TSRMLS_CC) ||
-			FAIL == mysqlnd_stmt_prepare_read_eof(stmt_to_prepare TSRMLS_CC)) {
-		
+			FAIL == mysqlnd_stmt_prepare_read_eof(stmt_to_prepare TSRMLS_CC))
+		{
 			goto fail;
 		}
 	}
@@ -559,11 +559,11 @@
 					  stmt->result_bind[i].zv has been already destructed
 					  in mysqlnd_unbuffered_free_last_data()
 					*/
-				
+
 					if (IS_NULL != (Z_TYPE_P(stmt->result_bind[i].zv) = Z_TYPE_P(data)) ) {
 						stmt->result_bind[i].zv->value = data->value;
 
-						if ((Z_TYPE_P(data) == IS_STRING || Z_TYPE_P(data) == IS_UNICODE) 
+						if ((Z_TYPE_P(data) == IS_STRING || Z_TYPE_P(data) == IS_UNICODE)
 							 && (result->fields[i].max_length < Z_STRLEN_P(data)))
 						{
 							result->fields[i].max_length = Z_STRLEN_P(data);
@@ -946,8 +946,8 @@
 		  checks if the line is clear - useful for debug purposes and to be switched off
 		  in release builds.
 
-		  Maybe we can make it automatic by checking what's the value of
max_allowed_packet_size on
-		  the server and resending the data.
+		  Maybe we can make it automatic by checking what's the value of
+		  max_allowed_packet_size on the server and resending the data.
 		*/
 		if ((packet_len = php_mysqlnd_consume_uneaten_data(conn, cmd TSRMLS_CC))) {
 			php_error_docref(NULL TSRMLS_CC, E_WARNING, "There was an error "
@@ -969,7 +969,7 @@
 static enum_func_status
 _mysqlnd_stmt_bind_param(MYSQLND_STMT * const stmt, MYSQLND_PARAM_BIND * const
param_bind)
 {
-	int i = 0;
+	unsigned int i = 0;
 
 	if (stmt->state < MYSQLND_STMT_PREPARED) {
 		SET_STMT_ERROR(stmt, CR_NO_PREPARE_STMT, UNKNOWN_SQLSTATE, mysqlnd_stmt_not_prepared);
@@ -1173,17 +1173,17 @@
 		new_meta[i].root = emalloc(original_meta[i].root_len);
 		memcpy(new_meta[i].root, original_meta[i].root, new_meta[i].root_len);
 
-		new_meta[i].name 		= new_meta[i].root + (original_meta[i].name -
original_meta[i].root);	
-		new_meta[i].org_name	= new_meta[i].root + (original_meta[i].org_name -
original_meta[i].root);	
+		new_meta[i].name		= new_meta[i].root + (original_meta[i].name - original_meta[i].root);
+		new_meta[i].org_name	= new_meta[i].root + (original_meta[i].org_name -
original_meta[i].root);
 
-		new_meta[i].table		= new_meta[i].root + (original_meta[i].table -
original_meta[i].root);	
-		new_meta[i].org_table	= new_meta[i].root + (original_meta[i].org_table -
original_meta[i].root);	
+		new_meta[i].table		= new_meta[i].root + (original_meta[i].table -
original_meta[i].root);
+		new_meta[i].org_table	= new_meta[i].root + (original_meta[i].org_table -
original_meta[i].root);
 
 		new_meta[i].db		= new_meta[i].root + (original_meta[i].db - original_meta[i].root);
-		new_meta[i].catalog	= new_meta[i].root + (original_meta[i].catalog -
original_meta[i].root);	
+		new_meta[i].catalog	= new_meta[i].root + (original_meta[i].catalog -
original_meta[i].root);
 		/* def is not on the root, if allocated at all */
 		if (original_meta[i].def) {
-			new_meta[i].def 	= emalloc(original_meta[i].def_length + 1);
+			new_meta[i].def	= emalloc(original_meta[i].def_length + 1);
 			/* copy the trailing \0 too */
 			memcpy(new_meta[i].def, original_meta[i].def, original_meta[i].def_length + 1);
 		}
@@ -1207,7 +1207,7 @@
 
 	/*
 	  TODO: This implementation is kind of a hack,
-	        find a better way to do it. In different functions I have put
+			find a better way to do it. In different functions I have put
 			fuses to check for result->m.fetch_row() being NULL. This should
 			be handled in a better way.