Hosting Provided By

PHP mysqlnd svn commit: r720 - in trunk: php5/ext/mysqli php6/ext/mysqli

From: <ahristov(at)mysql.com>
Date: Wed Jul 11 2007 - 13:26:04 EDT

Author: ahristov
Date: 2007-07-11 19:26:03 +0200 (Wed, 11 Jul 2007) New Revision: 720

Modified:

trunk/php5/ext/mysqli/mysqli.c
trunk/php6/ext/mysqli/mysqli.c
Log:
Whitespace + bugfix for mysqli_result constructor test

Modified: trunk/php5/ext/mysqli/mysqli.c

trunk/php5/ext/mysqli/mysqli.c 2007-07-11 15:53:20 UTC (rev 719) +++ trunk/php5/ext/mysqli/mysqli.c 2007-07-11 17:26:03 UTC (rev 720) @@ -106,7 +106,7 @@

 		if (bbuf.vars[i]) {
 			zval_ptr_dtor(&bbuf.vars[i]);

-		}	

+		}
 	}
 
 	if (bbuf.vars) {
@@ -176,7 +176,7 @@
 	mysqli_object 	*intern = (mysqli_object *)zo;
 	MYSQLI_RESOURCE	*my_res = (MYSQLI_RESOURCE *)intern->ptr;
 

-	my_efree(my_res);	

+	my_efree(my_res);
 	zend_object_std_dtor(&intern->zo TSRMLS_CC);
 	efree(intern);

}
@@ -288,7 +288,7 @@

 	ret = FAILURE;
 	obj = (mysqli_object *)zend_objects_get_address(object TSRMLS_CC);
 
- 	if (member->type != IS_STRING) {
+	if (member->type != IS_STRING) {
 		tmp_member = *member;
 		zval_copy_ctor(&tmp_member);
 		convert_to_string(&tmp_member);

@@ -301,7 +301,8 @@

 	if (ret == SUCCESS) {
 		if (strcmp(obj->zo.ce->name, "mysqli_driver") &&
-            (!obj->ptr || ((MYSQLI_RESOURCE *)(obj->ptr))->status < MYSQLI_STATUS_INITIALIZED)) {
+			(!obj->ptr || ((MYSQLI_RESOURCE *)(obj->ptr))->status < MYSQLI_STATUS_INITIALIZED))
+		{
 			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Couldn't fetch %s", obj->zo.ce->name );
 			retval = EG(uninitialized_zval_ptr);
 			return(retval);
@@ -335,7 +336,7 @@
 	zend_object_handlers *std_hnd;
 	int ret;
 
- 	if (member->type != IS_STRING) {
+	if (member->type != IS_STRING) {
 		tmp_member = *member;
 		zval_copy_ctor(&tmp_member);
 		convert_to_string(&tmp_member);
@@ -406,7 +407,7 @@
 		} else if (obj->zo.ce == mysqli_warning_class_entry) {
 			f.handler = ZEND_MN(mysqli_warning___construct);
 		}

-

+

 		return (union _zend_function*)&f;
 	}

}
@@ -427,8 +428,7 @@

intern->prop_handler = NULL;

 	mysqli_base_class = class_type;

-	while (mysqli_base_class->type != ZEND_INTERNAL_CLASS && mysqli_base_class->parent != NULL)
-	{

+	while (mysqli_base_class->type != ZEND_INTERNAL_CLASS && mysqli_base_class->parent != NULL) {
 		mysqli_base_class = mysqli_base_class->parent;
 	}
 	zend_hash_find(&classes, mysqli_base_class->name, mysqli_base_class->name_length + 1, 
@@ -479,7 +479,7 @@
 	STANDARD_MODULE_HEADER_EX, NULL,
 	mysqli_deps,
 #elif ZEND_MODULE_API_NO >= 20010901
- 	STANDARD_MODULE_HEADER,
Do you need help? 
In addition to our free technical library, Pantek provides professional IT services to companies who utilize Open Source software:Learn more about Pantek's Technical Support offerings
Place an order for 24/7/365 Technical Support here
Learn more about Pantek, who we are, and what we do
Chat with a Live Operator
Related lists.mysql.com Links
announce
benchmarks
bugs
certification
cluster
commits
dotnet
gui-tools
internals
java
maxdb
myodbc
mysql
mysqldoc
packagers
perl
plusplus
replication
win32
Request more information about Pantek
+	STANDARD_MODULE_HEADER,
 #endif
 	"mysqli",
 	mysqli_functions,

@@ -840,9 +840,9 @@
ZEND_FUNCTION(mysqli_stmt_construct)
{

 	MY_MYSQL			*mysql;

-	zval  				*mysql_link;

+	zval				*mysql_link;
 	MY_STMT				*stmt;

-	MYSQLI_RESOURCE 	*mysqli_resource;

+	MYSQLI_RESOURCE		*mysqli_resource;
 	char				*statement;
 	int					statement_len;
 
@@ -898,20 +898,24 @@
 	MY_MYSQL			*mysql;
 	MYSQL_RES			*result;
 	zval				*mysql_link;

-	MYSQLI_RESOURCE 	*mysqli_resource;

+	MYSQLI_RESOURCE		*mysqli_resource;
 	long				resmode = MYSQLI_STORE_RESULT;
 
 	switch (ZEND_NUM_ARGS()) {
 		case 1:

-	        if (zend_parse_parameters(1 TSRMLS_CC, "O", &mysql_link, mysqli_link_class_entry)==FAILURE) {

+			if (zend_parse_parameters(1 TSRMLS_CC, "O", &mysql_link, mysqli_link_class_entry)==FAILURE) {
 				return;
 			}

-		break;

+			break;
 		case 2:

-	        if (zend_parse_parameters(2 TSRMLS_CC, "Ol", &mysql_link, mysqli_link_class_entry, &resmode)==FAILURE) {

+			if (zend_parse_parameters(2 TSRMLS_CC, "Ol", &mysql_link, mysqli_link_class_entry, &resmode)==FAILURE) {
 				return;
 			}

-		break;

+			if (resmode != MYSQLI_USE_RESULT && resmode != MYSQLI_STORE_RESULT) {
+				php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid value for resultmode");
+				RETURN_FALSE;
+			}
+			break;
 		default:
 			WRONG_PARAM_COUNT;
 	}
@@ -928,7 +932,7 @@
 	mysqli_resource = (MYSQLI_RESOURCE *)ecalloc (1, sizeof(MYSQLI_RESOURCE));
 	mysqli_resource->ptr = (void *)result;
 	mysqli_resource->status = MYSQLI_STATUS_VALID;

-

+

((mysqli_object *) zend_object_store_get_object(getThis() TSRMLS_CC))->ptr = mysqli_resource;

}
@@ -941,7 +945,7 @@

 	MYSQL_RES		*result;
 	zval			*mysql_result;
 	long			fetchtype;

-	zval            *ctor_params = NULL;

+	zval			*ctor_params = NULL;
 	zend_class_entry *ce = NULL;
 #if !defined(HAVE_MYSQLND)
 	unsigned int	i;
@@ -1040,10 +1044,10 @@
 		zend_fcall_info fci;
 		zend_fcall_info_cache fcc;
 		zval *retval_ptr;

-

+

 		object_and_properties_init(return_value, ce, NULL);
 		zend_merge_properties(return_value, Z_ARRVAL(dataset), 1 TSRMLS_CC);

-

+

 		if (ce->constructor) {
 			fci.size = sizeof(fci);
 			fci.function_table = &ce->function_table;
@@ -1055,7 +1059,7 @@
 				if (Z_TYPE_P(ctor_params) == IS_ARRAY) {
 					HashTable *ht = Z_ARRVAL_P(ctor_params);
 					Bucket *p;

-

+

 					fci.param_count = 0;
 					fci.params = safe_emalloc(sizeof(zval*), ht->nNumOfElements, 0);
Do you need more help? 
In addition to our free technical library, Pantek provides professional IT services to companies who utilize Open Source software:Learn more about Pantek's Technical Support offerings
Place an order for 24/7/365 Technical Support here
Learn more about Pantek, who we are, and what we do
Chat with a Live Operator
Related lists.mysql.com Links
announce
benchmarks
bugs
certification
cluster
commits
dotnet
gui-tools
internals
java
maxdb
myodbc
mysql
mysqldoc
packagers
perl
plusplus
replication
win32
Request more information about Pantek
 					p = ht->pListHead;
@@ -1083,7 +1087,7 @@
 			fcc.function_handler = ce->constructor;
 			fcc.calling_scope = EG(scope);
 			fcc.object_pp = &return_value;

-

+

 			if (zend_call_function(&fci, &fcc TSRMLS_CC) == FAILURE) {
 				zend_throw_exception_ex(zend_exception_get_default(TSRMLS_C), 0 TSRMLS_CC, "Could not execute %s::%s()", ce->name, ce->constructor->common.function_name);
 			} else {

@@ -1159,7 +1163,7 @@
{

 	mysqli_local_infile			*data;
 	MY_MYSQL 					*mysql;

-	php_stream_context 			*context = NULL;

+	php_stream_context			*context = NULL;
 
 	TSRMLS_FETCH();

@@ -1198,7 +1202,7 @@
int php_local_infile_read(void *ptr, char *buf, uint buf_len) {

 	mysqli_local_infile 		*data;

-	MY_MYSQL 					*mysql;

+	MY_MYSQL					*mysql;
 	zval						***callback_args;
 	zval						*retval;
 	zval						*fp;

@@ -1213,10 +1217,8 @@

 	/* default processing */
 	if (!mysql->li_read) {

-		int			count;

+		int count = (int)php_stream_read(mysql->li_stream, buf, buf_len);
 

-		count = (int)php_stream_read(mysql->li_stream, buf, buf_len);

-
 		if (count < 0) {
 			LOCAL_INFILE_ERROR_MSG(data->error_msg, ER(2));
 		}
@@ -1225,21 +1227,21 @@
 	}
 
 	ALLOC_CALLBACK_ARGS(callback_args, 1, argc);

-

+

Can we help you?

/* set parameters: filepointer, buffer, buffer_len, errormsg */

 	MAKE_STD_ZVAL(fp);
 	php_stream_to_zval(mysql->li_stream, fp);
 	callback_args[0] = &fp;

-	ZVAL_STRING(*callback_args[1], "", 1);	
-	ZVAL_LONG(*callback_args[2], buf_len);	
-	ZVAL_STRING(*callback_args[3], "", 1);	

+	ZVAL_STRING(*callback_args[1], "", 1);
+	ZVAL_LONG(*callback_args[2], buf_len);
+	ZVAL_STRING(*callback_args[3], "", 1);
 	
 	if (call_user_function_ex(EG(function_table), 
 						NULL,
 						mysql->li_read,
 						&retval,

-						argc,	 	

+						argc,
 						callback_args,
 						0,
 						NULL TSRMLS_CC) == SUCCESS) {
@@ -1267,7 +1269,7 @@
 		LOCAL_INFILE_ERROR_MSG(data->error_msg, "Can't execute load data local init callback function");
 		rc = -1;
 	}

-

+

 	FREE_CALLBACK_ARGS(callback_args, 1, argc);
 	efree(fp);
 	return rc;
@@ -1283,7 +1285,7 @@
 	if (data) {
 		strlcpy(error_msg, data->error_msg, error_msg_len);
 		return 2000;

-	} 

+	}
 	strlcpy(error_msg, ER(CR_OUT_OF_MEMORY), error_msg_len);
 	return CR_OUT_OF_MEMORY;

}
@@ -1291,10 +1293,10 @@

/* {{{ php_local_infile_end
*/
-void php_local_infile_end(void *ptr)
+void php_local_infile_end(void *ptr)
{
- mysqli_local_infile *data;

MY_MYSQL *mysql; + mysqli_local_infile *data; + MY_MYSQL *mysql;

TSRMLS_FETCH(); @@ -1309,7 +1311,7 @@

 	php_stream_close(mysql->li_stream);
Can't find what you're looking for? 
In addition to our free technical library, Pantek provides professional IT services to companies who utilize Open Source software:Learn more about Pantek's Technical Support offerings
Place an order for 24/7/365 Technical Support here
Learn more about Pantek, who we are, and what we do
Chat with a Live Operator
Related lists.mysql.com Links
announce
benchmarks
bugs
certification
cluster
commits
dotnet
gui-tools
internals
java
maxdb
myodbc
mysql
mysqldoc
packagers
perl
plusplus
replication
win32
Request more information about Pantek
 	free(data);

-	return;	

+	return;

}
/* }}} */
#endif

Modified: trunk/php6/ext/mysqli/mysqli.c

trunk/php6/ext/mysqli/mysqli.c 2007-07-11 15:53:20 UTC (rev 719) +++ trunk/php6/ext/mysqli/mysqli.c 2007-07-11 17:26:03 UTC (rev 720) @@ -911,15 +911,19 @@

 	switch (ZEND_NUM_ARGS()) {
 		case 1:

-	        if (zend_parse_parameters(1 TSRMLS_CC, "O", &mysql_link, mysqli_link_class_entry)==FAILURE) {

+			if (zend_parse_parameters(1 TSRMLS_CC, "O", &mysql_link, mysqli_link_class_entry)==FAILURE) {
 				return;
 			}

-		break;

+			break;
 		case 2:

-	        if (zend_parse_parameters(2 TSRMLS_CC, "Ol", &mysql_link, mysqli_link_class_entry, &resmode)==FAILURE) {

+			if (zend_parse_parameters(2 TSRMLS_CC, "Ol", &mysql_link, mysqli_link_class_entry, &resmode)==FAILURE) {
 				return;
 			}

-		break;

+			if (resmode != MYSQLI_USE_RESULT && resmode != MYSQLI_STORE_RESULT) {
+				php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid value for resultmode");
+				RETURN_FALSE;
+			}
+			break;
 		default:
 			WRONG_PARAM_COUNT;
 	}
@@ -936,7 +940,7 @@
 	mysqli_resource = (MYSQLI_RESOURCE *)ecalloc (1, sizeof(MYSQLI_RESOURCE));
 	mysqli_resource->ptr = (void *)result;
 	mysqli_resource->status = MYSQLI_STATUS_VALID;

-

+

((mysqli_object *) zend_object_store_get_object(getThis() TSRMLS_CC))->ptr = mysqli_resource; }
/* }}} */
@@ -956,7 +960,7 @@

 	MYSQL_RES		*result;
 	zval			*mysql_result;
 	long			fetchtype;

-	zval            *ctor_params = NULL;

+	zval			*ctor_params = NULL;
 	zend_class_entry *ce = NULL;
 #if !defined(HAVE_MYSQLND)
 	unsigned int	i;
@@ -1074,10 +1078,10 @@
 		zend_fcall_info fci;
 		zend_fcall_info_cache fcc;
 		zval *retval_ptr;

-

+

 		object_and_properties_init(return_value, ce, NULL);
 		zend_merge_properties(return_value, Z_ARRVAL(dataset), 1 TSRMLS_CC);

-

+

 		if (ce->constructor) {
 			fci.size = sizeof(fci);
 			fci.function_table = &ce->function_table;
@@ -1089,7 +1093,7 @@
 				if (Z_TYPE_P(ctor_params) == IS_ARRAY) {
 					HashTable *ht = Z_ARRVAL_P(ctor_params);
 					Bucket *p;

-

+

 					fci.param_count = 0;
 					fci.params = safe_emalloc(sizeof(zval*), ht->nNumOfElements, 0);
 					p = ht->pListHead;
@@ -1117,7 +1121,7 @@
 			fcc.function_handler = ce->constructor;
 			fcc.calling_scope = EG(scope);
 			fcc.object_pp = &return_value;

-

+

 			if (zend_call_function(&fci, &fcc TSRMLS_CC) == FAILURE) {
 				zend_throw_exception_ex(zend_exception_get_default(TSRMLS_C), 0 TSRMLS_CC, "Could not execute %v::%v()", ce->name, ce->constructor->common.function_name);
Don't know where to look next? 
In addition to our free technical library, Pantek provides professional IT services to companies who utilize Open Source software:Learn more about Pantek's Technical Support offerings
Place an order for 24/7/365 Technical Support here
Learn more about Pantek, who we are, and what we do
Chat with a Live Operator
Related lists.mysql.com Links
announce
benchmarks
bugs
certification
cluster
commits
dotnet
gui-tools
internals
java
maxdb
myodbc
mysql
mysqldoc
packagers
perl
plusplus
replication
win32
Request more information about Pantek
 			} else {

@@ -1193,8 +1197,8 @@
int php_local_infile_init(void **ptr, const char *filename, void *userdata) {

 	mysqli_local_infile			*data;

-	MY_MYSQL 					*mysql;
-	php_stream_context 			*context = NULL;

+	MY_MYSQL					*mysql;
+	php_stream_context			*context = NULL;
 
 	TSRMLS_FETCH();

@@ -1232,8 +1236,8 @@
/* {{{ int php_local_infile_read */
int php_local_infile_read(void *ptr, char *buf, uint buf_len) {
- mysqli_local_infile *data;

MY_MYSQL *mysql; + mysqli_local_infile *data; + MY_MYSQL *mysql; zval ***callback_args; zval *retval; zval *fp; @@ -1248,10 +1252,8 @@

 	/* default processing */
 	if (!mysql->li_read) {

-		int			count;

+		int count= (int)php_stream_read(mysql->li_stream, buf, buf_len);
 

-		count = (int)php_stream_read(mysql->li_stream, buf, buf_len);

-
 		if (count < 0) {
 			LOCAL_INFILE_ERROR_MSG(data->error_msg, ER(2));
 		}
@@ -1266,15 +1268,15 @@
 	MAKE_STD_ZVAL(fp);
 	php_stream_to_zval(mysql->li_stream, fp);
 	callback_args[0] = &fp;

-	ZVAL_STRING(*callback_args[1], "", 1);	
-	ZVAL_LONG(*callback_args[2], buf_len);	
-	ZVAL_STRING(*callback_args[3], "", 1);	
-	

+	ZVAL_STRING(*callback_args[1], "", 1);
+	ZVAL_LONG(*callback_args[2], buf_len);
+	ZVAL_STRING(*callback_args[3], "", 1);
+
 	if (call_user_function_ex(EG(function_table), 
 						NULL,
 						mysql->li_read,
 						&retval,

-						argc,	 	

+						argc,
 						callback_args,
 						0,
 						NULL TSRMLS_CC) == SUCCESS) {
@@ -1302,7 +1304,7 @@
 		LOCAL_INFILE_ERROR_MSG(data->error_msg, "Can't execute load data local init callback function");
 		rc = -1;
 	}

-

+

 	FREE_CALLBACK_ARGS(callback_args, 1, argc);
 	efree(fp);
 	return rc;
@@ -1318,7 +1320,7 @@
 	if (data) {
 		strlcpy(error_msg, data->error_msg, error_msg_len);
 		return 2000;

-	} 

+	}
 	strlcpy(error_msg, ER(CR_OUT_OF_MEMORY), error_msg_len);
 	return CR_OUT_OF_MEMORY;

}
@@ -1326,10 +1328,10 @@

/* {{{ php_local_infile_end
*/
-void php_local_infile_end(void *ptr)
+void php_local_infile_end(void *ptr)
{
- mysqli_local_infile *data;

MY_MYSQL *mysql; + mysqli_local_infile *data; + MY_MYSQL *mysql;

TSRMLS_FETCH(); @@ -1344,7 +1346,7 @@

 	php_stream_close(mysql->li_stream);
 	free(data);

-	return;	

+	return;

}
/* }}} */
#endif

-- 
MySQL Code Commits Mailing List
For list archives: 
http://lists.mysql.com/commits
To unsubscribe:    
http://lists.mysql.com/commits?unsub=lists@pantek.com

Received on Wed Jul 11 13:26:14 2007

Confused? Frustrated?

This message: [ Message body ]
Next message: paul(at)mysql.com: "svn commit - mysqldoc@docsrva: r7086 - in trunk: . refman-5.0 refman-5.1"
Previous message: Ingo Struewing: "bk commit into 6.0-falcon tree (istruewing:1.2584) BUG#28158"

Contemporary messages sorted: [ By Date ] [ By Thread ] [ By Subject ] [ By Author ] [ By messages with attachments ]

This archive was generated by hypermail 2.1.8 : Thu Aug 02 2007 - 01:54:24 EDT