PHP mysqlnd svn commit: r1162 - trunk/mysqlnd

[ahristov]

Author: ahristov
Date: 2007-12-07 14:59:56 +0100 (Fri, 07 Dec 2007)
New Revision: 1162

Modified:
   trunk/mysqlnd/mysqlnd.c
   trunk/mysqlnd/mysqlnd_result.c
Log:
More static modifiers for less polluted namespace and faster linking


Modified: trunk/mysqlnd/mysqlnd.c
===================================================================
--- trunk/mysqlnd/mysqlnd.c	2007-11-29 16:02:44 UTC (rev 1161)
+++ trunk/mysqlnd/mysqlnd.c	2007-12-07 13:59:56 UTC (rev 1162)
@@ -67,7 +67,7 @@
 static zend_bool mysqlnd_library_initted = FALSE;
 
 
-enum_func_status mysqlnd_send_close(MYSQLND * conn TSRMLS_DC);
+static enum_func_status mysqlnd_send_close(MYSQLND * conn TSRMLS_DC);
 
 /* {{{ mysqlnd_library_init */
 static
@@ -1088,7 +1088,7 @@
 /* }}} */
 
 
-/* {{{ _mysqlnd_conn::set_charset */
+/* {{{ mysqlnd_conn::set_charset */
 static enum_func_status
 MYSQLND_METHOD(mysqlnd_conn, set_charset)(MYSQLND * const conn, const char * const csname
TSRMLS_DC)
 {
@@ -1696,8 +1696,8 @@
 /* }}} */
 
 
-/* {{{ _mysqlnd_conn::use_result */
-MYSQLND_RES *
+/* {{{ mysqlnd_conn::use_result */
+static MYSQLND_RES *
 MYSQLND_METHOD(mysqlnd_conn, use_result)(MYSQLND * const conn TSRMLS_DC)
 {
 	MYSQLND_RES *result;
@@ -1729,8 +1729,8 @@
 /* }}} */
 
 
-/* {{{ _mysqlnd_conn::store_result */
-MYSQLND_RES *
+/* {{{ mysqlnd_conn::store_result */
+static MYSQLND_RES *
 MYSQLND_METHOD(mysqlnd_conn, store_result)(MYSQLND * const conn TSRMLS_DC)
 {
 	MYSQLND_RES *result;
@@ -1762,7 +1762,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: trunk/mysqlnd/mysqlnd_result.c
===================================================================
--- trunk/mysqlnd/mysqlnd_result.c	2007-11-29 16:02:44 UTC (rev 1161)
+++ trunk/mysqlnd/mysqlnd_result.c	2007-12-07 13:59:56 UTC (rev 1162)
@@ -714,7 +714,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");
@@ -993,7 +993,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)
@@ -1103,7 +1103,7 @@
 
 
 /* {{{ mysqlnd_res::num_fields */
-mynd_ulonglong
+static mynd_ulonglong
 MYSQLND_METHOD(mysqlnd_res, num_rows)(const MYSQLND_RES * const res)
 {
 	/* Be compatible with libmysql. We count row_count, but will return 0 */
@@ -1113,7 +1113,7 @@
 
 
 /* {{{ mysqlnd_res::num_fields */
-unsigned int
+static unsigned int
 MYSQLND_METHOD(mysqlnd_res, num_fields)(const MYSQLND_RES * const res)
 {
 	return res->field_count;