PHP mysqlnd svn commit: r1163 - branches/experimental/mysqlnd

[ahristov]

Author: ahristov
Date: 2007-12-07 17:10:47 +0100 (Fri, 07 Dec 2007)
New Revision: 1163

Modified:
   branches/experimental/mysqlnd/mysqlnd.c
   branches/experimental/mysqlnd/mysqlnd_result.c
Log:
More static modifiers. Merge from trunk/


Modified: branches/experimental/mysqlnd/mysqlnd.c
===================================================================
--- branches/experimental/mysqlnd/mysqlnd.c	2007-12-07 13:59:56 UTC (rev 1162)
+++ branches/experimental/mysqlnd/mysqlnd.c	2007-12-07 16:10:47 UTC (rev 1163)
@@ -68,7 +68,7 @@
 
 MYSQLND_MEMORY_POOL mysqlnd_memory_pool;
 
-enum_func_status mysqlnd_send_close(MYSQLND * conn TSRMLS_DC);
+static enum_func_status mysqlnd_send_close(MYSQLND * conn TSRMLS_DC);
 
 #define MYSQLND_SILENT 1
 
@@ -1391,7 +1391,7 @@
 
 
 /* {{{ mysqlnd_send_close */
-enum_func_status
+static enum_func_status
 mysqlnd_send_close(MYSQLND * conn TSRMLS_DC)
 {
 	enum_func_status ret = PASS;
@@ -1973,7 +1973,7 @@
 
 
 /* {{{ mysqlnd_conn::use_result */
-MYSQLND_RES *
+static MYSQLND_RES *
 MYSQLND_METHOD(mysqlnd_conn, use_result)(MYSQLND * const conn TSRMLS_DC)
 {
 	MYSQLND_RES *result;
@@ -2006,7 +2006,7 @@
 
 
 /* {{{ mysqlnd_conn::store_result */
-MYSQLND_RES *
+static MYSQLND_RES *
 MYSQLND_METHOD(mysqlnd_conn, store_result)(MYSQLND * const conn TSRMLS_DC)
 {
 	MYSQLND_RES *result;
@@ -2076,7 +2076,7 @@
 
 
 /* {{{ mysqlnd_conn::get_connection_stats */
-void
+static void
 MYSQLND_METHOD(mysqlnd_conn, get_connection_stats)(const MYSQLND * const conn,
 												   zval *return_value
 												   TSRMLS_DC ZEND_FILE_LINE_DC)

Modified: branches/experimental/mysqlnd/mysqlnd_result.c
===================================================================
--- branches/experimental/mysqlnd/mysqlnd_result.c	2007-12-07 13:59:56 UTC (rev 1162)
+++ branches/experimental/mysqlnd/mysqlnd_result.c	2007-12-07 16:10:47 UTC (rev 1163)
@@ -888,7 +888,7 @@
 
 
 /* {{{ mysqlnd_res::use_result */
-MYSQLND_RES *
+static MYSQLND_RES *
 MYSQLND_METHOD(mysqlnd_res, use_result)(MYSQLND_RES * const result, zend_bool ps
TSRMLS_DC)
 {
 	DBG_ENTER("mysqlnd_res::use_result");
@@ -1203,7 +1203,7 @@
 
 
 /* {{{ mysqlnd_res::store_result */
-MYSQLND_RES *
+static MYSQLND_RES *
 MYSQLND_METHOD(mysqlnd_res, store_result)(MYSQLND_RES * result,
 										  MYSQLND * const conn,
 										  zend_bool ps_protocol TSRMLS_DC)
@@ -1609,8 +1609,8 @@
 /* }}} */
 
 
-/* {{{ mysqlnd_res::num_fields */
-mynd_ulonglong
+/* {{{ mysqlnd_res::num_rows */
+static mynd_ulonglong
 MYSQLND_METHOD(mysqlnd_res, num_rows)(const MYSQLND_RES * const result)
 {
 	/* Be compatible with libmysql. We count row_count, but will return 0 */
@@ -1620,7 +1620,7 @@
 
 
 /* {{{ mysqlnd_res::num_fields */
-unsigned int
+static unsigned int
 MYSQLND_METHOD(mysqlnd_res, num_fields)(const MYSQLND_RES * const result)
 {
 	return result->field_count;