Thank you!! On Mar 9, 2011 10:51 AM, <hwri...@apache.org> wrote: > Author: hwright > Date: Wed Mar 9 15:51:16 2011 > New Revision: 1079855 > > URL: http://svn.apache.org/viewvc?rev=1079855&view=rev > Log: > Remove an unused function in the wc_db API. Not only is this function unused, > but it also exposes a bit too much of the wc_db internals to the outside > library for my liking. > > * subversion/libsvn_wc/wc_db.c > (with_sqlite_lock_baton, call_sqlite_lock_db, svn_wc__db_with_sqlite_lock): > Remove. > > * subversion/libsvn_wc/wc_db.h > (svn_wc__db_sqlite_lock_cb, svn_wc__db_with_sqlite_lock): Remove. > > Modified: > subversion/trunk/subversion/libsvn_wc/wc_db.c > subversion/trunk/subversion/libsvn_wc/wc_db.h > > Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c > URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=1079855&r1=1079854&r2=1079855&view=diff > ============================================================================== > --- subversion/trunk/subversion/libsvn_wc/wc_db.c (original) > +++ subversion/trunk/subversion/libsvn_wc/wc_db.c Wed Mar 9 15:51:16 2011 > @@ -1400,61 +1400,6 @@ svn_wc__db_get_wcroot(const char **wcroo > } > > > -struct with_sqlite_lock_baton > -{ > - svn_wc__db_t *db; > - svn_wc__db_sqlite_lock_cb lock_cb; > - void *lock_baton; > -}; > - > - > -static svn_error_t * > -call_sqlite_lock_cb(void *baton, > - svn_sqlite__db_t *sdb, > - apr_pool_t *scratch_pool) > -{ > - struct with_sqlite_lock_baton *lb = baton; > - > - return svn_error_return(lb->lock_cb(lb->db, lb->lock_baton, scratch_pool)); > -} > - > - > -svn_error_t * > -svn_wc__db_with_sqlite_lock(svn_wc__db_t *db, > - const char *wri_abspath, > - svn_wc__db_sqlite_lock_cb lock_cb, > - void *cb_baton, > - apr_pool_t *scratch_pool) > -{ > - svn_wc__db_wcroot_t *wcroot; > - const char *unused_relpath; > - struct with_sqlite_lock_baton baton; > - > - SVN_ERR(svn_wc__db_wcroot_parse_local_abspath(&wcroot, &unused_relpath, db, > - wri_abspath, svn_sqlite__mode_readonly, > - scratch_pool, scratch_pool)); > - > - /* Can't use VERIFY_USABLE_WCROOT, as this should be usable to detect > - where call upgrade */ > - > - if (wcroot == NULL || !wcroot->sdb) > - return svn_error_createf(SVN_ERR_WC_NOT_WORKING_COPY, NULL, > - _("The node '%s' is not in a workingcopy."), > - svn_dirent_local_style(wri_abspath, > - scratch_pool)); > - > - baton.db = db; > - baton.lock_cb = lock_cb; > - baton.lock_baton = cb_baton; > - > - return svn_error_return( > - svn_sqlite__with_lock(wcroot->sdb, > - call_sqlite_lock_cb, > - &baton, > - scratch_pool)); > -} > - > - > svn_error_t * > svn_wc__db_base_add_directory(svn_wc__db_t *db, > const char *local_abspath, > > Modified: subversion/trunk/subversion/libsvn_wc/wc_db.h > URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.h?rev=1079855&r1=1079854&r2=1079855&view=diff > ============================================================================== > --- subversion/trunk/subversion/libsvn_wc/wc_db.h (original) > +++ subversion/trunk/subversion/libsvn_wc/wc_db.h Wed Mar 9 15:51:16 2011 > @@ -391,24 +391,6 @@ svn_wc__db_get_wcroot(const char **wcroo > apr_pool_t *result_pool, > apr_pool_t *scratch_pool); > > -typedef svn_error_t * (*svn_wc__db_sqlite_lock_cb)(svn_wc__db_t *db, > - void *baton, > - apr_pool_t *scratch_pool); > - > -/* Obtain a sqlite lock to efficiently use the working copy database for > - WRI_ABSPATH and call LOCK_CB with CB_BATON while this lock exist. > - > - On returning from this function all operations will be committed, but > - operations might have been committed before returning from this function. > - > - ### See svn_sqlite__with_lock() for more details. > - */ > -svn_error_t * > -svn_wc__db_with_sqlite_lock(svn_wc__db_t *db, > - const char *wri_abspath, > - svn_wc__db_sqlite_lock_cb lock_cb, > - void *cb_baton, > - apr_pool_t *scratch_pool); > > /* @} */ > > >
