You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2013/06/25 18:15:06 UTC
svn commit: r1496528 - /subversion/trunk/subversion/libsvn_wc/conflicts.c
Author: stsp
Date: Tue Jun 25 16:15:06 2013
New Revision: 1496528
URL: http://svn.apache.org/r1496528
Log:
* subversion/libsvn_wc/conflicts.c
(read_prop_conflict_descs, svn_wc__read_conflicts): Put a space between
'svn_wc_conflict_description3_t' and '*'. Cosmetic change only.
Modified:
subversion/trunk/subversion/libsvn_wc/conflicts.c
Modified: subversion/trunk/subversion/libsvn_wc/conflicts.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/conflicts.c?rev=1496528&r1=1496527&r2=1496528&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_wc/conflicts.c Tue Jun 25 16:15:06 2013
@@ -2156,7 +2156,7 @@ read_prop_conflict_descs(apr_array_heade
desc->src_left_version = left_version;
desc->src_right_version = right_version;
- APR_ARRAY_PUSH(conflicts, svn_wc_conflict_description3_t*) = desc;
+ APR_ARRAY_PUSH(conflicts, svn_wc_conflict_description3_t *) = desc;
return SVN_NO_ERROR;
}
@@ -2250,7 +2250,7 @@ read_prop_conflict_descs(apr_array_heade
SVN_ERR(svn_stream_close(s));
}
- APR_ARRAY_PUSH(conflicts, svn_wc_conflict_description3_t*) = desc;
+ APR_ARRAY_PUSH(conflicts, svn_wc_conflict_description3_t *) = desc;
}
svn_pool_destroy(iterpool);
@@ -2282,7 +2282,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_description3_t*));;
+ sizeof(svn_wc_conflict_description3_t *));;
return SVN_NO_ERROR;
}
@@ -2292,7 +2292,7 @@ svn_wc__read_conflicts(const apr_array_h
result_pool, scratch_pool));
cflcts = apr_array_make(result_pool, 4,
- sizeof(svn_wc_conflict_description3_t*));
+ sizeof(svn_wc_conflict_description3_t *));
if (locations && locations->nelts > 0)
left_version = APR_ARRAY_IDX(locations, 0, const svn_wc_conflict_version_t *);
@@ -2320,7 +2320,7 @@ svn_wc__read_conflicts(const apr_array_h
FALSE /*is_binary*/, NULL /*mime_type*/,
operation, left_version, right_version,
result_pool, scratch_pool));
- APR_ARRAY_PUSH(cflcts, svn_wc_conflict_description3_t*) = desc;
+ APR_ARRAY_PUSH(cflcts, svn_wc_conflict_description3_t *) = desc;
}
if (tree_conflicted)