# [PATCH] mysqli: remove global symbols

- Thread: https://externals.io/message/15578
- Original archive: https://news-web.php.net/php.internals/15578
- Started by Joe Orton on 2005-03-24T13:11:16+00:00
- Messages: 3
- Reply by email to internals@lists.php.net
- More for agents: search with https://externals.io/search.md?q={query} · JSON API at https://externals.io/api · documentation at https://externals.io/llms.txt

---

## #15578 — Joe Orton — 2005-03-24T13:11:16+00:00

URL: https://externals.io/message/15578#15578

Any objections to this patch?  mysqli is defining a bunch of global
symbols which it looks like it doesn't need to.  Not urgent for 5.0.4.

--- php-5.0.3/ext/mysqli/mysqli_prop.c.mysqliglobal
+++ php-5.0.3/ext/mysqli/mysqli_prop.c
@@ -57,7 +57,7 @@
 p = (MYSQL_STMT *)((MY_STMT *)((MYSQLI_RESOURCE *)(obj->ptr))->ptr)->stmt
 
 #define MYSQLI_MAP_PROPERTY_FUNC_LONG( __func, __int_func, __get_type, __ret_type)\
-int __func(mysqli_object *obj, zval **retval TSRMLS_DC) \
+static int __func(mysqli_object *obj, zval **retval TSRMLS_DC) \
 {\
 	__ret_type l;\
 	__get_type;\
@@ -77,7 +77,7 @@
 }
 
 #define MYSQLI_MAP_PROPERTY_FUNC_STRING(__func, __int_func, __get_type)\
-int __func(mysqli_object *obj, zval **retval TSRMLS_DC)\
+static int __func(mysqli_object *obj, zval **retval TSRMLS_DC)\
 {\
 	char *c;\
 	__get_type;\
@@ -95,7 +95,7 @@
 }
 
 /* {{{ property link_client_version_read */
-int link_client_version_read(mysqli_object *obj, zval **retval TSRMLS_DC)
+static int link_client_version_read(mysqli_object *obj, zval **retval TSRMLS_DC)
 {
 	ALLOC_ZVAL(*retval);
 	ZVAL_LONG(*retval, MYSQL_VERSION_ID);
@@ -104,7 +104,7 @@
 /* }}} */
 
 /* {{{ property link_client_info_read */
-int link_client_info_read(mysqli_object *obj, zval **retval TSRMLS_DC)
+static int link_client_info_read(mysqli_object *obj, zval **retval TSRMLS_DC)
 {
 	ALLOC_ZVAL(*retval);
 	ZVAL_STRING(*retval, MYSQL_SERVER_VERSION, 1);
@@ -113,7 +113,7 @@
 /* }}} */
 
 /* {{{ property link_connect_errno_read */
-int link_connect_errno_read(mysqli_object *obj, zval **retval TSRMLS_DC)
+static int link_connect_errno_read(mysqli_object *obj, zval **retval TSRMLS_DC)
 {
 	ALLOC_ZVAL(*retval);
 	ZVAL_LONG(*retval, (long)MyG(error_no));
@@ -122,7 +122,7 @@
 /* }}} */
 
 /* {{{ property link_connect_error_read */
-int link_connect_error_read(mysqli_object *obj, zval **retval TSRMLS_DC)
+static int link_connect_error_read(mysqli_object *obj, zval **retval TSRMLS_DC)
 {
 	ALLOC_ZVAL(*retval);
 	ZVAL_STRING(*retval, MyG(error_msg), 1);
@@ -148,7 +148,7 @@
 /* result properties */
 
 /* {{{ property result_type_read */
-int result_type_read(mysqli_object *obj, zval **retval TSRMLS_DC)
+static int result_type_read(mysqli_object *obj, zval **retval TSRMLS_DC)
 {
 	MYSQL_RES *p;
 
@@ -167,7 +167,7 @@
 /* }}} */
 
 /* {{{ property result_lengths_read */
-int result_lengths_read(mysqli_object *obj, zval **retval TSRMLS_DC)
+static int result_lengths_read(mysqli_object *obj, zval **retval TSRMLS_DC)
 {
 	MYSQL_RES *p;

---

## #15619 — Jani Taskinen — 2005-03-26T02:50:59+00:00

URL: https://externals.io/message/15578#15619 · In reply to: #15578

If anyone objects, they'll morons. Just commit.

     --Jani




> Any objections to this patch?  mysqli is defining a bunch of global
> symbols which it looks like it doesn't need to.  Not urgent for 5.0.4.
>
> --- php-5.0.3/ext/mysqli/mysqli_prop.c.mysqliglobal
> +++ php-5.0.3/ext/mysqli/mysqli_prop.c
> @@ -57,7 +57,7 @@
> p = (MYSQL_STMT *)((MY_STMT *)((MYSQLI_RESOURCE *)(obj->ptr))->ptr)->stmt
>
> #define MYSQLI_MAP_PROPERTY_FUNC_LONG( __func, __int_func, __get_type, __ret_type)\
> -int __func(mysqli_object *obj, zval **retval TSRMLS_DC) \
> +static int __func(mysqli_object *obj, zval **retval TSRMLS_DC) \
> {\
> 	__ret_type l;\
> 	__get_type;\
> @@ -77,7 +77,7 @@
> }
>
> #define MYSQLI_MAP_PROPERTY_FUNC_STRING(__func, __int_func, __get_type)\
> -int __func(mysqli_object *obj, zval **retval TSRMLS_DC)\
> +static int __func(mysqli_object *obj, zval **retval TSRMLS_DC)\
> {\
> 	char *c;\
> 	__get_type;\
> @@ -95,7 +95,7 @@
> }
>
> /* {{{ property link_client_version_read */
> -int link_client_version_read(mysqli_object *obj, zval **retval TSRMLS_DC)
> +static int link_client_version_read(mysqli_object *obj, zval **retval TSRMLS_DC)
> {
> 	ALLOC_ZVAL(*retval);
> 	ZVAL_LONG(*retval, MYSQL_VERSION_ID);
> @@ -104,7 +104,7 @@
> /* }}} */
>
> /* {{{ property link_client_info_read */
> -int link_client_info_read(mysqli_object *obj, zval **retval TSRMLS_DC)
> +static int link_client_info_read(mysqli_object *obj, zval **retval TSRMLS_DC)
> {
> 	ALLOC_ZVAL(*retval);
> 	ZVAL_STRING(*retval, MYSQL_SERVER_VERSION, 1);
> @@ -113,7 +113,7 @@
> /* }}} */
>
> /* {{{ property link_connect_errno_read */
> -int link_connect_errno_read(mysqli_object *obj, zval **retval TSRMLS_DC)
> +static int link_connect_errno_read(mysqli_object *obj, zval **retval TSRMLS_DC)
> {
> 	ALLOC_ZVAL(*retval);
> 	ZVAL_LONG(*retval, (long)MyG(error_no));
> @@ -122,7 +122,7 @@
> /* }}} */
>
> /* {{{ property link_connect_error_read */
> -int link_connect_error_read(mysqli_object *obj, zval **retval TSRMLS_DC)
> +static int link_connect_error_read(mysqli_object *obj, zval **retval TSRMLS_DC)
> {
> 	ALLOC_ZVAL(*retval);
> 	ZVAL_STRING(*retval, MyG(error_msg), 1);
> @@ -148,7 +148,7 @@
> /* result properties */
>
> /* {{{ property result_type_read */
> -int result_type_read(mysqli_object *obj, zval **retval TSRMLS_DC)
> +static int result_type_read(mysqli_object *obj, zval **retval TSRMLS_DC)
> {
> 	MYSQL_RES *p;
>
> @@ -167,7 +167,7 @@
> /* }}} */
>
> /* {{{ property result_lengths_read */
> -int result_lengths_read(mysqli_object *obj, zval **retval TSRMLS_DC)
> +static int result_lengths_read(mysqli_object *obj, zval **retval TSRMLS_DC)
> {
> 	MYSQL_RES *p;

---

## #15679 — Andi Gutmans — 2005-03-30T06:34:31+00:00

URL: https://externals.io/message/15578#15679 · In reply to: #15578

Looks fine to me.

At 01:11 PM 3/24/2005 +0000, Joe Orton wrote:
>Any objections to this patch?  mysqli is defining a bunch of global
>symbols which it looks like it doesn't need to.  Not urgent for 5.0.4.
>
>--- php-5.0.3/ext/mysqli/mysqli_prop.c.mysqliglobal
>+++ php-5.0.3/ext/mysqli/mysqli_prop.c
>@@ -57,7 +57,7 @@
>  p = (MYSQL_STMT *)((MY_STMT *)((MYSQLI_RESOURCE *)(obj->ptr))->ptr)->stmt
>
>  #define MYSQLI_MAP_PROPERTY_FUNC_LONG( __func, __int_func, __get_type, 
> __ret_type)\
>-int __func(mysqli_object *obj, zval **retval TSRMLS_DC) \
>+static int __func(mysqli_object *obj, zval **retval TSRMLS_DC) \
>  {\
>         __ret_type l;\
>         __get_type;\
>@@ -77,7 +77,7 @@
>  }
>
>  #define MYSQLI_MAP_PROPERTY_FUNC_STRING(__func, __int_func, __get_type)\
>-int __func(mysqli_object *obj, zval **retval TSRMLS_DC)\
>+static int __func(mysqli_object *obj, zval **retval TSRMLS_DC)\
>  {\
>         char *c;\
>         __get_type;\
>@@ -95,7 +95,7 @@
>  }
>
>  /* {{{ property link_client_version_read */
>-int link_client_version_read(mysqli_object *obj, zval **retval TSRMLS_DC)
>+static int link_client_version_read(mysqli_object *obj, zval **retval 
>TSRMLS_DC)
>  {
>         ALLOC_ZVAL(*retval);
>         ZVAL_LONG(*retval, MYSQL_VERSION_ID);
>@@ -104,7 +104,7 @@
>  /* }}} */
>
>  /* {{{ property link_client_info_read */
>-int link_client_info_read(mysqli_object *obj, zval **retval TSRMLS_DC)
>+static int link_client_info_read(mysqli_object *obj, zval **retval TSRMLS_DC)
>  {
>         ALLOC_ZVAL(*retval);
>         ZVAL_STRING(*retval, MYSQL_SERVER_VERSION, 1);
>@@ -113,7 +113,7 @@
>  /* }}} */
>
>  /* {{{ property link_connect_errno_read */
>-int link_connect_errno_read(mysqli_object *obj, zval **retval TSRMLS_DC)
>+static int link_connect_errno_read(mysqli_object *obj, zval **retval 
>TSRMLS_DC)
>  {
>         ALLOC_ZVAL(*retval);
>         ZVAL_LONG(*retval, (long)MyG(error_no));
>@@ -122,7 +122,7 @@
>  /* }}} */
>
>  /* {{{ property link_connect_error_read */
>-int link_connect_error_read(mysqli_object *obj, zval **retval TSRMLS_DC)
>+static int link_connect_error_read(mysqli_object *obj, zval **retval 
>TSRMLS_DC)
>  {
>         ALLOC_ZVAL(*retval);
>         ZVAL_STRING(*retval, MyG(error_msg), 1);
>@@ -148,7 +148,7 @@
>  /* result properties */
>
>  /* {{{ property result_type_read */
>-int result_type_read(mysqli_object *obj, zval **retval TSRMLS_DC)
>+static int result_type_read(mysqli_object *obj, zval **retval TSRMLS_DC)
>  {
>         MYSQL_RES *p;
>
>@@ -167,7 +167,7 @@
>  /* }}} */
>
>  /* {{{ property result_lengths_read */
>-int result_lengths_read(mysqli_object *obj, zval **retval TSRMLS_DC)
>+static int result_lengths_read(mysqli_object *obj, zval **retval TSRMLS_DC)
>  {
>         MYSQL_RES *p;