You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by iv...@apache.org on 2014/09/19 17:14:24 UTC
svn commit: r1626246 - in /subversion/trunk/subversion/libsvn_fs_fs: lock.c
low_level.c temp_serializer.c
Author: ivan
Date: Fri Sep 19 15:14:24 2014
New Revision: 1626246
URL: http://svn.apache.org/r1626246
Log:
Resolve several easy to fix compiler warnings.
* subversion/libsvn_fs_fs/lock.c
(add_to_digest): Use unsigned int type to match apr_hash_count() signature.
* subversion/libsvn_fs_fs/low_level.c
(read_header_block): Use apr_size_t for indexes instead of apr_ssize_t and
refactor code to avoid subtraction.
* subversion/libsvn_fs_fs/temp_serializer.c
(serialize_dir): Use int type for index to match apr_array_header->nelts
type.
Modified:
subversion/trunk/subversion/libsvn_fs_fs/lock.c
subversion/trunk/subversion/libsvn_fs_fs/low_level.c
subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.c
Modified: subversion/trunk/subversion/libsvn_fs_fs/lock.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/lock.c?rev=1626246&r1=1626245&r2=1626246&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/lock.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/lock.c Fri Sep 19 15:14:24 2014
@@ -386,7 +386,8 @@ add_to_digest(const char *fs_path,
const char *index_digest_path;
apr_hash_t *children;
svn_lock_t *lock;
- int i, original_count;
+ int i;
+ unsigned int original_count;
SVN_ERR(digest_path_from_path(&index_digest_path, fs_path, index_path, pool));
Modified: subversion/trunk/subversion/libsvn_fs_fs/low_level.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/low_level.c?rev=1626246&r1=1626245&r2=1626246&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/low_level.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/low_level.c Fri Sep 19 15:14:24 2014
@@ -615,8 +615,8 @@ read_header_block(apr_hash_t **headers,
{
svn_stringbuf_t *header_str;
const char *name, *value;
- apr_ssize_t i = 0;
- apr_ssize_t name_len;
+ apr_size_t i = 0;
+ apr_size_t name_len;
svn_boolean_t eof;
SVN_ERR(svn_stream_readline(stream, &header_str, "\n", &eof,
@@ -640,13 +640,10 @@ read_header_block(apr_hash_t **headers,
name = header_str->data;
name_len = i;
- /* Skip over the NULL byte and the space following it. */
- i += 2;
-
- if (i > header_str->len)
+ /* Check if we have enough data to parse. */
+ if (i + 2 > header_str->len)
{
/* Restore the original line for the error. */
- i -= 2;
header_str->data[i] = ':';
return svn_error_createf(SVN_ERR_FS_CORRUPT, NULL,
_("Found malformed header '%s' in "
@@ -654,6 +651,9 @@ read_header_block(apr_hash_t **headers,
header_str->data);
}
+ /* Skip over the NULL byte and the space following it. */
+ i += 2;
+
value = header_str->data + i;
/* header_str is safely in our pool, so we can use bits of it as
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=1626246&r1=1626245&r2=1626246&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.c Fri Sep 19 15:14:24 2014
@@ -205,7 +205,7 @@ static svn_temp_serializer__context_t *
serialize_dir(apr_array_header_t *entries, apr_pool_t *pool)
{
dir_data_t dir_data;
- apr_size_t i = 0;
+ int i = 0;
svn_temp_serializer__context_t *context;
/* calculate sizes */