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 2E559102AE for ; Tue, 29 Apr 2014 16:21:03 +0000 (UTC) Received: (qmail 43840 invoked by uid 500); 29 Apr 2014 16:21:01 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 43785 invoked by uid 500); 29 Apr 2014 16:21:00 -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 43760 invoked by uid 99); 29 Apr 2014 16:20:58 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 29 Apr 2014 16:20:58 +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, 29 Apr 2014 16:20:57 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 9CB5A23888E4; Tue, 29 Apr 2014 16:20:37 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1591016 - in /subversion/trunk/subversion: include/private/svn_subr_private.h libsvn_subr/config.c svn/svn.c svnmucc/svnmucc.c Date: Tue, 29 Apr 2014 16:20:37 -0000 To: commits@subversion.apache.org From: philip@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140429162037.9CB5A23888E4@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: philip Date: Tue Apr 29 16:20:36 2014 New Revision: 1591016 URL: http://svn.apache.org/r1591016 Log: Fix a thinko. * subversion/include/private/svn_subr_private.h * subversion/libsvn_subr/config.c (svn_config__get_default_config): Change return type. * subversion/svn/svn.c * subversion/svnmucc/svnmucc.c (sub_main): Handle return type. Modified: subversion/trunk/subversion/include/private/svn_subr_private.h subversion/trunk/subversion/libsvn_subr/config.c subversion/trunk/subversion/svn/svn.c subversion/trunk/subversion/svnmucc/svnmucc.c Modified: subversion/trunk/subversion/include/private/svn_subr_private.h URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/private/svn_subr_private.h?rev=1591016&r1=1591015&r2=1591016&view=diff ============================================================================== --- subversion/trunk/subversion/include/private/svn_subr_private.h (original) +++ subversion/trunk/subversion/include/private/svn_subr_private.h Tue Apr 29 16:20:36 2014 @@ -614,7 +614,7 @@ svn_config__shallow_replace_section(svn_ * This returns a hash equivalent to svn_config_get_config when the * config files are empty. */ -void +svn_error_t * svn_config__get_default_config(apr_hash_t **cfg_hash, apr_pool_t *pool); Modified: subversion/trunk/subversion/libsvn_subr/config.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/config.c?rev=1591016&r1=1591015&r2=1591016&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_subr/config.c (original) +++ subversion/trunk/subversion/libsvn_subr/config.c Tue Apr 29 16:20:36 2014 @@ -307,7 +307,7 @@ svn_config_get_config(apr_hash_t **cfg_h return SVN_NO_ERROR; } -void +svn_error_t * svn_config__get_default_config(apr_hash_t **cfg_hash, apr_pool_t *pool) { @@ -319,6 +319,8 @@ svn_config__get_default_config(apr_hash_ SVN_ERR(svn_config_create2(&empty_cfg, FALSE, FALSE, pool)); svn_hash_sets(*cfg_hash, SVN_CONFIG_CATEGORY_SERVERS, empty_cfg); + + return SVN_NO_ERROR; } Modified: subversion/trunk/subversion/svn/svn.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/svn.c?rev=1591016&r1=1591015&r2=1591016&view=diff ============================================================================== --- subversion/trunk/subversion/svn/svn.c (original) +++ subversion/trunk/subversion/svn/svn.c Tue Apr 29 16:20:36 2014 @@ -2595,7 +2595,7 @@ sub_main(int *exit_code, int argc, const svn_handle_warning2(stderr, err, "svn: "); svn_error_clear(err); - svn_config__get_default_config(&cfg_hash, pool); + SVN_ERR(svn_config__get_default_config(&cfg_hash, pool)); } else return err; Modified: subversion/trunk/subversion/svnmucc/svnmucc.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnmucc/svnmucc.c?rev=1591016&r1=1591015&r2=1591016&view=diff ============================================================================== --- subversion/trunk/subversion/svnmucc/svnmucc.c (original) +++ subversion/trunk/subversion/svnmucc/svnmucc.c Tue Apr 29 16:20:36 2014 @@ -642,7 +642,7 @@ sub_main(int *exit_code, int argc, const svn_handle_warning2(stderr, err, "svnmucc: "); svn_error_clear(err); - svn_config__get_default_config(&cfg_hash, pool); + SVN_ERR(svn_config__get_default_config(&cfg_hash, pool)); } else return err;