Return-Path: Delivered-To: apmail-apr-commits-archive@www.apache.org Received: (qmail 45285 invoked from network); 11 Jan 2007 00:54:46 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 11 Jan 2007 00:54:46 -0000 Received: (qmail 97102 invoked by uid 500); 11 Jan 2007 00:54:52 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 97077 invoked by uid 500); 11 Jan 2007 00:54:52 -0000 Mailing-List: contact commits-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: Reply-To: dev@apr.apache.org List-Id: Delivered-To: mailing list commits@apr.apache.org Received: (qmail 97066 invoked by uid 99); 11 Jan 2007 00:54:52 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 10 Jan 2007 16:54:52 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 10 Jan 2007 16:54:44 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 5D9971A981A; Wed, 10 Jan 2007 16:53:44 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r495070 - in /apr/apr-iconv/trunk/ces: iso-10646-ucs-4.c ucs2-internal.c ucs4-internal.c unicode-1-1-utf-7.c utf-16.c utf-8.c Date: Thu, 11 Jan 2007 00:53:44 -0000 To: commits@apr.apache.org From: wrowe@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070111005344.5D9971A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: wrowe Date: Wed Jan 10 16:53:43 2007 New Revision: 495070 URL: http://svn.apache.org/viewvc?view=rev&rev=495070 Log: Correct const'ness and size'dness errors for 64 bits in apr-iconv sources. Modified: apr/apr-iconv/trunk/ces/iso-10646-ucs-4.c apr/apr-iconv/trunk/ces/ucs2-internal.c apr/apr-iconv/trunk/ces/ucs4-internal.c apr/apr-iconv/trunk/ces/unicode-1-1-utf-7.c apr/apr-iconv/trunk/ces/utf-16.c apr/apr-iconv/trunk/ces/utf-8.c Modified: apr/apr-iconv/trunk/ces/iso-10646-ucs-4.c URL: http://svn.apache.org/viewvc/apr/apr-iconv/trunk/ces/iso-10646-ucs-4.c?view=diff&rev=495070&r1=495069&r2=495070 ============================================================================== --- apr/apr-iconv/trunk/ces/iso-10646-ucs-4.c (original) +++ apr/apr-iconv/trunk/ces/iso-10646-ucs-4.c Wed Jan 10 16:53:43 2007 @@ -50,7 +50,7 @@ unsigned char **outbuf, apr_size_t *outbytesleft) { int *state = (int*)ces->data; - int bytes; + apr_size_t bytes; if (in == UCS_CHAR_NONE) return 1; /* No state reinitialization for table charsets */ Modified: apr/apr-iconv/trunk/ces/ucs2-internal.c URL: http://svn.apache.org/viewvc/apr/apr-iconv/trunk/ces/ucs2-internal.c?view=diff&rev=495070&r1=495069&r2=495070 ============================================================================== --- apr/apr-iconv/trunk/ces/ucs2-internal.c (original) +++ apr/apr-iconv/trunk/ces/ucs2-internal.c Wed Jan 10 16:53:43 2007 @@ -70,7 +70,7 @@ convert_to_ucs(struct iconv_ces *ces, const unsigned char **inbuf, apr_size_t *inbytesleft) { - ucs2_t *ret = *inbuf; + const ucs2_t *ret = *inbuf; if (*inbytesleft < sizeof(ucs2_t)) return UCS_CHAR_NONE; /* Not enough bytes in the input buffer */ (*inbytesleft) -= sizeof(ucs2_t); Modified: apr/apr-iconv/trunk/ces/ucs4-internal.c URL: http://svn.apache.org/viewvc/apr/apr-iconv/trunk/ces/ucs4-internal.c?view=diff&rev=495070&r1=495069&r2=495070 ============================================================================== --- apr/apr-iconv/trunk/ces/ucs4-internal.c (original) +++ apr/apr-iconv/trunk/ces/ucs4-internal.c Wed Jan 10 16:53:43 2007 @@ -68,7 +68,7 @@ convert_to_ucs(struct iconv_ces *ces, const unsigned char **inbuf, apr_size_t *inbytesleft) { - ucs4_t *ret = *inbuf; + const ucs4_t *ret = *inbuf; if (*inbytesleft < sizeof(ucs4_t)) return UCS_CHAR_NONE; /* Not enough bytes in the input buffer */ (*inbytesleft) -= sizeof(ucs4_t); Modified: apr/apr-iconv/trunk/ces/unicode-1-1-utf-7.c URL: http://svn.apache.org/viewvc/apr/apr-iconv/trunk/ces/unicode-1-1-utf-7.c?view=diff&rev=495070&r1=495069&r2=495070 ============================================================================== --- apr/apr-iconv/trunk/ces/unicode-1-1-utf-7.c (original) +++ apr/apr-iconv/trunk/ces/unicode-1-1-utf-7.c Wed Jan 10 16:53:43 2007 @@ -48,7 +48,7 @@ } static APR_INLINE int -lackofbytes(int bytes, apr_size_t *bytesleft) +lackofbytes(apr_size_t bytes, apr_size_t *bytesleft) { if (bytes > *bytesleft) return 1; Modified: apr/apr-iconv/trunk/ces/utf-16.c URL: http://svn.apache.org/viewvc/apr/apr-iconv/trunk/ces/utf-16.c?view=diff&rev=495070&r1=495069&r2=495070 ============================================================================== --- apr/apr-iconv/trunk/ces/utf-16.c (original) +++ apr/apr-iconv/trunk/ces/utf-16.c Wed Jan 10 16:53:43 2007 @@ -49,7 +49,7 @@ { unsigned char *cp; int *state = (int *)ces->data; - int bytes; + apr_size_t bytes; if (in == UCS_CHAR_NONE) return 1; /* No state reinitialization for table charsets */ Modified: apr/apr-iconv/trunk/ces/utf-8.c URL: http://svn.apache.org/viewvc/apr/apr-iconv/trunk/ces/utf-8.c?view=diff&rev=495070&r1=495069&r2=495070 ============================================================================== --- apr/apr-iconv/trunk/ces/utf-8.c (original) +++ apr/apr-iconv/trunk/ces/utf-8.c Wed Jan 10 16:53:43 2007 @@ -51,7 +51,8 @@ unsigned char **outbuf, apr_size_t *outbytesleft) { unsigned char *cp; - int n; + apr_size_t n; + if (in == UCS_CHAR_NONE) return 1; /* No state reinitialization for table charsets */ if (in < 0x80) {