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 2012/06/13 22:24:34 UTC
svn commit: r1350001 - in /subversion/trunk/subversion: libsvn_delta/
libsvn_fs_fs/ libsvn_ra_svn/ libsvn_subr/ mod_dav_svn/ tests/libsvn_repos/
tests/libsvn_subr/
Author: stefan2
Date: Wed Jun 13 20:24:33 2012
New Revision: 1350001
URL: http://svn.apache.org/viewvc?rev=1350001&view=rev
Log:
Silence GCC warnings when assigning to chars (-Wconversion).
In all these cases, the value may never exceed the [-128,127]
range for char.
* subversion/libsvn_delta/svndiff.c
(window_handler): explicitly cast to char
* subversion/libsvn_fs_fs/key-gen.c
(svn_fs_fs__next_key): prevent conversion to int
* subversion/libsvn_fs_fs/temp_serializer.c
(encode_number): explicitly cast to char
* subversion/libsvn_ra_svn/marshal.c
(svn_ra_svn_write_string, svn_ra_svn_write_cstring): ditto
* subversion/libsvn_subr/base64.c
(decode_group): ditto
* subversion/libsvn_subr/checksum.c
(svn_checksum_parse_hex): same here
* subversion/libsvn_subr/dirent_uri.c
(canonicalize_to_lower, canonicalize_to_upper): here
* subversion/mod_dav_svn/repos.c
(get_entry): and here
* subversion/tests/libsvn_repos/repos-test.c
(prop_validation): char
* subversion/tests/libsvn_subr/stream-test.c
(generate_test_bytes): explicitly cast to char
Modified:
subversion/trunk/subversion/libsvn_delta/svndiff.c
subversion/trunk/subversion/libsvn_fs_fs/key-gen.c
subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.c
subversion/trunk/subversion/libsvn_ra_svn/marshal.c
subversion/trunk/subversion/libsvn_subr/base64.c
subversion/trunk/subversion/libsvn_subr/checksum.c
subversion/trunk/subversion/libsvn_subr/dirent_uri.c
subversion/trunk/subversion/mod_dav_svn/repos.c
subversion/trunk/subversion/tests/libsvn_repos/repos-test.c
subversion/trunk/subversion/tests/libsvn_subr/stream-test.c
Modified: subversion/trunk/subversion/libsvn_delta/svndiff.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_delta/svndiff.c?rev=1350001&r1=1350000&r2=1350001&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_delta/svndiff.c (original)
+++ subversion/trunk/subversion/libsvn_delta/svndiff.c Wed Jun 13 20:24:33 2012
@@ -238,7 +238,7 @@ window_handler(svn_txdelta_window_t *win
case svn_txdelta_new: *ip = (0x2 << 6); break;
}
if (op->length >> 6 == 0)
- *ip++ |= op->length;
+ *ip++ |= (unsigned char)op->length;
else
ip = encode_int(ip + 1, op->length);
if (op->action_code != svn_txdelta_new)
Modified: subversion/trunk/subversion/libsvn_fs_fs/key-gen.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/key-gen.c?rev=1350001&r1=1350000&r2=1350001&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/key-gen.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/key-gen.c Wed Jun 13 20:24:33 2012
@@ -115,7 +115,7 @@ svn_fs_fs__next_key(const char *this, ap
if (c == '9')
next[i] = 'a';
else
- next[i] = c + 1;
+ next[i] = ++c;
}
}
else
Modified: subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.c?rev=1350001&r1=1350000&r2=1350001&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.c Wed Jun 13 20:24:33 2012
@@ -48,16 +48,16 @@ encode_number(apr_int64_t number, char *
if (number < 0)
{
number = -number;
- *key_buffer = (number & 63) + ' ' + 65;
+ *key_buffer = (char)((number & 63) + ' ' + 65);
}
else
- *key_buffer = (number & 63) + ' ' + 1;
+ *key_buffer = (char)((number & 63) + ' ' + 1);
number /= 64;
/* write 7 bits / byte until no significant bits are left */
while (number)
{
- *++key_buffer = (number & 127) + ' ' + 1;
+ *++key_buffer = (char)((number & 127) + ' ' + 1);
number /= 128;
}
Modified: subversion/trunk/subversion/libsvn_ra_svn/marshal.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_svn/marshal.c?rev=1350001&r1=1350000&r2=1350001&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_svn/marshal.c (original)
+++ subversion/trunk/subversion/libsvn_ra_svn/marshal.c Wed Jun 13 20:24:33 2012
@@ -462,7 +462,7 @@ svn_error_t *svn_ra_svn_write_string(svn
{
if (str->len < 10)
{
- SVN_ERR(writebuf_writechar(conn, pool, (char)str->len + '0'));
+ SVN_ERR(writebuf_writechar(conn, pool, (char)(str->len + '0')));
SVN_ERR(writebuf_writechar(conn, pool, ':'));
}
else
@@ -480,7 +480,7 @@ svn_error_t *svn_ra_svn_write_cstring(sv
if (len < 10)
{
- SVN_ERR(writebuf_writechar(conn, pool, (char)len + '0'));
+ SVN_ERR(writebuf_writechar(conn, pool, (char)(len + '0')));
SVN_ERR(writebuf_writechar(conn, pool, ':'));
}
else
Modified: subversion/trunk/subversion/libsvn_subr/base64.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/base64.c?rev=1350001&r1=1350000&r2=1350001&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/base64.c (original)
+++ subversion/trunk/subversion/libsvn_subr/base64.c Wed Jun 13 20:24:33 2012
@@ -306,9 +306,9 @@ struct decode_baton {
static APR_INLINE void
decode_group(const unsigned char *in, char *out)
{
- out[0] = (in[0] << 2) | (in[1] >> 4);
- out[1] = ((in[1] & 0xf) << 4) | (in[2] >> 2);
- out[2] = ((in[2] & 0x3) << 6) | in[3];
+ out[0] = (char)((in[0] << 2) | (in[1] >> 4));
+ out[1] = (char)(((in[1] & 0xf) << 4) | (in[2] >> 2));
+ out[2] = (char)(((in[2] & 0x3) << 6) | in[3]);
}
/* Lookup table for base64 characters; reverse_base64[ch] gives a
Modified: subversion/trunk/subversion/libsvn_subr/checksum.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/checksum.c?rev=1350001&r1=1350000&r2=1350001&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/checksum.c (original)
+++ subversion/trunk/subversion/libsvn_subr/checksum.c Wed Jun 13 20:24:33 2012
@@ -276,8 +276,8 @@ svn_checksum_parse_hex(svn_checksum_t **
if (x1 == (char)-1 || x2 == (char)-1)
return svn_error_create(SVN_ERR_BAD_CHECKSUM_PARSE, NULL, NULL);
- digest[i] = (x1 << 4) | x2;
- is_nonzero |= (x1 << 4) | x2;
+ digest[i] = (char)((x1 << 4) | x2);
+ is_nonzero |= (char)((x1 << 4) | x2);
}
if (!is_nonzero)
Modified: subversion/trunk/subversion/libsvn_subr/dirent_uri.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/dirent_uri.c?rev=1350001&r1=1350000&r2=1350001&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/dirent_uri.c (original)
+++ subversion/trunk/subversion/libsvn_subr/dirent_uri.c Wed Jun 13 20:24:33 2012
@@ -104,7 +104,7 @@ canonicalize_to_lower(char c)
if (c < 'A' || c > 'Z')
return c;
else
- return c - 'A' + 'a';
+ return (char)(c - 'A' + 'a');
}
/* Locale insensitive toupper() for converting parts of dirents and urls
@@ -115,7 +115,7 @@ canonicalize_to_upper(char c)
if (c < 'a' || c > 'z')
return c;
else
- return c - 'a' + 'A';
+ return (char)(c - 'a' + 'A');
}
/* Calculates the length of the dirent absolute or non absolute root in
Modified: subversion/trunk/subversion/mod_dav_svn/repos.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/repos.c?rev=1350001&r1=1350000&r2=1350001&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/repos.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/repos.c Wed Jun 13 20:24:33 2012
@@ -1573,7 +1573,7 @@ static const char *get_entry(apr_pool_t
for (cp = parm; (*cp && !svn_ctype_isspace(*cp) && *cp != '='); ++cp)
{
- *cp = apr_tolower(*cp);
+ *cp = (char)apr_tolower(*cp);
}
if (!*cp)
Modified: subversion/trunk/subversion/tests/libsvn_repos/repos-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_repos/repos-test.c?rev=1350001&r1=1350000&r2=1350001&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_repos/repos-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_repos/repos-test.c Wed Jun 13 20:24:33 2012
@@ -2256,7 +2256,7 @@ prop_validation(const svn_test_opts_t *o
{
svn_error_t *err;
svn_repos_t *repos;
- const char non_utf8_string[5] = { 'a', 0xff, 'b', '\n', 0 };
+ const char non_utf8_string[5] = { 'a', (char)0xff, 'b', '\n', 0 };
const char *non_lf_string = "a\r\nb\n\rc\rd\n";
apr_pool_t *subpool = svn_pool_create(pool);
Modified: subversion/trunk/subversion/tests/libsvn_subr/stream-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/stream-test.c?rev=1350001&r1=1350000&r2=1350001&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_subr/stream-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_subr/stream-test.c Wed Jun 13 20:24:33 2012
@@ -138,7 +138,7 @@ generate_test_bytes(int num_bytes, apr_p
{
if (c == 127)
repeat++;
- c = (c + 1) % 127;
+ c = (char)((c + 1) % 127);
repeat_iter = repeat;
}
}