subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stef...@apache.org
Subject svn commit: r1769532 - in /subversion/trunk/subversion: include/private/svn_log.h libsvn_fs_x/fs.h libsvn_subr/log.c
Date Sun, 13 Nov 2016 18:19:37 GMT
Author: stefan2
Date: Sun Nov 13 18:19:37 2016
New Revision: 1769532

URL: http://svn.apache.org/viewvc?rev=1769532&view=rev
Log:
Fix a couple of integer conversion warnings.

Found by: brane

* subversion/libsvn_fs_x/fs.h
  (svn_fs_x__changes_context): The NEXT element is used with APR arrays,
                               so it should be int.

* subversion/include/private/svn_log.h
  (svn_log__list): DIRENT_FLAGS are always 64 bits, so this should be, too.

* subversion/libsvn_subr/log.c
  (svn_log__list): Update implementation signature.

Modified:
    subversion/trunk/subversion/include/private/svn_log.h
    subversion/trunk/subversion/libsvn_fs_x/fs.h
    subversion/trunk/subversion/libsvn_subr/log.c

Modified: subversion/trunk/subversion/include/private/svn_log.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/private/svn_log.h?rev=1769532&r1=1769531&r2=1769532&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_log.h (original)
+++ subversion/trunk/subversion/include/private/svn_log.h Sun Nov 13 18:19:37 2016
@@ -262,7 +262,7 @@ svn_log__get_inherited_props(const char
 const char *
 svn_log__list(const char *path, svn_revnum_t revision,
               apr_array_header_t *patterns, svn_depth_t depth,
-              apr_uint32_t dirent_fields, apr_pool_t *pool);
+              apr_uint64_t dirent_fields, apr_pool_t *pool);
 
 #ifdef __cplusplus
 }

Modified: subversion/trunk/subversion/libsvn_fs_x/fs.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/fs.h?rev=1769532&r1=1769531&r2=1769532&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/fs.h (original)
+++ subversion/trunk/subversion/libsvn_fs_x/fs.h Sun Nov 13 18:19:37 2016
@@ -545,7 +545,7 @@ typedef struct svn_fs_x__changes_context
   svn_fs_x__revision_file_t *revision_file;
 
   /* Index of the next change to fetch. */
-  apr_size_t next;
+  int next;
 
   /* Offset, within the changed paths list on disk, of the next change to
      fetch. */

Modified: subversion/trunk/subversion/libsvn_subr/log.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/log.c?rev=1769532&r1=1769531&r2=1769532&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/log.c (original)
+++ subversion/trunk/subversion/libsvn_subr/log.c Sun Nov 13 18:19:37 2016
@@ -399,7 +399,7 @@ svn_log__get_inherited_props(const char
 const char *
 svn_log__list(const char *path, svn_revnum_t revision,
               apr_array_header_t *patterns, svn_depth_t depth,
-              apr_uint32_t dirent_fields, apr_pool_t *pool)
+              apr_uint64_t dirent_fields, apr_pool_t *pool)
 {
   svn_stringbuf_t *pattern_text = svn_stringbuf_create_empty(pool);
   const char *log_path;



Mime
View raw message