Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:17850 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 72004 invoked by uid 1010); 12 Aug 2005 01:05:49 -0000 Delivered-To: ezmlm-scan-internals@lists.php.net Delivered-To: ezmlm-internals@lists.php.net Received: (qmail 71985 invoked from network); 12 Aug 2005 01:05:49 -0000 Received: from unknown (HELO lists.php.net) (127.0.0.1) by localhost with SMTP; 12 Aug 2005 01:05:49 -0000 X-Host-Fingerprint: 68.219.111.113 adsl-219-111-113.asm.bellsouth.net Received: from ([68.219.111.113:11202] helo=localhost.localdomain) by pb1.pair.com (ecelerity 2.0 beta r(6323M)) with SMTP id EE/51-33075-CE5FBF24 for ; Thu, 11 Aug 2005 21:05:48 -0400 Message-ID: To: internals@lists.php.net Reply-To: "cshmoove@bellsouth.net" Date: Thu, 11 Aug 2005 21:03:12 -0700 Lines: 38 X-Priority: 3 X-MSMail-Priority: Normal X-Newsreader: Microsoft Outlook Express 6.00.2900.2180 X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2900.2180 X-RFC2646: Format=Flowed; Original X-Posted-By: 68.219.111.113 Subject: [PATCH] VC++ / ZTS fixes, Path I From: cshmoove@bellsouth.net i would commit if i had write access... Index: ext/standard/string.c =================================================================== RCS file: /repository/php-src/ext/standard/string.c,v retrieving revision 1.447 diff -u -r1.447 string.c --- ext/standard/string.c 11 Aug 2005 23:35:59 -0000 1.447 +++ ext/standard/string.c 12 Aug 2005 03:57:59 -0000 @@ -584,7 +584,7 @@ * Expands possible ranges of the form 'a..b' in input charlist, * where a < b in code-point order */ -static int php_expand_u_trim_range(UChar **range, int32_t *range_len) +static int php_expand_u_trim_range(UChar **range, int32_t *range_len TSRMLS_DC) { UChar32 *codepts, *tmp, *input, *end, c; int32_t len, tmp_len, idx; @@ -673,7 +673,7 @@ int32_t start = 0, end = len; if ( what ) { - php_expand_u_trim_range(&what, &what_len); + php_expand_u_trim_range(&what, &what_len TSRMLS_CC); } if ( mode & 1 ) { @@ -4728,8 +4728,8 @@ int l=0; memcpy(result, input_str, input_str_len); s = result; - e = result + input_str_len; - ee = result + result_len; + e = (char *)result + input_str_len; + ee = (char *)result + result_len; while ( e < ee ) { l = (e-s) < (ee-e) ? (e-s) : (ee-e);