svn commit: r1936412 - in subversion/branches/1.15.x: . subversion/include subversion/libsvn_diff subversion/libsvn_fs subversion/libsvn_fs_fs subversion/libsvn_subr

Author: svn-role
Date: Tue Jul 21 04:00:34 2026
New Revision: 1936412

Log:
Merge the r1932158 group from trunk:

 * r1932158, r1932159, r1932160, r1932154
   Properly use const string pointers
   Justification:
     Silence GCC compiler warnings.
   Votes:
     +1: rinrab, dsahlberg, ivan

Modified:
   subversion/branches/1.15.x/   (props changed)
   subversion/branches/1.15.x/STATUS
   subversion/branches/1.15.x/subversion/include/svn_string.h
   subversion/branches/1.15.x/subversion/libsvn_diff/parse-diff.c
   subversion/branches/1.15.x/subversion/libsvn_fs/fs-loader.c
   subversion/branches/1.15.x/subversion/libsvn_fs_fs/tree.c
   subversion/branches/1.15.x/subversion/libsvn_subr/gpg_agent.c
   subversion/branches/1.15.x/subversion/libsvn_subr/string.c
   subversion/branches/1.15.x/subversion/libsvn_subr/subst.c
   subversion/branches/1.15.x/subversion/libsvn_subr/version.c

Modified: subversion/branches/1.15.x/STATUS
==============================================================================
--- subversion/branches/1.15.x/STATUS	Tue Jul 21 04:00:20 2026	(r1936411)
+++ subversion/branches/1.15.x/STATUS	Tue Jul 21 04:00:34 2026	(r1936412)
@@ -92,10 +92,3 @@ Veto-blocked changes:
 
 Approved changes:
 =================
-
- * r1932158, r1932159, r1932160, r1932154
-   Properly use const string pointers
-   Justification:
-     Silence GCC compiler warnings.
-   Votes:
-     +1: rinrab, dsahlberg, ivan

Modified: subversion/branches/1.15.x/subversion/include/svn_string.h
==============================================================================
--- subversion/branches/1.15.x/subversion/include/svn_string.h	Tue Jul 21 04:00:20 2026	(r1936411)
+++ subversion/branches/1.15.x/subversion/include/svn_string.h	Tue Jul 21 04:00:34 2026	(r1936412)
@@ -463,8 +463,8 @@ svn_string_compare_stringbuf(const svn_s
 /** Divide @a input into substrings, interpreting any char from @a sep
  * as a token separator.
  *
- * Return an array of copies of those substrings (plain const char*),
- * allocating both the array and the copies in @a pool.
+ * Return an array of copies of those substrings (plain char*), allocating
+ * both the array and the copies in @a pool.
  *
  * None of the elements added to the array contain any of the
  * characters in @a sep_chars, and none of the new elements are empty

Modified: subversion/branches/1.15.x/subversion/libsvn_diff/parse-diff.c
==============================================================================
--- subversion/branches/1.15.x/subversion/libsvn_diff/parse-diff.c	Tue Jul 21 04:00:20 2026	(r1936411)
+++ subversion/branches/1.15.x/subversion/libsvn_diff/parse-diff.c	Tue Jul 21 04:00:34 2026	(r1936412)
@@ -1545,12 +1545,12 @@ static svn_error_t *
 git_start(enum parse_state *new_state, char *line, svn_patch_t *patch,
           apr_pool_t *result_pool, apr_pool_t *scratch_pool)
 {
-  const char *old_path_start;
+  char *old_path_start;
   char *old_path_end;
-  const char *new_path_start;
+  char *new_path_start;
   const char *new_path_end;
   char *new_path_marker;
-  const char *old_path_marker;
+  char *old_path_marker;
 
   /* ### Add handling of escaped paths
    * http://www.kernel.org/pub/software/scm/git/docs/git-diff.html:

Modified: subversion/branches/1.15.x/subversion/libsvn_fs/fs-loader.c
==============================================================================
--- subversion/branches/1.15.x/subversion/libsvn_fs/fs-loader.c	Tue Jul 21 04:00:20 2026	(r1936411)
+++ subversion/branches/1.15.x/subversion/libsvn_fs/fs-loader.c	Tue Jul 21 04:00:34 2026	(r1936412)
@@ -468,7 +468,7 @@ default_warning_func(void *baton, svn_er
 svn_error_t *
 svn_fs__path_valid(const char *path, apr_pool_t *pool)
 {
-  char *c;
+  const char *c;
 
   /* UTF-8 encoded string without NULs. */
   if (! svn_utf__cstring_is_valid(path))

Modified: subversion/branches/1.15.x/subversion/libsvn_fs_fs/tree.c
==============================================================================
--- subversion/branches/1.15.x/subversion/libsvn_fs_fs/tree.c	Tue Jul 21 04:00:20 2026	(r1936411)
+++ subversion/branches/1.15.x/subversion/libsvn_fs_fs/tree.c	Tue Jul 21 04:00:34 2026	(r1936412)
@@ -2485,7 +2485,7 @@ fs_dir_optimal_order(apr_array_header_t
 static svn_error_t *
 check_newline(const char *path, apr_pool_t *pool)
 {
-  char *c = strchr(path, '\n');
+  const char *c = strchr(path, '\n');
 
   if (c)
     return svn_error_createf(SVN_ERR_FS_PATH_SYNTAX, NULL,

Modified: subversion/branches/1.15.x/subversion/libsvn_subr/gpg_agent.c
==============================================================================
--- subversion/branches/1.15.x/subversion/libsvn_subr/gpg_agent.c	Tue Jul 21 04:00:20 2026	(r1936411)
+++ subversion/branches/1.15.x/subversion/libsvn_subr/gpg_agent.c	Tue Jul 21 04:00:34 2026	(r1936412)
@@ -326,7 +326,7 @@ find_running_gpg_agent(int *new_sd, apr_
   char *buffer;
   const char *socket_name = find_gpg_agent_socket(pool, pool);
   const char *request = NULL;
-  const char *p = NULL;
+  char *p = NULL;
   char *ep = NULL;
   int sd;
 

Modified: subversion/branches/1.15.x/subversion/libsvn_subr/string.c
==============================================================================
--- subversion/branches/1.15.x/subversion/libsvn_subr/string.c	Tue Jul 21 04:00:20 2026	(r1936411)
+++ subversion/branches/1.15.x/subversion/libsvn_subr/string.c	Tue Jul 21 04:00:34 2026	(r1936412)
@@ -902,7 +902,7 @@ svn_cstring_split_append(apr_array_heade
         }
 
       if (p[0] != '\0')
-        APR_ARRAY_PUSH(array, const char *) = p;
+        APR_ARRAY_PUSH(array, char *) = p;
 
       p = svn_cstring_tokenize(sep_chars, &pats);
     }

Modified: subversion/branches/1.15.x/subversion/libsvn_subr/subst.c
==============================================================================
--- subversion/branches/1.15.x/subversion/libsvn_subr/subst.c	Tue Jul 21 04:00:20 2026	(r1936411)
+++ subversion/branches/1.15.x/subversion/libsvn_subr/subst.c	Tue Jul 21 04:00:34 2026	(r1936412)
@@ -298,7 +298,7 @@ build_keywords(apr_hash_t **kw,
 
   for (i = 0; i < keyword_tokens->nelts; ++i)
     {
-      const char *keyword = APR_ARRAY_IDX(keyword_tokens, i, const char *);
+      char *keyword = APR_ARRAY_IDX(keyword_tokens, i, char *);
       const char *custom_fmt = NULL;
 
       if (expand_custom_keywords)

Modified: subversion/branches/1.15.x/subversion/libsvn_subr/version.c
==============================================================================
--- subversion/branches/1.15.x/subversion/libsvn_subr/version.c	Tue Jul 21 04:00:20 2026	(r1936411)
+++ subversion/branches/1.15.x/subversion/libsvn_subr/version.c	Tue Jul 21 04:00:34 2026	(r1936412)
@@ -253,7 +253,7 @@ svn_version__parse_version_string(svn_ve
      require that it be present. */
   if (pieces->nelts == 3)
     {
-      const char *piece = APR_ARRAY_IDX(pieces, 2, const char *);
+      char *piece = APR_ARRAY_IDX(pieces, 2, char *);
       char *hyphen = strchr(piece, '-');
       if (hyphen)
         {