Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:15679
Return-Path: <andi@zend.com>
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Delivered-To: mailing list internals@lists.php.net
Received: (qmail 15087 invoked by uid 1010); 30 Mar 2005 06:34:40 -0000
Delivered-To: ezmlm-scan-internals@lists.php.net
Delivered-To: ezmlm-internals@lists.php.net
Received: (qmail 15064 invoked from network); 30 Mar 2005 06:34:40 -0000
Received: from unknown (HELO zend.com) (127.0.0.1)
  by localhost with SMTP; 30 Mar 2005 06:34:40 -0000
X-Host-Fingerprint: 80.74.107.235 mail.zend.com Linux 2.5 (sometimes 2.4) (4)
Received: from ([80.74.107.235:51080] helo=mail.zend.com)
	by pb1.pair.com (ecelerity HEAD r(5268)) with SMTP
	id FA/0B-22409-E784A424 for <internals@lists.php.net>; Wed, 30 Mar 2005 01:34:38 -0500
Received: (qmail 2127 invoked from network); 30 Mar 2005 06:34:33 -0000
Received: from localhost (HELO ANDI-NOTEBOOK.zend.com) (127.0.0.1)
	by localhost with SMTP; 30 Mar 2005 06:34:33 -0000
Message-ID: <5.1.0.14.2.20050329223427.03412c20@localhost>
X-Sender: andi@localhost
X-Mailer: QUALCOMM Windows Eudora Version 5.1
Date: Tue, 29 Mar 2005 22:34:31 -0800
To: Joe Orton <jorton@redhat.com>,internals@lists.php.net
In-Reply-To: <20050324131116.GA10316@redhat.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"; format=flowed
Subject: Re: [PHP-DEV] [PATCH] mysqli: remove global symbols
From: andi@zend.com (Andi Gutmans)
References: <20050324131116.GA10316@redhat.com>

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;
>
>
>--
>PHP Internals - PHP Runtime Development Mailing List
>To unsubscribe, visit: http://www.php.net/unsub.php