Author: danielsh
Date: Tue May 17 12:56:46 2011
New Revision: 1104211
URL: http://svn.apache.org/viewvc?rev=1104211&view=rev
Log:
Follow-ups to r1104192:
* subversion/libsvn_wc/wc.h
(SVN_WC__NON_ENTRIES, SVN_WC__NON_ENTRIES_STRING):
Bump to 12, which is the correct value.
* subversion/libsvn_wc/workqueue.c
(run_postupgrade): Correctly compute the length of a static string.
Found by: gstein
Modified:
subversion/trunk/subversion/libsvn_wc/wc.h
subversion/trunk/subversion/libsvn_wc/workqueue.c
Modified: subversion/trunk/subversion/libsvn_wc/wc.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc.h?rev=1104211&r1=1104210&r2=1104211&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc.h (original)
+++ subversion/trunk/subversion/libsvn_wc/wc.h Tue May 17 12:56:46 2011
@@ -168,8 +168,8 @@ extern "C" {
/* The format number written to wc-ng working copies so that old clients
can recognize them as "newer Subversion"'s working copies. */
-#define SVN_WC__NON_ENTRIES 11
-#define SVN_WC__NON_ENTRIES_STRING "11\n"
+#define SVN_WC__NON_ENTRIES 12
+#define SVN_WC__NON_ENTRIES_STRING "12\n"
/* A version < this uses the old 'entries' file mechanism. */
#define SVN_WC__WC_NG_VERSION 12
Modified: subversion/trunk/subversion/libsvn_wc/workqueue.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/workqueue.c?rev=1104211&r1=1104210&r2=1104211&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/workqueue.c (original)
+++ subversion/trunk/subversion/libsvn_wc/workqueue.c Tue May 17 12:56:46 2011
@@ -586,12 +586,12 @@ run_postupgrade(svn_wc__db_t *db,
this code only runs during upgrade after the files had been
removed earlier during the upgrade. */
SVN_ERR(svn_io_write_unique(&temp_path, adm_path, SVN_WC__NON_ENTRIES_STRING,
- sizeof(SVN_WC__NON_ENTRIES),
+ sizeof(SVN_WC__NON_ENTRIES_STRING),
svn_io_file_del_none, scratch_pool));
SVN_ERR(svn_io_file_rename(temp_path, format_path, scratch_pool));
SVN_ERR(svn_io_write_unique(&temp_path, adm_path, SVN_WC__NON_ENTRIES_STRING,
- sizeof(SVN_WC__NON_ENTRIES),
+ sizeof(SVN_WC__NON_ENTRIES_STRING),
svn_io_file_del_none, scratch_pool));
SVN_ERR(svn_io_file_rename(temp_path, entries_path, scratch_pool));
