Return-Path: X-Original-To: apmail-subversion-commits-archive@minotaur.apache.org Delivered-To: apmail-subversion-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0912E185ED for ; Mon, 14 Sep 2015 09:58:38 +0000 (UTC) Received: (qmail 21699 invoked by uid 500); 14 Sep 2015 09:58:37 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 21661 invoked by uid 500); 14 Sep 2015 09:58:37 -0000 Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@subversion.apache.org Delivered-To: mailing list commits@subversion.apache.org Received: (qmail 21651 invoked by uid 99); 14 Sep 2015 09:58:37 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 14 Sep 2015 09:58:37 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id 9271EAC0111 for ; Mon, 14 Sep 2015 09:58:37 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1702893 - /subversion/trunk/subversion/libsvn_subr/utf.c Date: Mon, 14 Sep 2015 09:58:37 -0000 To: commits@subversion.apache.org From: rhuijben@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150914095837.9271EAC0111@hades.apache.org> Author: rhuijben Date: Mon Sep 14 09:58:37 2015 New Revision: 1702893 URL: http://svn.apache.org/r1702893 Log: * subversion/libsvn_subr/utf.c (svn_utf_string_from_utf8, svn_utf_cstring_from_utf8_string): Reduce scope of variable to get rid of a warning. Modified: subversion/trunk/subversion/libsvn_subr/utf.c Modified: subversion/trunk/subversion/libsvn_subr/utf.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/utf.c?rev=1702893&r1=1702892&r2=1702893&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_subr/utf.c (original) +++ subversion/trunk/subversion/libsvn_subr/utf.c Mon Sep 14 09:58:37 2015 @@ -860,7 +860,6 @@ svn_utf_string_from_utf8(const svn_strin const svn_string_t *src, apr_pool_t *pool) { - svn_stringbuf_t *dbuf; xlate_handle_node_t *node; svn_error_t *err; @@ -870,10 +869,15 @@ svn_utf_string_from_utf8(const svn_strin { err = check_utf8(src->data, src->len, pool); if (! err) - err = convert_to_stringbuf(node, src->data, src->len, - &dbuf, pool); - if (! err) - *dest = svn_stringbuf__morph_into_string(dbuf); + { + svn_stringbuf_t *dbuf; + + err = convert_to_stringbuf(node, src->data, src->len, + &dbuf, pool); + + if (! err) + *dest = svn_stringbuf__morph_into_string(dbuf); + } } else { @@ -991,7 +995,6 @@ svn_utf_cstring_from_utf8_string(const c const svn_string_t *src, apr_pool_t *pool) { - svn_stringbuf_t *dbuf; xlate_handle_node_t *node; svn_error_t *err; @@ -1001,10 +1004,14 @@ svn_utf_cstring_from_utf8_string(const c { err = check_utf8(src->data, src->len, pool); if (! err) - err = convert_to_stringbuf(node, src->data, src->len, - &dbuf, pool); - if (! err) - *dest = dbuf->data; + { + svn_stringbuf_t *dbuf; + + err = convert_to_stringbuf(node, src->data, src->len, + &dbuf, pool); + if (! err) + *dest = dbuf->data; + } } else {