subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stef...@apache.org
Subject svn commit: r1795617 - in /subversion/trunk/subversion: include/private/svn_log.h include/private/svn_ra_svn_private.h libsvn_ra_svn/marshal.c libsvn_subr/log.c svnserve/serve.c
Date Fri, 19 May 2017 15:10:28 GMT
Author: stefan2
Date: Fri May 19 15:10:28 2017
New Revision: 1795617

URL: http://svn.apache.org/viewvc?rev=1795617&view=rev
Log:
Consistently use uint32 for dirent_fields.  Some places used uint64.

* subversion/include/private/svn_log.h
  (svn_log__get_dir,
   svn_log__list): Make the DIRENT_FIELDS parameter 32 bits.

* subversion/include/private/svn_ra_svn_private.h
  (svn_ra_svn__write_dirent): Same.

* subversion/libsvn_ra_svn/marshal.c
  (svn_ra_svn__write_dirent): Same.

* subversion/libsvn_subr/log.c
  (svn_log__get_dir,
   svn_log__list): Same.

* subversion/svnserve/serve.c
  (parse_dirent_fields,
   get_dir,
   list_receiver_baton_t): Update all parameter, local variable and
                           struct member types.

Modified:
    subversion/trunk/subversion/include/private/svn_log.h
    subversion/trunk/subversion/include/private/svn_ra_svn_private.h
    subversion/trunk/subversion/libsvn_ra_svn/marshal.c
    subversion/trunk/subversion/libsvn_subr/log.c
    subversion/trunk/subversion/svnserve/serve.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=1795617&r1=1795616&r2=1795617&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_log.h (original)
+++ subversion/trunk/subversion/include/private/svn_log.h Fri May 19 15:10:28 2017
@@ -93,7 +93,7 @@ svn_log__get_file(const char *path, svn_
 const char *
 svn_log__get_dir(const char *path, svn_revnum_t rev,
                  svn_boolean_t want_contents, svn_boolean_t want_props,
-                 apr_uint64_t dirent_fields,
+                 apr_uint32_t dirent_fields,
                  apr_pool_t *pool);
 
 /**
@@ -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_uint64_t dirent_fields, apr_pool_t *pool);
+              apr_uint32_t dirent_fields, apr_pool_t *pool);
 
 #ifdef __cplusplus
 }

Modified: subversion/trunk/subversion/include/private/svn_ra_svn_private.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/private/svn_ra_svn_private.h?rev=1795617&r1=1795616&r2=1795617&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_ra_svn_private.h (original)
+++ subversion/trunk/subversion/include/private/svn_ra_svn_private.h Fri May 19 15:10:28 2017
@@ -1019,7 +1019,7 @@ svn_ra_svn__write_dirent(svn_ra_svn_conn
                          apr_pool_t *pool,
                          const char *path,
                          svn_dirent_t *dirent,
-                         apr_uint64_t dirent_fields);
+                         apr_uint32_t dirent_fields);
 
 /**
  * @}

Modified: subversion/trunk/subversion/libsvn_ra_svn/marshal.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_svn/marshal.c?rev=1795617&r1=1795616&r2=1795617&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_svn/marshal.c (original)
+++ subversion/trunk/subversion/libsvn_ra_svn/marshal.c Fri May 19 15:10:28 2017
@@ -2921,7 +2921,7 @@ svn_ra_svn__write_dirent(svn_ra_svn_conn
                          apr_pool_t *pool,
                          const char *path,
                          svn_dirent_t *dirent,
-                         apr_uint64_t dirent_fields)
+                         apr_uint32_t dirent_fields)
 {
   const char *kind = (dirent_fields & SVN_DIRENT_KIND)
                    ? svn_node_kind_to_word(dirent->kind)

Modified: subversion/trunk/subversion/libsvn_subr/log.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/log.c?rev=1795617&r1=1795616&r2=1795617&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/log.c (original)
+++ subversion/trunk/subversion/libsvn_subr/log.c Fri May 19 15:10:28 2017
@@ -105,7 +105,7 @@ svn_log__get_file(const char *path, svn_
 const char *
 svn_log__get_dir(const char *path, svn_revnum_t rev,
                  svn_boolean_t want_contents, svn_boolean_t want_props,
-                 apr_uint64_t dirent_fields,
+                 apr_uint32_t dirent_fields,
                  apr_pool_t *pool)
 {
   return apr_psprintf(pool, "get-dir %s r%ld%s%s",
@@ -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_uint64_t dirent_fields, apr_pool_t *pool)
+              apr_uint32_t dirent_fields, apr_pool_t *pool)
 {
   svn_stringbuf_t *pattern_text = svn_stringbuf_create_empty(pool);
   const char *log_path;

Modified: subversion/trunk/subversion/svnserve/serve.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnserve/serve.c?rev=1795617&r1=1795616&r2=1795617&view=diff
==============================================================================
--- subversion/trunk/subversion/svnserve/serve.c (original)
+++ subversion/trunk/subversion/svnserve/serve.c Fri May 19 15:10:28 2017
@@ -1681,7 +1681,7 @@ get_file(svn_ra_svn_conn_t *conn,
 /* Translate all the words in DIRENT_FIELDS_LIST into the flags in
  * DIRENT_FIELDS_P.  If DIRENT_FIELDS_LIST is NULL, set all flags. */
 static svn_error_t *
-parse_dirent_fields(apr_uint64_t *dirent_fields_p,
+parse_dirent_fields(apr_uint32_t *dirent_fields_p,
                     svn_ra_svn__list_t *dirent_fields_list)
 {
   static const svn_string_t str_kind
@@ -1697,7 +1697,7 @@ parse_dirent_fields(apr_uint64_t *dirent
   static const svn_string_t str_last_author
     = SVN__STATIC_STRING(SVN_RA_SVN_DIRENT_LAST_AUTHOR);
 
-  apr_uint64_t dirent_fields;
+  apr_uint32_t dirent_fields;
 
   if (! dirent_fields_list)
     {
@@ -1752,7 +1752,7 @@ get_dir(svn_ra_svn_conn_t *conn,
   apr_pool_t *subpool;
   svn_boolean_t want_props, want_contents;
   apr_uint64_t wants_inherited_props;
-  apr_uint64_t dirent_fields;
+  apr_uint32_t dirent_fields;
   svn_ra_svn__list_t *dirent_fields_list = NULL;
   int i;
   authz_baton_t ab;
@@ -3591,7 +3591,7 @@ typedef struct list_receiver_baton_t
   svn_ra_svn_conn_t *conn;
 
   /* Send the field selected by these flags. */
-  apr_uint64_t dirent_fields;
+  apr_uint32_t dirent_fields;
 } list_receiver_baton_t;
 
 /* Implements svn_repos_dirent_receiver_t, sending DIRENT and PATH to the



Mime
View raw message