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 1C6DE10657 for ; Tue, 18 Jun 2013 15:23:07 +0000 (UTC) Received: (qmail 45388 invoked by uid 500); 18 Jun 2013 15:23:07 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 45284 invoked by uid 500); 18 Jun 2013 15:23:06 -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 45277 invoked by uid 99); 18 Jun 2013 15:23:05 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Jun 2013 15:23:05 +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; Tue, 18 Jun 2013 15:23:03 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 194C223888E3; Tue, 18 Jun 2013 15:22:43 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1494171 - /subversion/trunk/subversion/libsvn_wc/wc_db.c Date: Tue, 18 Jun 2013 15:22:42 -0000 To: commits@subversion.apache.org From: stsp@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130618152243.194C223888E3@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: stsp Date: Tue Jun 18 15:22:42 2013 New Revision: 1494171 URL: http://svn.apache.org/r1494171 Log: * subversion/libsvn_wc/wc_db.c (svn_wc__db_bump_format): Keep *bumped_format as FALSE in case of error, rather than setting it based on the potentially undefined value of *result_format. Most likely not a functional change, since callers shouldn't be using output when this function returns an error. Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=1494171&r1=1494170&r2=1494171&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_wc/wc_db.c (original) +++ subversion/trunk/subversion/libsvn_wc/wc_db.c Tue Jun 18 15:22:42 2013 @@ -15038,7 +15038,7 @@ svn_wc__db_bump_format(int *result_forma err = svn_wc__upgrade_sdb(result_format, wcroot_abspath, sdb, format, scratch_pool); - if (bumped_format) + if (err == SVN_NO_ERROR && bumped_format) *bumped_format = (*result_format > format); /* Make sure we return a different error than expected for upgrades from