You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2010/05/19 23:01:24 UTC
svn commit: r946392 - in /subversion/trunk/subversion/libsvn_wc: wc_db.c
wc_db_pdh.c wc_db_pdh.h wc_db_private.h wc_db_util.c wc_db_util.h
Author: hwright
Date: Wed May 19 21:01:23 2010
New Revision: 946392
URL: http://svn.apache.org/viewvc?rev=946392&view=rev
Log:
Combine two headers for simplicity.
Suggested by: gstein
* subversion/libsvn_wc/wc_db_pdh.c,
subversion/libsvn_wc/wc_db.c,
subversion/libsvn_wc/wc_db_util.c:
Update header references.
* subversion/libsvn_wc/wc_db_private.h:
Copied from wc_db_pdh.h, and...
(svn_wc__db_util_fetch_wc_id, svn_wc__db_util_open_db): ...copied from
wc_db_util.h.
* subversion/libsvn_wc/wc_db_pdh.h:
Copied to wc_db_private.h.
* subversion/libsvn_wc/wc_db_util.h:
Removed, content moved to wc_db_private.h.
Added:
subversion/trunk/subversion/libsvn_wc/wc_db_private.h
- copied, changed from r946383, subversion/trunk/subversion/libsvn_wc/wc_db_pdh.h
Removed:
subversion/trunk/subversion/libsvn_wc/wc_db_pdh.h
subversion/trunk/subversion/libsvn_wc/wc_db_util.h
Modified:
subversion/trunk/subversion/libsvn_wc/wc_db.c
subversion/trunk/subversion/libsvn_wc/wc_db_pdh.c
subversion/trunk/subversion/libsvn_wc/wc_db_util.c
Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=946392&r1=946391&r2=946392&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Wed May 19 21:01:23 2010
@@ -42,8 +42,7 @@
#include "entries.h"
#include "lock.h"
#include "tree_conflicts.h"
-#include "wc_db_pdh.h"
-#include "wc_db_util.h"
+#include "wc_db_private.h"
#include "workqueue.h"
#include "svn_private_config.h"
Modified: subversion/trunk/subversion/libsvn_wc/wc_db_pdh.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db_pdh.c?rev=946392&r1=946391&r2=946392&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db_pdh.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db_pdh.c Wed May 19 21:01:23 2010
@@ -29,8 +29,7 @@
#include "wc.h"
#include "adm_files.h"
-#include "wc_db_pdh.h"
-#include "wc_db_util.h"
+#include "wc_db_private.h"
#include "wc-queries.h"
#include "svn_private_config.h"
Copied: subversion/trunk/subversion/libsvn_wc/wc_db_private.h (from r946383, subversion/trunk/subversion/libsvn_wc/wc_db_pdh.h)
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db_private.h?p2=subversion/trunk/subversion/libsvn_wc/wc_db_private.h&p1=subversion/trunk/subversion/libsvn_wc/wc_db_pdh.h&r1=946383&r2=946392&rev=946392&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db_pdh.h (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db_private.h Wed May 19 21:01:23 2010
@@ -161,4 +161,20 @@ const char *
svn_wc__db_pdh_compute_relpath(const svn_wc__db_pdh_t *pdh,
apr_pool_t *result_pool);
+/* */
+svn_error_t *
+svn_wc__db_util_fetch_wc_id(apr_int64_t *wc_id,
+ svn_sqlite__db_t *sdb,
+ apr_pool_t *scratch_pool);
+
+/* */
+svn_error_t *
+svn_wc__db_util_open_db(svn_sqlite__db_t **sdb,
+ const char *dir_abspath,
+ const char *sdb_fname,
+ svn_sqlite__mode_t smode,
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool);
+
+
#endif /* WC_DB_PDH_H */
Modified: subversion/trunk/subversion/libsvn_wc/wc_db_util.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db_util.c?rev=946392&r1=946391&r2=946392&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db_util.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db_util.c Wed May 19 21:01:23 2010
@@ -41,7 +41,7 @@
#include "wc.h"
#include "adm_files.h"
-#include "wc_db_util.h"
+#include "wc_db_private.h"
#include "wc-queries.h"
#include "svn_private_config.h"