Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:15578 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 71964 invoked by uid 1010); 24 Mar 2005 13:11:20 -0000 Delivered-To: ezmlm-scan-internals@lists.php.net Delivered-To: ezmlm-internals@lists.php.net Received: (qmail 71941 invoked from network); 24 Mar 2005 13:11:20 -0000 Received: from unknown (HELO redhat.com) (127.0.0.1) by localhost with SMTP; 24 Mar 2005 13:11:20 -0000 X-Host-Fingerprint: 66.187.233.31 mx1.redhat.com Linux 2.4/2.6 Received: from ([66.187.233.31:50058] helo=mx1.redhat.com) by pb1.pair.com (ecelerity HEAD r(5268)) with SMTP id 9D/C5-02157-87CB2424 for ; Thu, 24 Mar 2005 08:11:20 -0500 Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254]) by mx1.redhat.com (8.12.11/8.12.11) with ESMTP id j2ODBIvY017949 for ; Thu, 24 Mar 2005 08:11:18 -0500 Received: from radish.cambridge.redhat.com (radish.cambridge.redhat.com [172.16.18.90]) by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id j2ODBHO22223 for ; Thu, 24 Mar 2005 08:11:17 -0500 Received: from radish.cambridge.redhat.com (localhost.localdomain [127.0.0.1]) by radish.cambridge.redhat.com (8.13.1/8.12.7) with ESMTP id j2ODBGYw013317 for ; Thu, 24 Mar 2005 13:11:16 GMT Received: (from jorton@localhost) by radish.cambridge.redhat.com (8.13.1/8.12.10/Submit) id j2ODBGiR013316 for internals@lists.php.net; Thu, 24 Mar 2005 13:11:16 GMT Date: Thu, 24 Mar 2005 13:11:16 +0000 To: internals@lists.php.net Message-ID: <20050324131116.GA10316@redhat.com> Mail-Followup-To: internals@lists.php.net Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline User-Agent: Mutt/1.4.1i Subject: [PATCH] mysqli: remove global symbols From: jorton@redhat.com (Joe Orton) 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;