Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-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 983BF7319 for ; Thu, 6 Oct 2011 11:05:10 +0000 (UTC) Received: (qmail 83509 invoked by uid 500); 6 Oct 2011 11:05:10 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 83449 invoked by uid 500); 6 Oct 2011 11:05:09 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 83442 invoked by uid 99); 6 Oct 2011 11:05:09 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Oct 2011 11:05:09 +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.114] (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Oct 2011 11:05:08 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id B24D654E2C; Thu, 6 Oct 2011 11:04:47 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: rnewson@apache.org To: commits@couchdb.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [1/2] git commit: fix shadowing warning. Message-Id: <20111006110447.B24D654E2C@tyr.zones.apache.org> Date: Thu, 6 Oct 2011 11:04:47 +0000 (UTC) Updated Branches: refs/heads/1.1.x e6c0fc955 -> 4818fdd32 fix shadowing warning. Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/4818fdd3 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/4818fdd3 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/4818fdd3 Branch: refs/heads/1.1.x Commit: 4818fdd3269a3082a193ec69f4e8e39d95c15e86 Parents: 5b558c8 Author: Robert Newson Authored: Thu Oct 6 10:46:04 2011 +0100 Committer: Robert Newson Committed: Thu Oct 6 10:46:04 2011 +0100 ---------------------------------------------------------------------- src/couchdb/couch_doc.erl | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/4818fdd3/src/couchdb/couch_doc.erl ---------------------------------------------------------------------- diff --git a/src/couchdb/couch_doc.erl b/src/couchdb/couch_doc.erl index 01e9283..f55e951 100644 --- a/src/couchdb/couch_doc.erl +++ b/src/couchdb/couch_doc.erl @@ -313,7 +313,7 @@ max_seq(Tree, UpdateSeq) -> end, couch_key_tree:fold(FoldFun, UpdateSeq, Tree). -to_doc_info_path(#full_doc_info{id=Id,rev_tree=Tree,update_seq=Seq}) -> +to_doc_info_path(#full_doc_info{id=Id,rev_tree=Tree,update_seq=Seq0}) -> RevInfosAndPath = [{#rev_info{deleted=Del,body_sp=Bp,seq=Seq,rev={Pos,RevId}}, Path} || {{Del, Bp, Seq},{Pos, [RevId|_]}=Path} <- @@ -326,7 +326,7 @@ to_doc_info_path(#full_doc_info{id=Id,rev_tree=Tree,update_seq=Seq}) -> end, RevInfosAndPath), [{_RevInfo, WinPath}|_] = SortedRevInfosAndPath, RevInfos = [RevInfo || {RevInfo, _Path} <- SortedRevInfosAndPath], - {#doc_info{id=Id, high_seq=max_seq(Tree, Seq), revs=RevInfos}, WinPath}. + {#doc_info{id=Id, high_seq=max_seq(Tree, Seq0), revs=RevInfos}, WinPath}.