Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:33410 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 61486 invoked by uid 1010); 24 Nov 2007 05:34:10 -0000 Delivered-To: ezmlm-scan-internals@lists.php.net Delivered-To: ezmlm-internals@lists.php.net Received: (qmail 61471 invoked from network); 24 Nov 2007 05:34:10 -0000 Received: from unknown (HELO lists.php.net) (127.0.0.1) by localhost with SMTP; 24 Nov 2007 05:34:10 -0000 Authentication-Results: pb1.pair.com smtp.mail=andy@petdance.com; spf=permerror; sender-id=softfail Authentication-Results: pb1.pair.com header.from=andy@petdance.com; sender-id=softfail Received-SPF: error (pb1.pair.com: domain petdance.com from 69.17.117.6 cause and error) X-PHP-List-Original-Sender: andy@petdance.com X-Host-Fingerprint: 69.17.117.6 mail4.sea5.speakeasy.net Linux 2.5 (sometimes 2.4) (4) Received: from [69.17.117.6] ([69.17.117.6:60632] helo=mail4.sea5.speakeasy.net) by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP id A6/68-30382-2D7B7474 for ; Sat, 24 Nov 2007 00:34:10 -0500 Received: (qmail 18291 invoked from network); 24 Nov 2007 05:34:07 -0000 Received: from rocket.petdance.com (HELO uniqua.petdance.com) ([64.81.227.163]) (envelope-sender ) by mail4.sea5.speakeasy.net (qmail-ldap-1.03) with SMTP for ; 24 Nov 2007 05:34:07 -0000 Received: by uniqua.petdance.com (Postfix, from userid 500) id E7D2C5CD0329; Fri, 23 Nov 2007 23:34:06 -0600 (CST) Date: Fri, 23 Nov 2007 23:34:06 -0600 To: internals@lists.php.net Message-ID: <20071124053406.GB24788@petdance.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="tjCHc7DPkfUGtrlw" Content-Disposition: inline User-Agent: Mutt/1.4.2.2i Subject: [PATCH] consting ext/standard/dl.c From: andy@petdance.com (Andy Lester) --tjCHc7DPkfUGtrlw Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Here's dl.c Is the Zend directory doable as well, or is that off-limits for some reason or another? That's really the place I should be working on first, because it's the lowest level. xoxo, Andy -- Andy Lester => andy@petdance.com => www.petdance.com => AIM:petdance --tjCHc7DPkfUGtrlw Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="dl.patch" Index: ext/standard/dl.c =================================================================== --- ext/standard/dl.c (revision 1) +++ ext/standard/dl.c (working copy) @@ -97,7 +97,7 @@ #define USING_ZTS 0 #endif -PHPAPI int php_load_extension(char *filename, int type, int start_now TSRMLS_DC) /* {{{ */ +PHPAPI int php_load_extension(const char *filename, int type, int start_now TSRMLS_DC) /* {{{ */ { void *handle; char *libpath; @@ -244,12 +244,10 @@ /* {{{ php_dl */ -PHPAPI void php_dl(zval *file, int type, zval *return_value, int start_now TSRMLS_DC) +PHPAPI void php_dl(const zval *file, int type, zval *return_value, int start_now TSRMLS_DC) { - char *filename; + const char * const filename = Z_STRVAL_P(file); - filename = Z_STRVAL_P(file); - /* Load extension */ if (php_load_extension(filename, type, start_now TSRMLS_CC) == FAILURE) { RETVAL_FALSE; @@ -266,7 +264,7 @@ #else -PHPAPI void php_dl(zval *file, int type, zval *return_value, int start_now TSRMLS_DC) +PHPAPI void php_dl(const zval *file, int type, zval *return_value, int start_now TSRMLS_DC) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot dynamically load %s - dynamic modules are not supported", Z_STRVAL_P(file)); RETURN_FALSE; Index: ext/standard/dl.h =================================================================== --- ext/standard/dl.h (revision 1) +++ ext/standard/dl.h (working copy) @@ -23,8 +23,8 @@ #ifndef DL_H #define DL_H -PHPAPI int php_load_extension(char *filename, int type, int start_now TSRMLS_DC); -PHPAPI void php_dl(zval *file,int type, zval *return_value, int start_now TSRMLS_DC); +PHPAPI int php_load_extension(const char *filename, int type, int start_now TSRMLS_DC); +PHPAPI void php_dl(const zval *file,int type, zval *return_value, int start_now TSRMLS_DC); /* dynamic loading functions */ PHP_FUNCTION(dl); Index: tags =================================================================== --- tags (revision 14) +++ tags (working copy) @@ -21857,7 +21857,7 @@ php_disk_total_space ext/standard/filestat.c /^static int php_disk_total_space(char *path, double *space TSRMLS_DC) \/* {{{ *\/$/;" f file: php_dispatch_vtbl ext/com_dotnet/com_wrapper.c /^static struct IDispatchExVtbl php_dispatch_vtbl = {$/;" v typeref:struct:IDispatchExVtbl file: php_dispatchex ext/com_dotnet/com_wrapper.c /^} php_dispatchex;$/;" t typeref:struct:__anon245 file: -php_dl ext/standard/dl.c /^PHPAPI void php_dl(zval *file, int type, zval *return_value, int start_now TSRMLS_DC)$/;" f +php_dl ext/standard/dl.c /^PHPAPI void php_dl(const zval *file, int type, zval *return_value, int start_now TSRMLS_DC)$/;" f php_dns_free_res ext/standard/dns.c 364;" d file: php_dns_free_res ext/standard/dns.c 375;" d file: php_do_chgrp ext/standard/filestat.c /^static void php_do_chgrp(INTERNAL_FUNCTION_PARAMETERS, int do_lchgrp) \/* {{{ *\/$/;" f file: @@ -22261,7 +22261,7 @@ php_lcg_globals ext/standard/php_lcg.h /^} php_lcg_globals;$/;" t typeref:struct:__anon151 php_le_stream_context ext/standard/file.c /^PHPAPI int php_le_stream_context(void)$/;" f php_lint_script main/main.c /^PHPAPI int php_lint_script(zend_file_handle *file TSRMLS_DC)$/;" f -php_load_extension ext/standard/dl.c /^PHPAPI int php_load_extension(char *filename, int type, int start_now TSRMLS_DC) \/* {{{ *\/$/;" f +php_load_extension ext/standard/dl.c /^PHPAPI int php_load_extension(const char *filename, int type, int start_now TSRMLS_DC) \/* {{{ *\/$/;" f php_load_php_extension_cb main/php_ini.c /^static void php_load_php_extension_cb(void *arg TSRMLS_DC)$/;" f file: php_load_zend_extension_cb main/php_ini.c /^static void php_load_zend_extension_cb(void *arg TSRMLS_DC)$/;" f file: php_localtime_r main/reentrancy.c /^PHPAPI struct tm *php_localtime_r(const time_t *const timep, struct tm *p_tm)$/;" f --tjCHc7DPkfUGtrlw--