You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2015/01/27 13:57:24 UTC
svn commit: r1655030 - in /subversion/trunk/subversion:
libsvn_client/deprecated.c libsvn_client/mergeinfo.c libsvn_subr/stream.c
libsvn_wc/conflicts.c libsvn_wc/merge.c svnmucc/svnmucc.c
Author: rhuijben
Date: Tue Jan 27 12:57:23 2015
New Revision: 1655030
URL: http://svn.apache.org/r1655030
Log:
Remove a few ';;' instances from our code.
No functional changes.
* subversion/libsvn_client/deprecated.c
(svn_client_uuid_from_url):
* subversion/libsvn_client/mergeinfo.c
(svn_client__mergeinfo_log):
* subversion/libsvn_subr/stream.c
(create_tempfile):
* subversion/libsvn_wc/conflicts.c
(svn_wc__read_conflicts):
* subversion/libsvn_wc/merge.c
(detranslate_wc_file):
* subversion/svnmucc/svnmucc.c
(execute): Remove duplicated ';'.
Modified:
subversion/trunk/subversion/libsvn_client/deprecated.c
subversion/trunk/subversion/libsvn_client/mergeinfo.c
subversion/trunk/subversion/libsvn_subr/stream.c
subversion/trunk/subversion/libsvn_wc/conflicts.c
subversion/trunk/subversion/libsvn_wc/merge.c
subversion/trunk/subversion/svnmucc/svnmucc.c
Modified: subversion/trunk/subversion/libsvn_client/deprecated.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/deprecated.c?rev=1655030&r1=1655029&r2=1655030&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/deprecated.c (original)
+++ subversion/trunk/subversion/libsvn_client/deprecated.c Tue Jan 27 12:57:23 2015
@@ -2862,7 +2862,7 @@ svn_client_uuid_from_url(const char **uu
/* destroy the RA session */
svn_pool_destroy(subpool);
- return svn_error_trace(err);;
+ return svn_error_trace(err);
}
svn_error_t *
Modified: subversion/trunk/subversion/libsvn_client/mergeinfo.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/mergeinfo.c?rev=1655030&r1=1655029&r2=1655030&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/mergeinfo.c (original)
+++ subversion/trunk/subversion/libsvn_client/mergeinfo.c Tue Jan 27 12:57:23 2015
@@ -2130,7 +2130,7 @@ svn_client__mergeinfo_log(svn_boolean_t
svn_rangelist__initialize(youngest_range->end - 1,
youngest_range->end,
youngest_range->inheritable,
- scratch_pool);;
+ scratch_pool);
for (hi = apr_hash_first(scratch_pool, source_history);
hi;
Modified: subversion/trunk/subversion/libsvn_subr/stream.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/stream.c?rev=1655030&r1=1655029&r2=1655030&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/stream.c (original)
+++ subversion/trunk/subversion/libsvn_subr/stream.c Tue Jan 27 12:57:23 2015
@@ -2071,7 +2071,7 @@ create_tempfile(HANDLE *hFile,
if (h == INVALID_HANDLE_VALUE)
{
- apr_status_t status = apr_get_os_error();;
+ apr_status_t status = apr_get_os_error();
if (i > 1000)
return svn_error_createf(SVN_ERR_IO_UNIQUE_NAMES_EXHAUSTED,
svn_error_wrap_apr(status, NULL),
Modified: subversion/trunk/subversion/libsvn_wc/conflicts.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/conflicts.c?rev=1655030&r1=1655029&r2=1655030&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_wc/conflicts.c Tue Jan 27 12:57:23 2015
@@ -2240,7 +2240,7 @@ svn_wc__read_conflicts(const apr_array_h
{
/* Some callers expect not NULL */
*conflicts = apr_array_make(result_pool, 0,
- sizeof(svn_wc_conflict_description2_t *));;
+ sizeof(svn_wc_conflict_description2_t *));
return SVN_NO_ERROR;
}
Modified: subversion/trunk/subversion/libsvn_wc/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/merge.c?rev=1655030&r1=1655029&r2=1655030&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/merge.c (original)
+++ subversion/trunk/subversion/libsvn_wc/merge.c Tue Jan 27 12:57:23 2015
@@ -180,7 +180,7 @@ detranslate_wc_file(const char **detrans
= prop ? (prop->value ? prop->value->data : NULL) : old_mime_value;
old_is_binary = old_mime_value && svn_mime_type_is_binary(old_mime_value);
- new_is_binary = new_mime_value && svn_mime_type_is_binary(new_mime_value);;
+ new_is_binary = new_mime_value && svn_mime_type_is_binary(new_mime_value);
}
/* See what translations we want to do */
Modified: subversion/trunk/subversion/svnmucc/svnmucc.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnmucc/svnmucc.c?rev=1655030&r1=1655029&r2=1655030&view=diff
==============================================================================
--- subversion/trunk/subversion/svnmucc/svnmucc.c (original)
+++ subversion/trunk/subversion/svnmucc/svnmucc.c Tue Jan 27 12:57:23 2015
@@ -222,7 +222,7 @@ execute(const apr_array_header_t *action
mtcc, iterpool);
svn_pool_destroy(iterpool);
- return svn_error_trace(err);;
+ return svn_error_trace(err);
}
static svn_error_t *