PHP mysqlnd svn commit: r372 - trunk/mysqlnd

[ahristov]

Author: ahristov
Date: 2007-06-15 11:26:17 +0200 (Fri, 15 Jun 2007)
New Revision: 372

Modified:
   trunk/mysqlnd/mysqlnd.c
   trunk/mysqlnd/mysqlnd_priv.h
   trunk/mysqlnd/mysqlnd_result.c
   trunk/mysqlnd/mysqlnd_result.h
Log:
Introduce MYSQLND_METHOD_PRIVATE and mark some methods
as such.


Modified: trunk/mysqlnd/mysqlnd.c
===================================================================
--- trunk/mysqlnd/mysqlnd.c	2007-06-15 08:58:58 UTC (rev 371)
+++ trunk/mysqlnd/mysqlnd.c	2007-06-15 09:26:17 UTC (rev 372)
@@ -201,9 +201,9 @@
 /* }}} */
 
 
-/* {{{ _mysqlnd_conn_dtor */
-static
-void _mysqlnd_conn_dtor(MYSQLND *conn TSRMLS_DC)
+/* {{{ mysqlnd_conn::dtor */
+static void
+MYSQLND_METHOD_PRIVATE(mysqlnd_conn, dtor)(MYSQLND *conn TSRMLS_DC)
 {
 	conn->m->free_contents(conn TSRMLS_CC);
 
@@ -921,9 +921,9 @@
 /* }}} */
 
 
-/* {{{ _mysqlnd_get_reference */
-static
-MYSQLND * _mysqlnd_get_reference(MYSQLND * const conn)
+/* {{{ mysqlnd_conn::get_reference */
+static MYSQLND *
+MYSQLND_METHOD_PRIVATE(mysqlnd_conn, get_reference)(MYSQLND * const conn)
 {
 	++conn->refcount;
 	return conn;
@@ -931,9 +931,9 @@
 /* }}} */
 
 
-/* {{{ _mysqlnd_free_reference */
-static
-void _mysqlnd_free_reference(MYSQLND * const conn TSRMLS_DC)
+/* {{{ mysqlnd_conn::free_reference */
+static void
+MYSQLND_METHOD_PRIVATE(mysqlnd_conn, free_reference)(MYSQLND * const conn TSRMLS_DC)
 {
 	if (!(--conn->refcount)) {
 		/*
@@ -1013,9 +1013,9 @@
 
 /* {{{ mysqlnd_conn::get_server_info */
 static const char *
-MYSQLND_METHOD(mysqlnd_conn, get_server_info)(const MYSQLND * const conn)
+MYSQLND_METHOD(mysqlnd_conn, get_server_info)(const MYSQLND * const self)
 {
-	return conn->server_version;
+	return self->server_version;
 }
 /* }}} */
 
@@ -1426,10 +1426,10 @@
 	MYSQLND_METHOD(mysqlnd_conn, free_contents),
 	MYSQLND_METHOD(mysqlnd_conn, close),
 
-	_mysqlnd_conn_dtor,
+	MYSQLND_METHOD_PRIVATE(mysqlnd_conn, dtor),
 
-	_mysqlnd_get_reference,
-	_mysqlnd_free_reference
+	MYSQLND_METHOD_PRIVATE(mysqlnd_conn, get_reference),
+	MYSQLND_METHOD_PRIVATE(mysqlnd_conn, free_reference),
 MYSQLND_CLASS_METHODS_END;
 
 

Modified: trunk/mysqlnd/mysqlnd_priv.h
===================================================================
--- trunk/mysqlnd/mysqlnd_priv.h	2007-06-15 08:58:58 UTC (rev 371)
+++ trunk/mysqlnd/mysqlnd_priv.h	2007-06-15 09:26:17 UTC (rev 372)
@@ -42,8 +42,9 @@
 
 #define MYSQLND_CLASS_METHODS_START(class) static \
 									 struct st_##class##_methods mysqlnd_##class##_methods = {
-#define MYSQLND_CLASS_METHODS_END  }							 
-#define MYSQLND_METHOD(class, method) php_nd_##class##_##method
+#define MYSQLND_CLASS_METHODS_END  				}							 
+#define MYSQLND_METHOD(class, method) 			php_##class##_##method##_pub
+#define MYSQLND_METHOD_PRIVATE(class, method)	php_##class##_##method##_priv
 
 #if PHP_MAJOR_VERSION < 6
 #define mysqlnd_array_init(arg, field_count) \
@@ -137,9 +138,6 @@
 
 
 
-
-
-
 /* PS stuff */
 typedef void (*ps_field_fetch_func)(zval *zv, const MYSQLND_FIELD * const field,
 									uint pack_len, zend_uchar **row,

Modified: trunk/mysqlnd/mysqlnd_result.c
===================================================================
--- trunk/mysqlnd/mysqlnd_result.c	2007-06-15 08:58:58 UTC (rev 371)
+++ trunk/mysqlnd/mysqlnd_result.c	2007-06-15 09:26:17 UTC (rev 372)
@@ -129,8 +129,9 @@
 /* }}} */
 
 
-/* {{{ mysqlnd_internal_free_result_buffers */
-void mysqlnd_internal_free_result_buffers(MYSQLND_RES *result TSRMLS_DC)
+/* {{{ mysqlnd_res::free_result_buffers */
+void
+MYSQLND_METHOD(mysqlnd_res, free_result_buffers)(MYSQLND_RES *result TSRMLS_DC)
 {
 
 	if (result->unbuf) {
@@ -151,6 +152,7 @@
 
 
 /* {{{ mysqlnd_internal_free_result_metadata */
+static
 void mysqlnd_internal_free_result_metadata(MYSQLND_RES_METADATA *meta, zend_bool
persistent TSRMLS_DC)
 {
 	int i;
@@ -1013,9 +1015,9 @@
 /* }}} */
 
 
-/* {{{ _mysqlnd_unbuffered_skip_result */
+/* {{{ mysqlnd_res::skip_result */
 static enum_func_status
-_mysqlnd_unbuffered_skip_result(MYSQLND_RES * const result TSRMLS_DC)
+MYSQLND_METHOD(mysqlnd_res, skip_result)(MYSQLND_RES * const result TSRMLS_DC)
 {
 	zend_bool fetched_anything;
 
@@ -1279,8 +1281,9 @@
 	ret->m.fetch_field	= MYSQLND_METHOD(mysqlnd_res, fetch_field);
 	ret->m.fetch_field_direct = MYSQLND_METHOD(mysqlnd_res, fetch_field_direct);
 
-	ret->m.skip_result	= _mysqlnd_unbuffered_skip_result;
-	ret->m.free_result_buffers	= mysqlnd_internal_free_result_buffers;
+	ret->m.skip_result	= MYSQLND_METHOD(mysqlnd_res, skip_result);
+	ret->m.free_result_buffers	= MYSQLND_METHOD(mysqlnd_res, free_result_buffers);
+
 	ret->m.fetch_row_normal_buffered	= mysqlnd_fetch_row_buffered;
 	ret->m.fetch_row_normal_unbuffered	= mysqlnd_fetch_row_unbuffered;
 

Modified: trunk/mysqlnd/mysqlnd_result.h
===================================================================
--- trunk/mysqlnd/mysqlnd_result.h	2007-06-15 08:58:58 UTC (rev 371)
+++ trunk/mysqlnd/mysqlnd_result.h	2007-06-15 09:26:17 UTC (rev 372)
@@ -33,7 +33,6 @@
 
 
 enum_func_status mysqlnd_read_result_metadata(MYSQLND *conn, MYSQLND_RES *result
TSRMLS_DC);
-void mysqlnd_internal_free_result_metadata(MYSQLND_RES_METADATA *meta, zend_bool
persistent TSRMLS_DC);
 
 enum_func_status
 mysqlnd_store_result_fetch_data(MYSQLND * const conn, MYSQLND_RES *result,