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 0C99817E57 for ; Sat, 17 Jan 2015 21:53:57 +0000 (UTC) Received: (qmail 18236 invoked by uid 500); 17 Jan 2015 21:53:59 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 18198 invoked by uid 500); 17 Jan 2015 21:53:59 -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 18187 invoked by uid 99); 17 Jan 2015 21:53:58 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 17 Jan 2015 21:53:58 +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 D1455AC0059; Sat, 17 Jan 2015 21:53:58 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1652680 - /subversion/trunk/subversion/libsvn_fs_x/dag.c Date: Sat, 17 Jan 2015 21:53:58 -0000 To: commits@subversion.apache.org From: stefan2@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150117215358.D1455AC0059@hades.apache.org> Author: stefan2 Date: Sat Jan 17 21:53:58 2015 New Revision: 1652680 URL: http://svn.apache.org/r1652680 Log: * subversion/libsvn_fs_x/dag.c (delete_if_mutable): svn_fs_x__dag_dir_entries can never return NULL, so don't check for it. Modified: subversion/trunk/subversion/libsvn_fs_x/dag.c Modified: subversion/trunk/subversion/libsvn_fs_x/dag.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/dag.c?rev=1652680&r1=1652679&r2=1652680&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_fs_x/dag.c (original) +++ subversion/trunk/subversion/libsvn_fs_x/dag.c Sat Jan 17 21:53:58 2015 @@ -832,15 +832,14 @@ delete_if_mutable(svn_fs_t *fs, /* Loop over directory entries */ SVN_ERR(svn_fs_x__dag_dir_entries(&entries, node, scratch_pool)); - if (entries) - for (i = 0; i < entries->nelts; ++i) - { - const svn_fs_x__id_t *noderev_id - = &APR_ARRAY_IDX(entries, i, svn_fs_x__dirent_t *)->id; + for (i = 0; i < entries->nelts; ++i) + { + const svn_fs_x__id_t *noderev_id + = &APR_ARRAY_IDX(entries, i, svn_fs_x__dirent_t *)->id; - svn_pool_clear(iterpool); - SVN_ERR(delete_if_mutable(fs, noderev_id, iterpool)); - } + svn_pool_clear(iterpool); + SVN_ERR(delete_if_mutable(fs, noderev_id, iterpool)); + } svn_pool_destroy(iterpool); }