svn commit: r1927465 - in serf/trunk: . src

[brane]

Author: brane
Date: Fri Jul 25 11:32:51 2025
New Revision: 1927465

Log:
Follow up to r1927456: the serf__resolve_result_t struct is no longer
used outside of resolve.c, so make it local there.

* serf_private.h
  (serf__resolve_result_t): Removed.

* src/resolve.c
  (resolve_result_t): Renamed from serf__resolve_result_t and moved here.

Modified:
   serf/trunk/serf_private.h
   serf/trunk/src/resolve.c

Modified: serf/trunk/serf_private.h
==============================================================================
--- serf/trunk/serf_private.h   Fri Jul 25 11:04:38 2025        (r1927464)
+++ serf/trunk/serf_private.h   Fri Jul 25 11:32:51 2025        (r1927465)
@@ -440,17 +440,6 @@ serf__config_store_remove_host(serf__con
                                const char *hostname_port);
 
 
-typedef struct serf__resolve_result_t serf__resolve_result_t;
-struct serf__resolve_result_t
-{
-    apr_sockaddr_t *host_address;
-    apr_status_t status;
-    serf_address_resolved_t resolved;
-    void *resolved_baton;
-    apr_pool_t *result_pool;
-    serf__resolve_result_t *next;
-};
-
 struct serf_context_t {
     /* the pool used for self and for other allocations */
     apr_pool_t *pool;

Modified: serf/trunk/src/resolve.c
==============================================================================
--- serf/trunk/src/resolve.c    Fri Jul 25 11:04:38 2025        (r1927464)
+++ serf/trunk/src/resolve.c    Fri Jul 25 11:32:51 2025        (r1927465)
@@ -656,6 +656,18 @@ static apr_status_t run_async_resolver_l
 #endif  /* APR_MAJOR_VERSION < 2 */
 
 
+typedef struct resolve_result_t resolve_result_t;
+struct resolve_result_t
+{
+    apr_sockaddr_t *host_address;
+    apr_status_t status;
+    serf_address_resolved_t resolved;
+    void *resolved_baton;
+    apr_pool_t *result_pool;
+    resolve_result_t *next;
+};
+
+
 static void push_resolve_result(serf_context_t *ctx,
                                 apr_sockaddr_t *host_address,
                                 apr_status_t resolve_status,
@@ -663,7 +675,7 @@ static void push_resolve_result(serf_con
                                 void *resolved_baton,
                                 apr_pool_t *resolve_pool)
 {
-    serf__resolve_result_t *result;
+    resolve_result_t *result;
     void *head;
 
     result = apr_palloc(resolve_pool, sizeof(*result));
@@ -695,7 +707,7 @@ apr_status_t serf__create_resolve_contex
 /* Internal API */
 apr_status_t serf__process_async_resolve_results(serf_context_t *ctx)
 {
-    serf__resolve_result_t *result;
+    resolve_result_t *result;
     apr_status_t status;
 
     status = run_async_resolver_loop(ctx);
@@ -706,7 +718,7 @@ apr_status_t serf__process_async_resolve
     result = apr_atomic_xchgptr(&ctx->resolve_head, NULL);
     while (result)
     {
-        serf__resolve_result_t *const next = result->next;
+        resolve_result_t *const next = result->next;
         result->resolved(ctx, result->resolved_baton,
                          result->host_address, result->status,
                          result->result_pool);