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 9B84064EE for ; Fri, 29 Jul 2011 17:31:51 +0000 (UTC) Received: (qmail 36564 invoked by uid 500); 29 Jul 2011 17:31:51 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 36503 invoked by uid 500); 29 Jul 2011 17:31:51 -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 36496 invoked by uid 99); 29 Jul 2011 17:31:51 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 29 Jul 2011 17:31:51 +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; Fri, 29 Jul 2011 17:31:49 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id EA07F2388A6B for ; Fri, 29 Jul 2011 17:31:27 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1152314 - in /apr/apr/branches/1.2.x: CHANGES strings/apr_snprintf.c Date: Fri, 29 Jul 2011 17:31:27 -0000 To: commits@apr.apache.org From: rjung@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110729173127.EA07F2388A6B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rjung Date: Fri Jul 29 17:31:24 2011 New Revision: 1152314 URL: http://svn.apache.org/viewvc?rev=1152314&view=rev Log: Fix flag character '#' in combination with format character 'x' in apr snprintf implementations. Modified: apr/apr/branches/1.2.x/CHANGES apr/apr/branches/1.2.x/strings/apr_snprintf.c Modified: apr/apr/branches/1.2.x/CHANGES URL: http://svn.apache.org/viewvc/apr/apr/branches/1.2.x/CHANGES?rev=1152314&r1=1152313&r2=1152314&view=diff ============================================================================== --- apr/apr/branches/1.2.x/CHANGES [utf-8] (original) +++ apr/apr/branches/1.2.x/CHANGES [utf-8] Fri Jul 29 17:31:24 2011 @@ -1,6 +1,9 @@ -*- coding: utf-8 -*- Changes for APR 1.2.13 + *) Fix flag character '#' in combination with format character 'x' in + apr snprintf implementations. [Rainer Jung] + *) Fix return value when apr_pollset_poll interrupted. PR 42580 [Basant Kumar Kukreja ] Modified: apr/apr/branches/1.2.x/strings/apr_snprintf.c URL: http://svn.apache.org/viewvc/apr/apr/branches/1.2.x/strings/apr_snprintf.c?rev=1152314&r1=1152313&r2=1152314&view=diff ============================================================================== --- apr/apr/branches/1.2.x/strings/apr_snprintf.c (original) +++ apr/apr/branches/1.2.x/strings/apr_snprintf.c Fri Jul 29 17:31:24 2011 @@ -708,7 +708,7 @@ APR_DECLARE(int) apr_vformatter(int (*fl apr_int64_t i_quad = 0; apr_uint64_t ui_quad; apr_int32_t i_num = 0; - apr_uint32_t ui_num; + apr_uint32_t ui_num = 0; char num_buf[NUM_BUF_SIZE]; char char_buf[2]; /* for printing %% and % */ @@ -946,7 +946,7 @@ APR_DECLARE(int) apr_vformatter(int (*fl &num_buf[NUM_BUF_SIZE], &s_len); } FIX_PRECISION(adjust_precision, precision, s, s_len); - if (alternate_form && i_num != 0) { + if (alternate_form && ui_num != 0) { *--s = *fmt; /* 'x' or 'X' */ *--s = '0'; s_len += 2;