Return-Path: X-Original-To: apmail-apr-commits-archive@www.apache.org Delivered-To: apmail-apr-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 43D8210B58 for ; Mon, 16 Sep 2013 01:32:29 +0000 (UTC) Received: (qmail 87527 invoked by uid 500); 16 Sep 2013 01:32:29 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 87494 invoked by uid 500); 16 Sep 2013 01:32:29 -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 87487 invoked by uid 99); 16 Sep 2013 01:32:28 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 16 Sep 2013 01:32:28 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 16 Sep 2013 01:32:27 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id BD2E5238890B; Mon, 16 Sep 2013 01:32:07 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1523521 - /apr/apr/trunk/test/internal/testucs.c Date: Mon, 16 Sep 2013 01:32:07 -0000 To: commits@apr.apache.org From: trawick@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130916013207.BD2E5238890B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: trawick Date: Mon Sep 16 01:32:07 2013 New Revision: 1523521 URL: http://svn.apache.org/r1523521 Log: fix various compile errors and warnings Modified: apr/apr/trunk/test/internal/testucs.c Modified: apr/apr/trunk/test/internal/testucs.c URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/internal/testucs.c?rev=1523521&r1=1523520&r2=1523521&view=diff ============================================================================== --- apr/apr/trunk/test/internal/testucs.c (original) +++ apr/apr/trunk/test/internal/testucs.c Mon Sep 16 01:32:07 2013 @@ -17,16 +17,19 @@ #include "apr.h" #include "arch/win32/apr_arch_utf8.h" #include +#include +#include #include #include struct testval { unsigned char n[8]; - int nl; + apr_size_t nl; wchar_t w[4]; - int wl; + apr_size_t wl; }; +#ifdef FOR_REFERENCE /* For reference; a table of invalid utf-8 encoded ucs-2/ucs-4 sequences. * The table consists of start, end pairs for all invalid ranges. * NO_UCS2_PAIRS will pass the reservered D800-DFFF values, halting at FFFF @@ -71,6 +74,7 @@ struct testval malformed[] = [ [[0xFE,], 1,], /* 11111110 invalid "too large" value, no 7 byte seq */ [[0xFF,], 1,], /* 11111111 invalid "too large" value, no 8 byte seq */ ]; +#endif /* FOR_REFERENCE */ void displaynw(struct testval *f, struct testval *l) { @@ -192,7 +196,7 @@ void test_wrange(struct testval *p) } do { - int wl = s.wl, nl = sizeof(s.n); + apr_size_t wl = s.wl, nl = sizeof(s.n); rc = apr_conv_ucs2_to_utf8(s.w, &wl, s.n, &nl); s.nl = sizeof(s.n) - s.nl; if (rc == APR_INCOMPLETE) {