You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ko...@apache.org on 2021/02/21 12:36:11 UTC
svn commit: r1886754 - in /subversion/trunk/subversion:
include/private/svn_io_private.h libsvn_subr/stream.c
libsvn_wc/working_file_writer.c tests/libsvn_subr/io-test.c
Author: kotkov
Date: Sun Feb 21 12:36:11 2021
New Revision: 1886754
URL: http://svn.apache.org/viewvc?rev=1886754&view=rev
Log:
A minor code cleanup.
* subversion/include/private/svn_io_private.h
(svn_stream__install_stream_set_read_only,
svn_stream__install_stream_set_executable,
svn_stream__install_stream_set_affected_time): Rename to ...
(svn_stream__install_set_read_only,
svn_stream__install_set_executable,
svn_stream__install_set_affected_time): ...this.
In other words, do not repeat "stream" twice in the function names.
* subversion/libsvn_subr/stream.c
(svn_stream__install_stream_set_read_only,
svn_stream__install_stream_set_executable,
svn_stream__install_stream_set_affected_time): Rename to ...
(svn_stream__install_set_read_only,
svn_stream__install_set_executable,
svn_stream__install_set_affected_time): ...this.
* subversion/libsvn_wc/working_file_writer.c
(svn_wc__working_file_writer_open): Update calling sites.
* subversion/tests/libsvn_subr/io-test.c
(test_install_stream_set_read_only,
test_install_stream_set_affected_time): Update calling sites.
(test_funcs): Update test descriptions.
Modified:
subversion/trunk/subversion/include/private/svn_io_private.h
subversion/trunk/subversion/libsvn_subr/stream.c
subversion/trunk/subversion/libsvn_wc/working_file_writer.c
subversion/trunk/subversion/tests/libsvn_subr/io-test.c
Modified: subversion/trunk/subversion/include/private/svn_io_private.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/private/svn_io_private.h?rev=1886754&r1=1886753&r2=1886754&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_io_private.h (original)
+++ subversion/trunk/subversion/include/private/svn_io_private.h Sun Feb 21 12:36:11 2021
@@ -105,20 +105,20 @@ svn_stream__create_for_install(svn_strea
/* Configure value of the read-only attribute that will be set when
the stream is installed. */
void
-svn_stream__install_stream_set_read_only(svn_stream_t *install_stream,
- svn_boolean_t read_only);
+svn_stream__install_set_read_only(svn_stream_t *install_stream,
+ svn_boolean_t read_only);
/* Configure value of the executable bit that will be set when the
stream is installed. */
void
-svn_stream__install_stream_set_executable(svn_stream_t *install_stream,
- svn_boolean_t executable);
+svn_stream__install_set_executable(svn_stream_t *install_stream,
+ svn_boolean_t executable);
/* Configure value of the last modification time that will be set
when the stream is installed. */
void
-svn_stream__install_stream_set_affected_time(svn_stream_t *install_stream,
- apr_time_t mtime);
+svn_stream__install_set_affected_time(svn_stream_t *install_stream,
+ apr_time_t mtime);
/* Installs a stream created with svn_stream__create_for_install in its final
location FINAL_ABSPATH, potentially using platform specific optimizations.
Modified: subversion/trunk/subversion/libsvn_subr/stream.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/stream.c?rev=1886754&r1=1886753&r2=1886754&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/stream.c (original)
+++ subversion/trunk/subversion/libsvn_subr/stream.c Sun Feb 21 12:36:11 2021
@@ -2327,8 +2327,8 @@ svn_stream__create_for_install(svn_strea
}
void
-svn_stream__install_stream_set_read_only(svn_stream_t *install_stream,
- svn_boolean_t read_only)
+svn_stream__install_set_read_only(svn_stream_t *install_stream,
+ svn_boolean_t read_only)
{
struct install_baton_t *ib = install_stream->baton;
@@ -2336,8 +2336,8 @@ svn_stream__install_stream_set_read_only
}
void
-svn_stream__install_stream_set_executable(svn_stream_t *install_stream,
- svn_boolean_t executable)
+svn_stream__install_set_executable(svn_stream_t *install_stream,
+ svn_boolean_t executable)
{
struct install_baton_t *ib = install_stream->baton;
@@ -2345,8 +2345,8 @@ svn_stream__install_stream_set_executabl
}
void
-svn_stream__install_stream_set_affected_time(svn_stream_t *install_stream,
- apr_time_t mtime)
+svn_stream__install_set_affected_time(svn_stream_t *install_stream,
+ apr_time_t mtime)
{
struct install_baton_t *ib = install_stream->baton;
Modified: subversion/trunk/subversion/libsvn_wc/working_file_writer.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/working_file_writer.c?rev=1886754&r1=1886753&r2=1886754&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/working_file_writer.c (original)
+++ subversion/trunk/subversion/libsvn_wc/working_file_writer.c Sun Feb 21 12:36:11 2021
@@ -109,11 +109,11 @@ svn_wc__working_file_writer_open(svn_wc_
result_pool, scratch_pool));
if (needs_lock && !is_added && !has_lock)
- svn_stream__install_stream_set_read_only(install_stream, TRUE);
+ svn_stream__install_set_read_only(install_stream, TRUE);
if (executable)
- svn_stream__install_stream_set_executable(install_stream, TRUE);
+ svn_stream__install_set_executable(install_stream, TRUE);
if (final_mtime >= 0)
- svn_stream__install_stream_set_affected_time(install_stream, final_mtime);
+ svn_stream__install_set_affected_time(install_stream, final_mtime);
write_stream = install_stream;
Modified: subversion/trunk/subversion/tests/libsvn_subr/io-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/io-test.c?rev=1886754&r1=1886753&r2=1886754&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_subr/io-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_subr/io-test.c Sun Feb 21 12:36:11 2021
@@ -1062,7 +1062,7 @@ test_install_stream_set_read_only(apr_po
SVN_ERR(svn_stream__create_for_install(&stream, tmp_dir, pool, pool));
SVN_ERR(svn_stream_puts(stream, "stream1 content"));
SVN_ERR(svn_stream_close(stream));
- svn_stream__install_stream_set_read_only(stream, TRUE);
+ svn_stream__install_set_read_only(stream, TRUE);
SVN_ERR(svn_stream__install_stream(stream,
final_abspath,
TRUE,
@@ -1100,7 +1100,7 @@ test_install_stream_set_affected_time(ap
SVN_ERR(svn_stream__create_for_install(&stream, tmp_dir, pool, pool));
SVN_ERR(svn_stream_puts(stream, "stream1 content"));
SVN_ERR(svn_stream_close(stream));
- svn_stream__install_stream_set_affected_time(stream, 123456789);
+ svn_stream__install_set_affected_time(stream, 123456789);
SVN_ERR(svn_stream__install_stream(stream,
final_abspath,
TRUE,
@@ -1374,9 +1374,9 @@ static struct svn_test_descriptor_t test
SVN_TEST_PASS2(test_install_stream_over_readonly_file,
"test svn_stream__install_stream over RO file"),
SVN_TEST_PASS2(test_install_stream_set_read_only,
- "test svn_stream__install_stream_set_read_only"),
+ "test svn_stream__install_set_read_only"),
SVN_TEST_PASS2(test_install_stream_set_affected_time,
- "test svn_stream__install_stream_set_affected_time"),
+ "test svn_stream__install_set_affected_time"),
SVN_TEST_PASS2(test_install_stream_get_info,
"test svn_stream__install_stream_get_info"),
SVN_TEST_PASS2(test_file_size_get,