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 C92E69099 for ; Fri, 13 Jan 2012 10:15:28 +0000 (UTC) Received: (qmail 86952 invoked by uid 500); 13 Jan 2012 09:45:37 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 86877 invoked by uid 500); 13 Jan 2012 09:45:08 -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 86833 invoked by uid 99); 13 Jan 2012 09:45:04 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 13 Jan 2012 09:45:04 +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; Fri, 13 Jan 2012 09:45:02 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id DF8CB238897D for ; Fri, 13 Jan 2012 09:44:41 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1230969 - /subversion/trunk/subversion/libsvn_delta/compat.c Date: Fri, 13 Jan 2012 09:44:41 -0000 To: commits@subversion.apache.org From: philip@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120113094441.DF8CB238897D@eris.apache.org> Author: philip Date: Fri Jan 13 09:44:41 2012 New Revision: 1230969 URL: http://svn.apache.org/viewvc?rev=1230969&view=rev Log: Avoid a compiler warning about shadowing. * subversion/libsvn_delta/compat.c (ev2_add_directory, ev2_open_directory, ev2_open_file): Rename variable. Modified: subversion/trunk/subversion/libsvn_delta/compat.c Modified: subversion/trunk/subversion/libsvn_delta/compat.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_delta/compat.c?rev=1230969&r1=1230968&r2=1230969&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_delta/compat.c (original) +++ subversion/trunk/subversion/libsvn_delta/compat.c Fri Jan 13 09:44:41 2012 @@ -498,9 +498,9 @@ ev2_add_directory(const char *path, if (pb->copyfrom_path) { - const char *basename = svn_relpath_basename(path, result_pool); + const char *name = svn_relpath_basename(path, result_pool); cb->copyfrom_path = apr_pstrcat(result_pool, pb->copyfrom_path, - "/", basename, NULL); + "/", name, NULL); cb->copyfrom_rev = pb->copyfrom_rev; } } @@ -537,10 +537,10 @@ ev2_open_directory(const char *path, if (pb->copyfrom_path) { /* We are inside a copy. */ - const char *basename = svn_relpath_basename(path, result_pool); + const char *name = svn_relpath_basename(path, result_pool); db->copyfrom_path = apr_pstrcat(result_pool, pb->copyfrom_path, - "/", basename, NULL); + "/", name, NULL); db->copyfrom_rev = pb->copyfrom_rev; } @@ -650,9 +650,9 @@ ev2_open_file(const char *path, { /* We're in a copied directory, so the delta base is going to be based up on the copy source. */ - const char *basename = svn_relpath_basename(path, result_pool); + const char *name = svn_relpath_basename(path, result_pool); const char *copyfrom_path = apr_pstrcat(result_pool, pb->copyfrom_path, - "/", basename, NULL); + "/", name, NULL); SVN_ERR(fb->eb->fetch_base_func(&fb->delta_base, fb->eb->fetch_base_baton,