PHP mysqlnd svn commit: r1456 - trunk/mysqlnd

[ahristov]

Author: ahristov
Date: 2008-04-15 14:53:11 +0200 (Tue, 15 Apr 2008)
New Revision: 1456

Modified:
   trunk/mysqlnd/mysqlnd.c
   trunk/mysqlnd/mysqlnd_loaddata.c
   trunk/mysqlnd/mysqlnd_ps.c
   trunk/mysqlnd/mysqlnd_result.c
   trunk/mysqlnd/mysqlnd_result_meta.c
   trunk/mysqlnd/mysqlnd_structs.h
   trunk/mysqlnd/mysqlnd_wireprotocol.c
Log:
cleanup


Modified: trunk/mysqlnd/mysqlnd.c
===================================================================
--- trunk/mysqlnd/mysqlnd.c	2008-04-15 09:00:36 UTC (rev 1455)
+++ trunk/mysqlnd/mysqlnd.c	2008-04-15 12:53:11 UTC (rev 1456)
@@ -171,7 +171,7 @@
 	}
 	if (conn->options.num_commands) {
 		unsigned int i;
-		for (i=0; i < conn->options.num_commands; i++) {
+		for (i = 0; i < conn->options.num_commands; i++) {
 			mnd_pefree(conn->options.init_commands[i], pers);
 		}
 		mnd_pefree(conn->options.init_commands, pers);

Modified: trunk/mysqlnd/mysqlnd_loaddata.c
===================================================================
--- trunk/mysqlnd/mysqlnd_loaddata.c	2008-04-15 09:00:36 UTC (rev 1455)
+++ trunk/mysqlnd/mysqlnd_loaddata.c	2008-04-15 12:53:11 UTC (rev 1456)
@@ -58,7 +58,7 @@
 
 	DBG_ENTER("mysqlnd_local_infile_init");
 
-	*ptr= info= ((MYSQLND_INFILE_INFO *)mnd_ecalloc(1, sizeof(MYSQLND_INFILE_INFO)));
+	*ptr = info = ((MYSQLND_INFILE_INFO *)mnd_ecalloc(1, sizeof(MYSQLND_INFILE_INFO)));
 
 	/* check open_basedir */
 	if (PG(open_basedir)) {
@@ -88,7 +88,7 @@
 int mysqlnd_local_infile_read(void *ptr, char *buf, uint buf_len TSRMLS_DC)
 {
 	MYSQLND_INFILE_INFO	*info = (MYSQLND_INFILE_INFO *)ptr;
-	int			count;
+	int count;
 
     DBG_ENTER("mysqlnd_local_infile_read");
 

Modified: trunk/mysqlnd/mysqlnd_ps.c
===================================================================
--- trunk/mysqlnd/mysqlnd_ps.c	2008-04-15 09:00:36 UTC (rev 1455)
+++ trunk/mysqlnd/mysqlnd_ps.c	2008-04-15 12:53:11 UTC (rev 1456)
@@ -56,7 +56,7 @@
 											   unsigned int flags,
 											   zend_bool *fetched_anything TSRMLS_DC);
 
-void mysqlnd_stmt_separate_result_bind(MYSQLND_STMT * const stmt TSRMLS_DC);
+static void mysqlnd_stmt_separate_result_bind(MYSQLND_STMT * const stmt TSRMLS_DC);
 
 
 /* {{{ mysqlnd_stmt::store_result */
@@ -78,8 +78,7 @@
 
 	if (stmt->cursor_exists) {
 		/* Silently convert buffered to unbuffered, for now */
-		MYSQLND_RES * res = stmt->m->use_result(stmt TSRMLS_CC);
-		DBG_RETURN(res);
+		DBG_RETURN(stmt->m->use_result(stmt TSRMLS_CC));
 	}
 
 	/* Nothing to store for UPSERT/LOAD DATA*/
@@ -135,7 +134,7 @@
 	MYSQLND_RES *result;
 	zend_bool to_cache = FALSE;
 
-	DBG_ENTER("mysqlnd_stmt::store_result");
+	DBG_ENTER("mysqlnd_stmt::background_store_result");
 	DBG_INF_FMT("stmt=%lu", stmt->stmt_id);
 
 	/* be compliant with libmysql - NULL will turn */
@@ -198,6 +197,7 @@
 }
 /* }}} */
 
+
 /* {{{ mysqlnd_stmt::get_result */
 static MYSQLND_RES *
 MYSQLND_METHOD(mysqlnd_stmt, get_result)(MYSQLND_STMT * const stmt TSRMLS_DC)
@@ -215,8 +215,7 @@
 
 	if (stmt->cursor_exists) {
 		/* Silently convert buffered to unbuffered, for now */
-		MYSQLND_RES * res = stmt->m->use_result(stmt TSRMLS_CC);
-		DBG_RETURN(res);
+		DBG_RETURN(stmt->m->use_result(stmt TSRMLS_CC));
 	}
 
 	/* Nothing to store for UPSERT/LOAD DATA*/
@@ -255,6 +254,7 @@
 {
 	/* Follows parameter metadata, we have just to skip it, as libmysql does */
 	unsigned int i = 0;
+	enum_func_status ret = PASS;
 	php_mysql_packet_res_field field_packet;
 
 	DBG_ENTER("mysqlnd_stmt_skip_metadata");
@@ -264,13 +264,13 @@
 	field_packet.skip_parsing = TRUE;
 	for (;i < stmt->param_count; i++) {
 		if (FAIL == PACKET_READ_ALLOCA(field_packet, stmt->conn)) {
-			PACKET_FREE_ALLOCA(field_packet);
-			DBG_RETURN(FAIL);
+			ret = FAIL;
+			break;
 		}
 	}
 	PACKET_FREE_ALLOCA(field_packet);
 
-	DBG_RETURN(PASS);
+	DBG_RETURN(ret);
 }
 /* }}} */
 
@@ -280,19 +280,21 @@
 mysqlnd_stmt_read_prepare_response(MYSQLND_STMT *stmt TSRMLS_DC)
 {
 	php_mysql_packet_prepare_response prepare_resp;
+	enum_func_status ret = PASS;
 
 	DBG_ENTER("mysqlnd_stmt_read_prepare_response");
 	DBG_INF_FMT("stmt=%lu", stmt->stmt_id);
 
 	PACKET_INIT_ALLOCA(prepare_resp, PROT_PREPARE_RESP_PACKET);
 	if (FAIL == PACKET_READ_ALLOCA(prepare_resp, stmt->conn)) {
-		PACKET_FREE_ALLOCA(prepare_resp);
-		return FAIL;
+		ret = FAIL;
+		goto done;
 	}
 
 	if (0xFF == prepare_resp.error_code) {
 		stmt->error_info = stmt->conn->error_info = prepare_resp.error_info;
-		return FAIL;
+		ret = FAIL;
+		goto done;
 	}
 
 	stmt->stmt_id = prepare_resp.stmt_id;
@@ -303,7 +305,8 @@
 	stmt->param_count = prepare_resp.param_count;
 	PACKET_FREE_ALLOCA(prepare_resp);
 
-	DBG_RETURN(PASS);
+done:
+	DBG_RETURN(ret);
 }
 /* }}} */
 
@@ -597,10 +600,9 @@
 mysqlnd_fetch_stmt_row_buffered(MYSQLND_RES *result, void *param, unsigned int flags,
 								zend_bool *fetched_anything TSRMLS_DC)
 {
-	unsigned int i;
 	MYSQLND_STMT *stmt = (MYSQLND_STMT *) param;
+	MYSQLND_RES_BUFFERED *set = result->stored_data;
 	uint field_count = result->meta->field_count;
-	MYSQLND_RES_BUFFERED *set = result->stored_data;
 
 	DBG_ENTER("mysqlnd_fetch_stmt_row_buffered");
 	DBG_INF_FMT("stmt=%lu", stmt->stmt_id);
@@ -611,6 +613,8 @@
 	{
 		/* The user could have skipped binding - don't crash*/
 		if (stmt->result_bind) {
+			unsigned int i;
+			MYSQLND_RES_METADATA * meta = result->meta;
 			zval **current_row = set->data_cursor;
 
 			if (NULL == current_row[0]) {
@@ -618,8 +622,8 @@
 				set->initialized_rows++;
 				result->m.row_decoder(set->row_buffers[row_num],
 									  current_row,
-									  result->meta->field_count,
-									  result->meta->fields,
+									  meta->field_count,
+									  meta->fields,
 									  result->conn TSRMLS_CC);
 				if (stmt->update_max_length) {
 					for (i = 0; i < result->field_count; i++) {
@@ -630,8 +634,8 @@
 						*/
 						if (Z_TYPE_P(current_row[i]) >= IS_STRING) {
 							unsigned long len = Z_STRLEN_P(current_row[i]);
-							if (result->meta->fields[i].max_length < len) {
-								result->meta->fields[i].max_length = len;
+							if (meta->fields[i].max_length < len) {
+								meta->fields[i].max_length = len;
 							}
 						}
 					}
@@ -689,7 +693,6 @@
 {
 	enum_func_status ret;
 	MYSQLND_STMT *stmt = (MYSQLND_STMT *) param;
-	unsigned int i, field_count = result->field_count;
 	php_mysql_packet_row *row_packet = result->row_packet;
 
 	DBG_ENTER("mysqlnd_stmt_fetch_row_unbuffered");
@@ -714,6 +717,7 @@
 	  mysqlnd_unbuffered_free_last_data() before it. The function returns always true.
 	*/
 	if (PASS == (ret = PACKET_READ(row_packet, result->conn)) &&
!row_packet->eof) {
+		unsigned int i, field_count = result->field_count;
 		result->unbuf->row_count++;
 		*fetched_anything = TRUE;
 
@@ -968,7 +972,7 @@
 
 
 /* {{{ mysqlnd_stmt::fetch */
-PHPAPI enum_func_status
+static enum_func_status
 MYSQLND_METHOD(mysqlnd_stmt, fetch)(MYSQLND_STMT * const stmt,
 									zend_bool * const fetched_anything TSRMLS_DC)
 {
@@ -1023,7 +1027,6 @@
 MYSQLND_METHOD(mysqlnd_stmt, reset)(MYSQLND_STMT * const stmt TSRMLS_DC)
 {
 	enum_func_status ret = PASS;
-	MYSQLND * conn = stmt->conn;
 	zend_uchar cmd_buf[STMT_ID_LENGTH /* statement id */];
 
 	DBG_ENTER("mysqlnd_stmt::reset");
@@ -1033,6 +1036,7 @@
 	SET_EMPTY_ERROR(stmt->conn->error_info);
 
 	if (stmt->stmt_id) {
+		MYSQLND * conn = stmt->conn;
 		if (stmt->param_bind) {
 			unsigned int i;
 			DBG_INF("resetting long data");
@@ -1086,7 +1090,6 @@
 	enum_func_status ret = FAIL;
 	MYSQLND * conn = stmt->conn;
 	zend_uchar *cmd_buf;
-	size_t packet_len;
 	enum php_mysqlnd_server_command cmd = COM_STMT_SEND_LONG_DATA;
 	
 	DBG_ENTER("mysqlnd_stmt::send_long_data");
@@ -1128,6 +1131,7 @@
 	*/
 
 	if (CONN_GET_STATE(conn) == CONN_READY) {
+		size_t packet_len;
 		stmt->param_bind[param_no].flags |= MYSQLND_PARAM_BIND_BLOB_USED;
 		cmd_buf = mnd_emalloc(packet_len = STMT_ID_LENGTH + 2 + length);
 
@@ -1185,8 +1189,6 @@
 MYSQLND_METHOD(mysqlnd_stmt, bind_param)(MYSQLND_STMT * const stmt,
 										 MYSQLND_PARAM_BIND * const param_bind TSRMLS_DC)
 {
-	unsigned int i = 0;
-
 	DBG_ENTER("mysqlnd_stmt::bind_param");
 	DBG_INF_FMT("stmt=%lu param_count=%u", stmt->stmt_id, stmt->param_count);
 
@@ -1203,6 +1205,8 @@
 	SET_EMPTY_ERROR(stmt->conn->error_info);
 
 	if (stmt->param_count) {
+		unsigned int i = 0;
+
 		if (!param_bind) {
 			SET_STMT_ERROR(stmt, CR_COMMANDS_OUT_OF_SYNC, UNKNOWN_SQLSTATE,
 							 "Re-binding (still) not supported");
@@ -1288,8 +1292,6 @@
 MYSQLND_METHOD(mysqlnd_stmt, bind_result)(MYSQLND_STMT * const stmt,
 										  MYSQLND_RESULT_BIND * const result_bind TSRMLS_DC)
 {
-	uint i = 0;
-
 	DBG_ENTER("mysqlnd_stmt::bind_result");
 	DBG_INF_FMT("stmt=%lu field_count=%u", stmt->stmt_id, stmt->field_count);
 
@@ -1306,6 +1308,8 @@
 	}
 
 	if (stmt->field_count) {
+		uint i = 0;
+
 		if (!result_bind) {
 			DBG_ERR("no result bind passed");
 			DBG_RETURN(FAIL);
@@ -1510,7 +1514,8 @@
 		case STMT_ATTR_CURSOR_TYPE: {
 			if (val > (unsigned long) CURSOR_TYPE_READ_ONLY) {
 				SET_STMT_ERROR(stmt, CR_NOT_IMPLEMENTED, UNKNOWN_SQLSTATE, "Not implemented");
-				return FAIL;
+				DBG_INF("FAIL");
+				DBG_RETURN(FAIL);
 			}
 			stmt->flags = val;
 			break;
@@ -1520,7 +1525,8 @@
 				val = MYSQLND_DEFAULT_PREFETCH_ROWS;
 			} else if (val > 1) {
 				SET_STMT_ERROR(stmt, CR_NOT_IMPLEMENTED, UNKNOWN_SQLSTATE, "Not implemented");
-				return FAIL;
+				DBG_INF("FAIL");
+				DBG_RETURN(FAIL);
 			}
 			stmt->prefetch_rows = val;
 			break;

Modified: trunk/mysqlnd/mysqlnd_result.c
===================================================================
--- trunk/mysqlnd/mysqlnd_result.c	2008-04-15 09:00:36 UTC (rev 1455)
+++ trunk/mysqlnd/mysqlnd_result.c	2008-04-15 12:53:11 UTC (rev 1456)
@@ -194,7 +194,7 @@
 		MYSQLND_MEMORY_POOL_CHUNK *current_buffer = set->row_buffers[row];
 		int col;
 
-		for (col = field_count - 1; col >=0 ; col--) {
+		for (col = field_count - 1; col >= 0; --col) {
 			zend_bool copy_ctor_called;
 			if (current_row[0] == NULL) {
 				break;/* row that was never initialized */
@@ -816,10 +816,7 @@
 {
 	enum_func_status		ret;
 	zval 					*row = (zval *) param;
-	unsigned int			i,
-							field_count = result->field_count;
 	php_mysql_packet_row	*row_packet = result->row_packet;
-	unsigned long			*lengths = result->lengths;
 
 	DBG_ENTER("mysqlnd_fetch_row_unbuffered");
 	DBG_INF_FMT("flags=%d", flags);
@@ -859,10 +856,12 @@
 			HashTable *row_ht = Z_ARRVAL_P(row);
 			MYSQLND_FIELD *field = result->meta->fields;
 			struct mysqlnd_field_hash_key *zend_hash_key = result->meta->zend_hash_keys;
+			unsigned int i, field_count = result->field_count;
+			unsigned long *lengths = result->lengths;
 
 			result->m.row_decoder(result->unbuf->last_row_buffer,
 								  result->unbuf->last_row_data,
-								  row_packet->field_count,
+								  field_count,
 								  row_packet->fields_metadata,
 								  result->conn TSRMLS_CC);
 
@@ -1199,7 +1198,6 @@
 	row_packet->skip_extraction = TRUE; /* let php_mysqlnd_rowp_read() not allocate
row_packet->fields, we will do it */
 
 	while (FAIL != (ret = PACKET_READ(row_packet, conn)) && !row_packet->eof) {
-
 		if (!free_rows) {
 			uint64 total_rows = free_rows = next_extend = next_extend * 5 / 3; /* extend with 33%
*/
 			total_rows += set->row_count;
@@ -1312,7 +1310,6 @@
 mysqlnd_fetch_row_async_buffered(MYSQLND_RES *result, void *param, unsigned int flags,
 								 zend_bool *fetched_anything TSRMLS_DC)
 {
-	unsigned int i;
 	zval *row = (zval *) param;
 	MYSQLND_RES_BG_BUFFERED *set = result->bg_stored_data;
 
@@ -1349,6 +1346,7 @@
 		/* If there was no decoding in background, we have to decode here */
 		if (set->decode_in_foreground == TRUE) {
 			MYSQLND_MEMORY_POOL_CHUNK *current_buffer = set->row_buffers[row_num];
+			unsigned int i;
 			result->m.row_decoder(current_buffer,
 								  current_row,
 								  result->meta->field_count,

Modified: trunk/mysqlnd/mysqlnd_result_meta.c
===================================================================
--- trunk/mysqlnd/mysqlnd_result_meta.c	2008-04-15 09:00:36 UTC (rev 1455)
+++ trunk/mysqlnd/mysqlnd_result_meta.c	2008-04-15 12:53:11 UTC (rev 1456)
@@ -424,7 +424,8 @@
 
 
 /* {{{ mysqlnd_result_meta_init */
-MYSQLND_RES_METADATA *mysqlnd_result_meta_init(unsigned int field_count TSRMLS_DC)
+MYSQLND_RES_METADATA *
+mysqlnd_result_meta_init(unsigned int field_count TSRMLS_DC)
 {
 	MYSQLND_RES_METADATA *ret;
 	DBG_ENTER("mysqlnd_result_meta_init");

Modified: trunk/mysqlnd/mysqlnd_structs.h
===================================================================
--- trunk/mysqlnd/mysqlnd_structs.h	2008-04-15 09:00:36 UTC (rev 1455)
+++ trunk/mysqlnd/mysqlnd_structs.h	2008-04-15 12:53:11 UTC (rev 1456)
@@ -361,8 +361,8 @@
 	void				(*set_result_bind_dtor)(MYSQLND_STMT * const stmt, void
(*result_bind_dtor)(MYSQLND_RESULT_BIND *) TSRMLS_DC);
 	enum_func_status	(*send_long_data)(MYSQLND_STMT * const stmt, unsigned int param_num,
 										  const char * const data, unsigned long length TSRMLS_DC);
-	MYSQLND_RES	*		(*get_parameter_metadata)(MYSQLND_STMT * const stmt);
-	MYSQLND_RES	*		(*get_result_metadata)(MYSQLND_STMT * const stmt TSRMLS_DC);
+	MYSQLND_RES *		(*get_parameter_metadata)(MYSQLND_STMT * const stmt);
+	MYSQLND_RES *		(*get_result_metadata)(MYSQLND_STMT * const stmt TSRMLS_DC);
 
 	uint64				(*get_last_insert_id)(const MYSQLND_STMT * const stmt);
 	uint64				(*get_affected_rows)(const MYSQLND_STMT * const stmt);

Modified: trunk/mysqlnd/mysqlnd_wireprotocol.c
===================================================================
--- trunk/mysqlnd/mysqlnd_wireprotocol.c	2008-04-15 09:00:36 UTC (rev 1455)
+++ trunk/mysqlnd/mysqlnd_wireprotocol.c	2008-04-15 12:53:11 UTC (rev 1456)
@@ -529,7 +529,7 @@
 php_mysqlnd_greet_read(void *_packet, MYSQLND *conn TSRMLS_DC)
 {
 	zend_uchar buf[512];
-	zend_uchar *p= buf;
+	zend_uchar *p = buf;
 	zend_uchar *begin = buf;
 	php_mysql_packet_greet *packet= (php_mysql_packet_greet *) _packet;
 
@@ -623,7 +623,7 @@
 static
 void php_mysqlnd_crypt(zend_uchar *buffer, const zend_uchar *s1, const zend_uchar *s2,
size_t len)
 {
-	const unsigned char *s1_end= s1 + len;
+	const unsigned char *s1_end = s1 + len;
 	while (s1 < s1_end) {
 		*buffer++= *s1++ ^ *s2++;
 	}
@@ -754,7 +754,7 @@
 	PACKET_READ_HEADER_AND_BODY(packet, conn, buf, sizeof(buf), "OK");
 
 	/* Should be always 0x0 or 0xFF for error */
-	packet->field_count= uint1korr(p);
+	packet->field_count = uint1korr(p);
 	p++;
 
 	if (0xFF == packet->field_count) {
@@ -825,7 +825,7 @@
 	*/
 	php_mysql_packet_eof *packet= (php_mysql_packet_eof *) _packet;
 	zend_uchar buf[5 + 10 + sizeof(packet->sqlstate) + sizeof(packet->error)];
-	zend_uchar *p= buf;
+	zend_uchar *p = buf;
 	zend_uchar *begin = buf;
 
 	DBG_ENTER("php_mysqlnd_eof_read");
@@ -833,7 +833,7 @@
 	PACKET_READ_HEADER_AND_BODY(packet, conn, buf, sizeof(buf), "EOF");
 
 	/* Should be always 0xFE */
-	packet->field_count= uint1korr(p);
+	packet->field_count = uint1korr(p);
 	p++;
 
 	if (0xFF == packet->field_count) {