subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r1607572 - in /subversion/trunk/subversion: libsvn_diff/binary_diff.c libsvn_fs_base/bdb/strings-table.c libsvn_fs_fs/rev_file.c libsvn_subr/cache-membuffer.c svn/merge-cmd.c
Date Thu, 03 Jul 2014 09:31:26 GMT
Author: brane
Date: Thu Jul  3 09:31:26 2014
New Revision: 1607572

URL: http://svn.apache.org/r1607572
Log:
Fixed some compiler warnings.

* subversion/libsvn_diff/binary_diff.c
  (write_literal): Change the type of a local variable to avoid
   a 64-to-32-bit conversion warning on 64-bit platforms.
* subversion/libsvn_subr/cache-membuffer.c
  (svn_membuffer_get_segment_info): Likewise.
* subversion/libsvn_fs_base/bdb/strings-table.c
  (svn_fs_bdb__string_read): Add a cast to avoid a 64-to-32-bit
   conversion warning on 64-bit platforms.
* subversion/libsvn_fs_fs/rev_file.c
  (set_read_only): Initialize the status because it may have
   been used uninitialized.
* subversion/svn/merge-cmd.c
  (unspecified_revision): Remove unused global variable.

Modified:
    subversion/trunk/subversion/libsvn_diff/binary_diff.c
    subversion/trunk/subversion/libsvn_fs_base/bdb/strings-table.c
    subversion/trunk/subversion/libsvn_fs_fs/rev_file.c
    subversion/trunk/subversion/libsvn_subr/cache-membuffer.c
    subversion/trunk/subversion/svn/merge-cmd.c

Modified: subversion/trunk/subversion/libsvn_diff/binary_diff.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_diff/binary_diff.c?rev=1607572&r1=1607571&r2=1607572&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_diff/binary_diff.c (original)
+++ subversion/trunk/subversion/libsvn_diff/binary_diff.c Thu Jul  3 09:31:26 2014
@@ -119,7 +119,7 @@ write_literal(svn_filesize_t uncompresse
     {
       char chunk[GIT_BASE85_CHUNKSIZE];
       const unsigned char *next;
-      int left;
+      apr_size_t left;
 
       rd = sizeof(chunk);
 

Modified: subversion/trunk/subversion/libsvn_fs_base/bdb/strings-table.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_base/bdb/strings-table.c?rev=1607572&r1=1607571&r2=1607572&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_base/bdb/strings-table.c (original)
+++ subversion/trunk/subversion/libsvn_fs_base/bdb/strings-table.c Thu Jul  3 09:31:26 2014
@@ -236,9 +236,9 @@ svn_fs_bdb__string_read(svn_fs_t *fs,
     {
       svn_fs_base__clear_dbt(&result);
       result.data = buf + bytes_read;
-      result.ulen = *len - bytes_read;
+      result.ulen = (u_int32_t)(*len - bytes_read);
       result.doff = (u_int32_t)offset;
-      result.dlen = *len - bytes_read;
+      result.dlen = result.ulen;
       result.flags |= (DB_DBT_USERMEM | DB_DBT_PARTIAL);
       db_err = svn_bdb_dbc_get(cursor, &query, &result, DB_CURRENT);
       if (db_err)

Modified: subversion/trunk/subversion/libsvn_fs_fs/rev_file.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/rev_file.c?rev=1607572&r1=1607571&r2=1607572&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/rev_file.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/rev_file.c Thu Jul  3 09:31:26 2014
@@ -72,7 +72,7 @@ static apr_status_t
 set_read_only(void *baton)
 {
   set_read_only_baton_t *ro_baton = baton;
-  apr_status_t status;
+  apr_status_t status = APR_SUCCESS;
   svn_error_t *err;
 
   err = svn_io_set_file_read_only(ro_baton->file_path, TRUE, ro_baton->pool);

Modified: subversion/trunk/subversion/libsvn_subr/cache-membuffer.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/cache-membuffer.c?rev=1607572&r1=1607571&r2=1607572&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/cache-membuffer.c (original)
+++ subversion/trunk/subversion/libsvn_subr/cache-membuffer.c Thu Jul  3 09:31:26 2014
@@ -2823,7 +2823,7 @@ svn_membuffer_get_segment_info(svn_membu
                                svn_cache__info_t *info,
                                svn_boolean_t include_histogram)
 {
-  apr_size_t i;
+  apr_uint32_t i;
 
   info->data_size += segment->l1.size + segment->l2.size;
   info->used_size += segment->data_used;

Modified: subversion/trunk/subversion/svn/merge-cmd.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/merge-cmd.c?rev=1607572&r1=1607571&r2=1607572&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/merge-cmd.c (original)
+++ subversion/trunk/subversion/svn/merge-cmd.c Thu Jul  3 09:31:26 2014
@@ -37,10 +37,6 @@
 
 #include "svn_private_config.h"
 
-/* A handy constant */
-static const svn_opt_revision_t unspecified_revision
-  = { svn_opt_revision_unspecified, { 0 } };
-
 
 /*** Code. ***/
 



Mime
View raw message