svn commit: r1936843 - in apr/apr/trunk: dbd test uri

Author: jorton
Date: Mon Aug  3 16:18:06 2026
New Revision: 1936843

Log:
Fix GCC warnings with strchr()/strrchr() on Fedora 44:

* uri/apr_uri.c (apr_uri_parse): Const-correct first_slash.

* dbd/apr_dbd_odbc.c (odbc_escape): Const-correct sq and src.

* test/abts.c (abts_add_suite): Const-correct p.

Assisted-by: Claude Opus 4.6

Modified:
   apr/apr/trunk/dbd/apr_dbd_odbc.c
   apr/apr/trunk/test/abts.c
   apr/apr/trunk/uri/apr_uri.c

Modified: apr/apr/trunk/dbd/apr_dbd_odbc.c
==============================================================================
--- apr/apr/trunk/dbd/apr_dbd_odbc.c	Mon Aug  3 16:13:10 2026	(r1936842)
+++ apr/apr/trunk/dbd/apr_dbd_odbc.c	Mon Aug  3 16:18:06 2026	(r1936843)
@@ -1415,7 +1415,8 @@ static const char *odbc_error(apr_dbd_t
 static const char *odbc_escape(apr_pool_t *pool, const char *s,
                                apr_dbd_t *handle)
 {
-    char *newstr, *src, *dst, *sq;
+    char *newstr, *dst;
+    const char *src, *sq;
     int qcount;
 
     /* return the original if there are no single-quotes */
@@ -1427,7 +1428,7 @@ static const char *odbc_escape(apr_pool_
     newstr = apr_palloc(pool, strlen(s) + qcount + 1);
 
     /* move chars, doubling all single-quotes */
-    src = (char *)s;
+    src = s;
     for (dst = newstr; *src; src++) {
         if ((*dst++ = *src) == '\'')
             *dst++ = '\'';

Modified: apr/apr/trunk/test/abts.c
==============================================================================
--- apr/apr/trunk/test/abts.c	Mon Aug  3 16:13:10 2026	(r1936842)
+++ apr/apr/trunk/test/abts.c	Mon Aug  3 16:18:06 2026	(r1936843)
@@ -94,7 +94,7 @@ static void end_suite(abts_suite *suite)
 abts_suite *abts_add_suite(abts_suite *suite, const char *suite_name_full)
 {
     sub_suite *subsuite;
-    char *p;
+    const char *p;
     const char *suite_name;
     curr_char = 0;
 

Modified: apr/apr/trunk/uri/apr_uri.c
==============================================================================
--- apr/apr/trunk/uri/apr_uri.c	Mon Aug  3 16:13:10 2026	(r1936842)
+++ apr/apr/trunk/uri/apr_uri.c	Mon Aug  3 16:18:06 2026	(r1936843)
@@ -914,7 +914,7 @@ deal_with_path:
              * RFC 3986 3.3: If we have no scheme and no authority,
              * the leading segment of a relative path must not contain a ':'.
              */
-            char *first_slash = strchr(uri, '/');
+            const char *first_slash = strchr(uri, '/');
             if (first_slash) {
                 while (s < first_slash) {
                     if (s[0] == ':')