Return-Path: Delivered-To: apmail-subversion-commits-archive@minotaur.apache.org Received: (qmail 3312 invoked from network); 25 Mar 2010 02:34:17 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 25 Mar 2010 02:34:17 -0000 Received: (qmail 55066 invoked by uid 500); 25 Mar 2010 02:34:17 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 55014 invoked by uid 500); 25 Mar 2010 02:34:17 -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 55007 invoked by uid 99); 25 Mar 2010 02:34:17 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 25 Mar 2010 02:34:17 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Thu, 25 Mar 2010 02:34:14 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id AE9892388993; Thu, 25 Mar 2010 02:33:53 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r927258 - /subversion/trunk/subversion/libsvn_wc/lock.c Date: Thu, 25 Mar 2010 02:33:53 -0000 To: commits@subversion.apache.org From: hwright@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100325023353.AE9892388993@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: hwright Date: Thu Mar 25 02:33:53 2010 New Revision: 927258 URL: http://svn.apache.org/viewvc?rev=927258&view=rev Log: * subversion/libsvn_wc/lock.c (svn_wc__adm_missing): Remove yet more unused cruft. Followup to r927176. Modified: subversion/trunk/subversion/libsvn_wc/lock.c Modified: subversion/trunk/subversion/libsvn_wc/lock.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/lock.c?rev=927258&r1=927257&r2=927258&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_wc/lock.c (original) +++ subversion/trunk/subversion/libsvn_wc/lock.c Thu Mar 25 02:33:53 2010 @@ -1551,49 +1551,6 @@ svn_wc__adm_missing(svn_wc__db_t *db, return (kind == svn_wc__db_kind_dir) && !available && obstructed; } - -/* Extend the scope of the svn_wc_adm_access_t * instances in WALK_BATON - for the entire WC tree below LOCAL_ABSPATH. - An implementation of svn_wc__node_found_func_t */ -static svn_error_t * -extend_lock_cb(const char *local_abspath, - void *walk_baton, - apr_pool_t *scratch_pool) -{ - svn_wc__db_t *db = walk_baton; - svn_wc__db_kind_t kind; - svn_wc_adm_access_t *parent_access, *adm_access; - const char *parent_abspath, *base; - - SVN_ERR(svn_wc__db_read_kind(&kind, db, local_abspath, FALSE, scratch_pool)); - - if (kind != svn_wc__db_kind_dir) - return SVN_NO_ERROR; - - if (NULL != svn_wc__adm_retrieve_internal2(db, local_abspath, scratch_pool)) - return SVN_NO_ERROR; - - svn_dirent_split(local_abspath, &parent_abspath, &base, scratch_pool); - - parent_access = svn_wc__adm_retrieve_internal2(db, parent_abspath, - scratch_pool); - - /* We are EXTENDING the lock, so we must have the parent locked */ - SVN_ERR_ASSERT(parent_access != NULL); - - /* Open the child baton in the same pool as the parent, because it - would be closed directly if we would open it in the scratch - pool. And this way it is always cleaned up with the parent. */ - SVN_ERR(svn_wc_adm_open3(&adm_access, parent_access, - svn_dirent_join( - svn_wc_adm_access_path(parent_access), - base, scratch_pool), - TRUE, -1, NULL, NULL, - svn_wc_adm_access_pool(parent_access))); - - return SVN_NO_ERROR; -} - svn_error_t * svn_wc__adm_open_in_context(svn_wc_adm_access_t **adm_access, svn_wc_context_t *wc_ctx,