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 2011/04/23 15:51:59 UTC
svn commit: r1096148 - in /subversion/trunk/subversion:
libsvn_delta/svndiff.c libsvn_ra_svn/cram.c libsvn_subr/config.c
libsvn_subr/config_file.c libsvn_subr/io.c svnserve/serve.c
Author: stefan2
Date: Sat Apr 23 13:51:58 2011
New Revision: 1096148
URL: http://svn.apache.org/viewvc?rev=1096148&view=rev
Log:
Silence char conversion warnings identified by VisualStudio.
* subversion/libsvn_delta/svndiff.c
(window_handler): explicitly cast to 'char'
* subversion/libsvn_subr/config.c
(make_hash_key): dito
* subversion/libsvn_subr/config_file.c
(parse_value, parse_option, parse_section_name): dito
* subversion/libsvn_subr/io.c
(fileext_tolower): dito
* subversion/svnserve/serve.c
(void convert_case):dito
* subversion/libsvn_ra_svn/cram.c
(int_to_hex): dito
(hex_decode): explicitly cast to 'unsigned char'
Modified:
subversion/trunk/subversion/libsvn_delta/svndiff.c
subversion/trunk/subversion/libsvn_ra_svn/cram.c
subversion/trunk/subversion/libsvn_subr/config.c
subversion/trunk/subversion/libsvn_subr/config_file.c
subversion/trunk/subversion/libsvn_subr/io.c
subversion/trunk/subversion/svnserve/serve.c
Modified: subversion/trunk/subversion/libsvn_delta/svndiff.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_delta/svndiff.c?rev=1096148&r1=1096147&r2=1096148&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_delta/svndiff.c (original)
+++ subversion/trunk/subversion/libsvn_delta/svndiff.c Sat Apr 23 13:51:58 2011
@@ -189,7 +189,7 @@ window_handler(svn_txdelta_window_t *win
{
char svnver[4] = {'S','V','N','\0'};
len = 4;
- svnver[3] = eb->version;
+ svnver[3] = (char)eb->version;
SVN_ERR(svn_stream_write(eb->output, svnver, &len));
eb->header_done = TRUE;
}
Modified: subversion/trunk/subversion/libsvn_ra_svn/cram.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_svn/cram.c?rev=1096148&r1=1096147&r2=1096148&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_svn/cram.c (original)
+++ subversion/trunk/subversion/libsvn_ra_svn/cram.c Sat Apr 23 13:51:58 2011
@@ -50,7 +50,7 @@ static int hex_to_int(char c)
static char int_to_hex(int v)
{
- return (v < 10) ? '0' + v : 'a' + (v - 10);
+ return (char)((v < 10) ? '0' + v : 'a' + (v - 10));
}
static svn_boolean_t hex_decode(unsigned char *hashval, const char *hexval)
@@ -63,7 +63,7 @@ static svn_boolean_t hex_decode(unsigned
h2 = hex_to_int(hexval[2 * i + 1]);
if (h1 == -1 || h2 == -1)
return FALSE;
- hashval[i] = (h1 << 4) | h2;
+ hashval[i] = (unsigned char)((h1 << 4) | h2);
}
return TRUE;
}
Modified: subversion/trunk/subversion/libsvn_subr/config.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/config.c?rev=1096148&r1=1096147&r2=1096148&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/config.c (original)
+++ subversion/trunk/subversion/libsvn_subr/config.c Sat Apr 23 13:51:58 2011
@@ -377,7 +377,7 @@ make_hash_key(char *key)
{
register char *p;
for (p = key; *p != 0; ++p)
- *p = apr_tolower(*p);
+ *p = (char)apr_tolower(*p);
return key;
}
Modified: subversion/trunk/subversion/libsvn_subr/config_file.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/config_file.c?rev=1096148&r1=1096147&r2=1096148&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/config_file.c (original)
+++ subversion/trunk/subversion/libsvn_subr/config_file.c Sat Apr 23 13:51:58 2011
@@ -167,7 +167,7 @@ parse_value(int *pch, parse_context_t *c
while (ch != EOF && ch != '\n')
/* last ch seen was ':' or '=' in parse_option. */
{
- const char char_from_int = ch;
+ const char char_from_int = (char)ch;
svn_stringbuf_appendbyte(ctx->value, char_from_int);
SVN_ERR(parser_getc(ctx, &ch));
}
@@ -223,7 +223,7 @@ parse_value(int *pch, parse_context_t *c
while (ch != EOF && ch != '\n')
{
- const char char_from_int = ch;
+ const char char_from_int = (char)ch;
svn_stringbuf_appendbyte(ctx->value, char_from_int);
SVN_ERR(parser_getc(ctx, &ch));
}
@@ -250,7 +250,7 @@ parse_option(int *pch, parse_context_t *
ch = *pch; /* Yes, the first char is relevant. */
while (ch != EOF && ch != ':' && ch != '=' && ch != '\n')
{
- const char char_from_int = ch;
+ const char char_from_int = (char)ch;
svn_stringbuf_appendbyte(ctx->option, char_from_int);
SVN_ERR(parser_getc(ctx, &ch));
}
@@ -293,7 +293,7 @@ parse_section_name(int *pch, parse_conte
SVN_ERR(parser_getc(ctx, &ch));
while (ch != EOF && ch != ']' && ch != '\n')
{
- const char char_from_int = ch;
+ const char char_from_int = (char)ch;
svn_stringbuf_appendbyte(ctx->section, char_from_int);
SVN_ERR(parser_getc(ctx, &ch));
}
Modified: subversion/trunk/subversion/libsvn_subr/io.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/io.c?rev=1096148&r1=1096147&r2=1096148&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/io.c (original)
+++ subversion/trunk/subversion/libsvn_subr/io.c Sat Apr 23 13:51:58 2011
@@ -2812,7 +2812,7 @@ fileext_tolower(char *key)
{
register char *p;
for (p = key; *p != 0; ++p)
- *p = apr_tolower(*p);
+ *p = (char)apr_tolower(*p);
return key;
}
Modified: subversion/trunk/subversion/svnserve/serve.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnserve/serve.c?rev=1096148&r1=1096147&r2=1096148&view=diff
==============================================================================
--- subversion/trunk/subversion/svnserve/serve.c (original)
+++ subversion/trunk/subversion/svnserve/serve.c Sat Apr 23 13:51:58 2011
@@ -366,7 +366,7 @@ static void convert_case(char *text, svn
char *c = text;
while (*c)
{
- *c = (to_uppercase ? apr_toupper(*c) : apr_tolower(*c));
+ *c = (char)(to_uppercase ? apr_toupper(*c) : apr_tolower(*c));
++c;
}
}