You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2012/10/10 02:10:45 UTC
svn commit: r1396432 - /subversion/trunk/subversion/svn/file-merge.c
Author: hwright
Date: Wed Oct 10 00:10:45 2012
New Revision: 1396432
URL: http://svn.apache.org/viewvc?rev=1396432&view=rev
Log:
* subversion/svn/file-merge.c
(prepare_line_for_display): Eliminate integer size mismatch warning.
Modified:
subversion/trunk/subversion/svn/file-merge.c
Modified: subversion/trunk/subversion/svn/file-merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/file-merge.c?rev=1396432&r1=1396431&r2=1396432&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/file-merge.c (original)
+++ subversion/trunk/subversion/svn/file-merge.c Wed Oct 10 00:10:45 2012
@@ -365,7 +365,7 @@ static const char *
prepare_line_for_display(const char *line, apr_pool_t *pool)
{
svn_stringbuf_t *buf = svn_stringbuf_create(line, pool);
- int width;
+ size_t width;
int line_width = LINE_DISPLAY_WIDTH;
apr_pool_t *iterpool;
Re: svn commit: r1396432 - /subversion/trunk/subversion/svn/file-merge.c
Posted by Ivan Zhakov <iv...@visualsvn.com>.
On Wed, Oct 10, 2012 at 4:10 AM, <hw...@apache.org> wrote:
> Author: hwright
> Date: Wed Oct 10 00:10:45 2012
> New Revision: 1396432
>
> URL: http://svn.apache.org/viewvc?rev=1396432&view=rev
> Log:
> * subversion/svn/file-merge.c
> (prepare_line_for_display): Eliminate integer size mismatch warning.
>
> Modified:
> subversion/trunk/subversion/svn/file-merge.c
>
> Modified: subversion/trunk/subversion/svn/file-merge.c
> URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/file-merge.c?rev=1396432&r1=1396431&r2=1396432&view=diff
> ==============================================================================
> --- subversion/trunk/subversion/svn/file-merge.c (original)
> +++ subversion/trunk/subversion/svn/file-merge.c Wed Oct 10 00:10:45 2012
> @@ -365,7 +365,7 @@ static const char *
> prepare_line_for_display(const char *line, apr_pool_t *pool)
> {
> svn_stringbuf_t *buf = svn_stringbuf_create(line, pool);
> - int width;
> + size_t width;
This change introduces three warnings on Windows platform, because
width holds int value returned from svn_utf_cstring_utf8_with()
function:
[[
..\..\..\subversion\svn\file-merge.c(398): warning C4018: '>' :
signed/unsigned mismatch
..\..\..\subversion\svn\file-merge.c(418): warning C4018: '<' :
signed/unsigned mismatch
..\..\..\subversion\svn\file-merge.c(424): warning C4389: '==' :
signed/unsigned mismatch
]]]
--
Ivan Zhakov