You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by cm...@apache.org on 2013/03/21 16:14:13 UTC
svn commit: r1459352 - in /subversion/trunk: subversion/include/
subversion/include/private/ subversion/svnadmin/ subversion/svndumpfilter/
subversion/svnserve/ subversion/svnversion/ subversion/tests/
tools/dev/svnraisetreeconflict/ tools/server-side/
Author: cmpilato
Date: Thu Mar 21 15:14:13 2013
New Revision: 1459352
URL: http://svn.apache.org/r1459352
Log:
Move some private functions prototypes into the associated private
header files.
* subversion/include/private/svn_cmdline_private.h
(svn_cmdline__getopt_init, svn_cmdline__be_interactive): Move
here...
* subversion/include/svn_cmdline.h
...from here.
* subversion/svnadmin/svnadmin.c,
* subversion/svndumpfilter/svndumpfilter.c,
* subversion/svnserve/svnserve.c,
* subversion/svnversion/svnversion.c,
* subversion/tests/svn_test_main.c,
* tools/dev/svnraisetreeconflict/svnraisetreeconflict.c,
* tools/server-side/svn-rep-sharing-stats.c,
* tools/server-side/svnauthz.c
Now #include svn_cmdline_private.h, too.
Modified:
subversion/trunk/subversion/include/private/svn_cmdline_private.h
subversion/trunk/subversion/include/svn_cmdline.h
subversion/trunk/subversion/svnadmin/svnadmin.c
subversion/trunk/subversion/svndumpfilter/svndumpfilter.c
subversion/trunk/subversion/svnserve/svnserve.c
subversion/trunk/subversion/svnversion/svnversion.c
subversion/trunk/subversion/tests/svn_test_main.c
subversion/trunk/tools/dev/svnraisetreeconflict/svnraisetreeconflict.c
subversion/trunk/tools/server-side/svn-rep-sharing-stats.c
subversion/trunk/tools/server-side/svnauthz.c
Modified: subversion/trunk/subversion/include/private/svn_cmdline_private.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/private/svn_cmdline_private.h?rev=1459352&r1=1459351&r2=1459352&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_cmdline_private.h (original)
+++ subversion/trunk/subversion/include/private/svn_cmdline_private.h Thu Mar 21 15:14:13 2013
@@ -199,6 +199,28 @@ svn_cmdline__edit_string_externally(svn_
apr_pool_t *pool);
+/** Wrapper for apr_getopt_init(), which see.
+ *
+ * @since New in 1.4.
+ */
+svn_error_t *
+svn_cmdline__getopt_init(apr_getopt_t **os,
+ int argc,
+ const char *argv[],
+ apr_pool_t *pool);
+
+/* Determine whether interactive mode should be enabled, based on whether
+ * the user passed the --non-interactive or --force-interactive options.
+ * If neither option was passed, interactivity is enabled if standard
+ * input is connected to a terminal device.
+ *
+ * @since New in 1.8.
+ */
+svn_boolean_t
+svn_cmdline__be_interactive(svn_boolean_t non_interactive,
+ svn_boolean_t force_interactive);
+
+
#ifdef __cplusplus
}
#endif /* __cplusplus */
Modified: subversion/trunk/subversion/include/svn_cmdline.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_cmdline.h?rev=1459352&r1=1459351&r2=1459352&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_cmdline.h (original)
+++ subversion/trunk/subversion/include/svn_cmdline.h Thu Mar 21 15:14:13 2013
@@ -369,27 +369,6 @@ svn_cmdline_setup_auth_baton(svn_auth_ba
void *cancel_baton,
apr_pool_t *pool);
-/** Wrapper for apr_getopt_init(), which see.
- *
- * @since New in 1.4.
- *
- * This is a private API for Subversion's own use.
- */
-svn_error_t *
-svn_cmdline__getopt_init(apr_getopt_t **os,
- int argc,
- const char *argv[],
- apr_pool_t *pool);
-
-/* Determine whether interactive mode should be enabled, based on whether
- * the user passed the --non-interactive or --force-interactive options.
- * If neither option was passed, interactivity is enabled if standard
- * input is connected to a terminal device.
- * @since New in 1.8. */
-svn_boolean_t
-svn_cmdline__be_interactive(svn_boolean_t non_interactive,
- svn_boolean_t force_interactive);
-
#ifdef __cplusplus
}
#endif /* __cplusplus */
Modified: subversion/trunk/subversion/svnadmin/svnadmin.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnadmin/svnadmin.c?rev=1459352&r1=1459351&r2=1459352&view=diff
==============================================================================
--- subversion/trunk/subversion/svnadmin/svnadmin.c (original)
+++ subversion/trunk/subversion/svnadmin/svnadmin.c Thu Mar 21 15:14:13 2013
@@ -44,6 +44,7 @@
#include "private/svn_opt_private.h"
#include "private/svn_subr_private.h"
+#include "private/svn_cmdline_private.h"
#include "svn_private_config.h"
Modified: subversion/trunk/subversion/svndumpfilter/svndumpfilter.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svndumpfilter/svndumpfilter.c?rev=1459352&r1=1459351&r2=1459352&view=diff
==============================================================================
--- subversion/trunk/subversion/svndumpfilter/svndumpfilter.c (original)
+++ subversion/trunk/subversion/svndumpfilter/svndumpfilter.c Thu Mar 21 15:14:13 2013
@@ -44,6 +44,7 @@
#include "svn_version.h"
#include "private/svn_mergeinfo_private.h"
+#include "private/svn_cmdline_private.h"
#ifdef _WIN32
typedef apr_status_t (__stdcall *open_fn_t)(apr_file_t **, apr_pool_t *);
Modified: subversion/trunk/subversion/svnserve/svnserve.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnserve/svnserve.c?rev=1459352&r1=1459351&r2=1459352&view=diff
==============================================================================
--- subversion/trunk/subversion/svnserve/svnserve.c (original)
+++ subversion/trunk/subversion/svnserve/svnserve.c Thu Mar 21 15:14:13 2013
@@ -50,7 +50,10 @@
#include "svn_io.h"
#include "svn_private_config.h"
+
#include "private/svn_dep_compat.h"
+#include "private/svn_cmdline_private.h"
+
#include "winservice.h"
#ifdef HAVE_UNISTD_H
Modified: subversion/trunk/subversion/svnversion/svnversion.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnversion/svnversion.c?rev=1459352&r1=1459351&r2=1459352&view=diff
==============================================================================
--- subversion/trunk/subversion/svnversion/svnversion.c (original)
+++ subversion/trunk/subversion/svnversion/svnversion.c Thu Mar 21 15:14:13 2013
@@ -28,6 +28,7 @@
#include "svn_version.h"
#include "private/svn_opt_private.h"
+#include "private/svn_cmdline_private.h"
#include "svn_private_config.h"
Modified: subversion/trunk/subversion/tests/svn_test_main.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/svn_test_main.c?rev=1459352&r1=1459351&r2=1459352&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/svn_test_main.c (original)
+++ subversion/trunk/subversion/tests/svn_test_main.c Thu Mar 21 15:14:13 2013
@@ -44,8 +44,10 @@
#include "svn_io.h"
#include "svn_path.h"
#include "svn_ctype.h"
-#include "svn_private_config.h"
+#include "private/svn_cmdline_private.h"
+
+#include "svn_private_config.h"
/* Some Subversion test programs may want to parse options in the
argument list, so we remember it here. */
Modified: subversion/trunk/tools/dev/svnraisetreeconflict/svnraisetreeconflict.c
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dev/svnraisetreeconflict/svnraisetreeconflict.c?rev=1459352&r1=1459351&r2=1459352&view=diff
==============================================================================
--- subversion/trunk/tools/dev/svnraisetreeconflict/svnraisetreeconflict.c (original)
+++ subversion/trunk/tools/dev/svnraisetreeconflict/svnraisetreeconflict.c Thu Mar 21 15:14:13 2013
@@ -43,6 +43,7 @@
#include "svn_version.h"
#include "private/svn_wc_private.h"
+#include "private/svn_cmdline_private.h"
#include "svn_private_config.h"
Modified: subversion/trunk/tools/server-side/svn-rep-sharing-stats.c
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/server-side/svn-rep-sharing-stats.c?rev=1459352&r1=1459351&r2=1459352&view=diff
==============================================================================
--- subversion/trunk/tools/server-side/svn-rep-sharing-stats.c (original)
+++ subversion/trunk/tools/server-side/svn-rep-sharing-stats.c Thu Mar 21 15:14:13 2013
@@ -34,6 +34,8 @@
/* for svn_fs_fs__id_* (used in assertions only) */
#include "../../subversion/libsvn_fs_fs/id.h"
+#include "private/svn_cmdline_private.h"
+
#include "svn_private_config.h"
Modified: subversion/trunk/tools/server-side/svnauthz.c
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/server-side/svnauthz.c?rev=1459352&r1=1459351&r2=1459352&view=diff
==============================================================================
--- subversion/trunk/tools/server-side/svnauthz.c (original)
+++ subversion/trunk/tools/server-side/svnauthz.c Thu Mar 21 15:14:13 2013
@@ -28,7 +28,9 @@
#include "svn_repos.h"
#include "svn_utf.h"
#include "svn_path.h"
+
#include "private/svn_fspath.h"
+#include "private/svn_cmdline_private.h"
/*** Option Processing. ***/