Skip to content

Commit ff7ba77

Browse files
etrclaude
andcommitted
refactor: rename body.{hpp,cpp} to response_body to match the class rename
Commit ea3e67c renamed the detail::body hierarchy to detail::response_body (response_body base + string_/file_/iovec_/pipe_/deferred_/empty_/ digest_challenge_response_body) but left the files carrying it named body.*. Align the filenames with the types they hold. - src/httpserver/detail/body.hpp -> detail/response_body.hpp (include guard SRC_HTTPSERVER_DETAIL_RESPONSE_BODY_HPP_ and internal #error message updated to match) - src/detail/body.cpp -> src/detail/response_body.cpp - test/unit/body_test.cpp -> test/unit/response_body_test.cpp (test target body -> response_body in test/Makefile.am) Updated every #include, both Makefile.am file lists, and the stale body.cpp / body_test.cpp mentions in comments, iovec_entry.hpp, and test/PORTABILITY.md. Deliberately unchanged: webserver_body_pipeline.cpp and the body_chunk / request_body names -- those are the request/upload-body path, not the response-body hierarchy. Verified: out-of-source reconfigure + build green, make check 113/113, all header/readme/release-notes/doxygen/lint gates pass. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_015tAodxYJMEY4VxCX4dk62e
1 parent 8a3fd54 commit ff7ba77

18 files changed

Lines changed: 48 additions & 48 deletions

src/Makefile.am

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ lib_LTLIBRARIES = libhttpserver.la
2525
# builds. The WS-off branch in websocket_handler.cpp provides stub
2626
# definitions (every member throws feature_unavailable except is_valid()
2727
# which returns false).
28-
libhttpserver_la_SOURCES = string_utilities.cpp webserver.cpp http_utils.cpp file_info.cpp http_request.cpp http_request_auth.cpp http_response.cpp http_response_factories.cpp http_resource.cpp create_webserver.cpp create_test_request.cpp websocket_handler.cpp hook_handle.cpp peer_address.cpp resource_hook_table.cpp cookie.cpp detail/http_endpoint.cpp detail/body.cpp detail/ip_representation.cpp detail/ip_access_control.cpp detail/ws_registry.cpp detail/hook_bus.cpp detail/route_table.cpp detail/daemon_lifecycle.cpp detail/dispatch_util.cpp detail/error_pages.cpp detail/hook_dispatcher.cpp detail/http_request_impl.cpp detail/http_request_impl_args.cpp detail/http_request_impl_tls.cpp detail/request_dispatcher.cpp detail/request_pipeline.cpp detail/response_materializer.cpp detail/upload_pipeline.cpp detail/websocket_upgrader.cpp detail/webserver_impl.cpp detail/webserver_callbacks.cpp detail/webserver_body_pipeline.cpp
28+
libhttpserver_la_SOURCES = string_utilities.cpp webserver.cpp http_utils.cpp file_info.cpp http_request.cpp http_request_auth.cpp http_response.cpp http_response_factories.cpp http_resource.cpp create_webserver.cpp create_test_request.cpp websocket_handler.cpp hook_handle.cpp peer_address.cpp resource_hook_table.cpp cookie.cpp detail/http_endpoint.cpp detail/response_body.cpp detail/ip_representation.cpp detail/ip_access_control.cpp detail/ws_registry.cpp detail/hook_bus.cpp detail/route_table.cpp detail/daemon_lifecycle.cpp detail/dispatch_util.cpp detail/error_pages.cpp detail/hook_dispatcher.cpp detail/http_request_impl.cpp detail/http_request_impl_args.cpp detail/http_request_impl_tls.cpp detail/request_dispatcher.cpp detail/request_pipeline.cpp detail/response_materializer.cpp detail/upload_pipeline.cpp detail/websocket_upgrader.cpp detail/webserver_impl.cpp detail/webserver_callbacks.cpp detail/webserver_body_pipeline.cpp
2929
# noinst_HEADERS: shipped in the tarball but NEVER installed under $prefix/include.
3030
# Detail headers (httpserver/detail/*.hpp) live here so they cannot leak to
3131
# downstream consumers — the public surface comes in through <httpserver.hpp>.
32-
noinst_HEADERS = httpserver/string_utilities.hpp httpserver/detail/connection_context.hpp httpserver/detail/http_endpoint.hpp httpserver/detail/body.hpp httpserver/detail/webserver_impl.hpp httpserver/detail/webserver_impl_dispatch.hpp httpserver/detail/connection_state.hpp httpserver/detail/ip_access_control.hpp httpserver/detail/ws_registry.hpp httpserver/detail/hook_bus.hpp httpserver/detail/route_table.hpp httpserver/detail/daemon_lifecycle.hpp httpserver/detail/dispatch_util.hpp httpserver/detail/error_pages.hpp httpserver/detail/hook_dispatcher.hpp httpserver/detail/request_dispatcher.hpp httpserver/detail/request_pipeline.hpp httpserver/detail/response_materializer.hpp httpserver/detail/upload_pipeline.hpp httpserver/detail/websocket_upgrader.hpp httpserver/detail/secure_zero.hpp httpserver/detail/http_request_impl.hpp httpserver/detail/resource_hook_table.hpp httpserver/detail/route_entry.hpp httpserver/detail/lambda_resource.hpp httpserver/detail/segment_trie.hpp httpserver/detail/route_cache.hpp httpserver/detail/route_tier.hpp httpserver/detail/unescape_helpers.hpp gettext.h
32+
noinst_HEADERS = httpserver/string_utilities.hpp httpserver/detail/connection_context.hpp httpserver/detail/http_endpoint.hpp httpserver/detail/response_body.hpp httpserver/detail/webserver_impl.hpp httpserver/detail/webserver_impl_dispatch.hpp httpserver/detail/connection_state.hpp httpserver/detail/ip_access_control.hpp httpserver/detail/ws_registry.hpp httpserver/detail/hook_bus.hpp httpserver/detail/route_table.hpp httpserver/detail/daemon_lifecycle.hpp httpserver/detail/dispatch_util.hpp httpserver/detail/error_pages.hpp httpserver/detail/hook_dispatcher.hpp httpserver/detail/request_dispatcher.hpp httpserver/detail/request_pipeline.hpp httpserver/detail/response_materializer.hpp httpserver/detail/upload_pipeline.hpp httpserver/detail/websocket_upgrader.hpp httpserver/detail/secure_zero.hpp httpserver/detail/http_request_impl.hpp httpserver/detail/resource_hook_table.hpp httpserver/detail/route_entry.hpp httpserver/detail/lambda_resource.hpp httpserver/detail/segment_trie.hpp httpserver/detail/route_cache.hpp httpserver/detail/route_tier.hpp httpserver/detail/unescape_helpers.hpp gettext.h
3333
nobase_include_HEADERS = httpserver.hpp httpserver/body_kind.hpp httpserver/cookie.hpp httpserver/constants.hpp httpserver/create_webserver.hpp httpserver/create_webserver_setters.hpp httpserver/create_test_request.hpp httpserver/webserver.hpp httpserver/webserver_routes.hpp httpserver/webserver_runtime.hpp httpserver/webserver_websocket.hpp httpserver/webserver_hooks.hpp httpserver/websocket_handler.hpp httpserver/http_utils.hpp httpserver/http_utils_helpers.hpp httpserver/ip_representation.hpp httpserver/file_info.hpp httpserver/http_request.hpp httpserver/http_response.hpp httpserver/http_resource.hpp httpserver/feature_unavailable.hpp httpserver/iovec_entry.hpp httpserver/http_arg_value.hpp httpserver/http_method.hpp httpserver/hook_phase.hpp httpserver/hook_action.hpp httpserver/hook_handle.hpp httpserver/hook_context.hpp
3434

3535
AM_CXXFLAGS += -fPIC -Wall

src/detail/hook_dispatcher.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
#include "httpserver/http_request.hpp"
4444
#include "httpserver/http_resource.hpp"
4545
#include "httpserver/http_response.hpp"
46-
#include "httpserver/detail/body.hpp"
46+
#include "httpserver/detail/response_body.hpp"
4747
#include "httpserver/detail/dispatch_util.hpp"
4848
#include "httpserver/detail/hook_bus.hpp"
4949
#include "httpserver/detail/connection_context.hpp"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
USA
1919
*/
2020

21-
#include "httpserver/detail/body.hpp"
21+
#include "httpserver/detail/response_body.hpp"
2222

2323
#include <fcntl.h>
2424
#include <microhttpd.h>

src/detail/response_materializer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
#include "httpserver/create_webserver.hpp"
3838
#include "httpserver/http_response.hpp"
3939
#include "httpserver/http_utils.hpp"
40-
#include "httpserver/detail/body.hpp"
40+
#include "httpserver/detail/response_body.hpp"
4141
#include "httpserver/detail/dispatch_util.hpp"
4242
#include "httpserver/detail/error_pages.hpp"
4343
#include "httpserver/detail/hook_dispatcher.hpp"

src/detail/webserver_callbacks.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
#include "httpserver/http_response.hpp"
7777
#include "httpserver/http_utils.hpp"
7878
#include "httpserver/string_utilities.hpp"
79-
#include "httpserver/detail/body.hpp"
79+
#include "httpserver/detail/response_body.hpp"
8080
#include "httpserver/detail/connection_state.hpp"
8181
#include "httpserver/detail/path_normalize.hpp"
8282
#include "httpserver/detail/resource_hook_table.hpp"

src/http_response.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
#include <utility>
3939
#include <vector>
4040

41-
#include "httpserver/detail/body.hpp" // complete type for body_->~response_body()
41+
#include "httpserver/detail/response_body.hpp" // complete type for body_->~response_body()
4242
#include "httpserver/detail/http_field_validation.hpp"
4343
#include "httpserver/http_utils.hpp"
4444
#include "httpserver/iovec_entry.hpp"
@@ -73,7 +73,7 @@ static_assert(alignof(http_response) >= 16,
7373
// discriminator impossible to get out of sync. Both helpers are
7474
// noexcept: destroy_body relies on body subclass dtors being
7575
// noexcept, adopt_body_from relies on the noexcept move_into() virtual
76-
// (statically asserted per-subclass in detail/body.hpp).
76+
// (statically asserted per-subclass in detail/response_body.hpp).
7777
//
7878
// Members are private; they live as out-of-line member functions so
7979
// they have access without an extra friend declaration.
@@ -133,7 +133,7 @@ http_response::~http_response() {
133133
// noexcept because every member's move is noexcept (header_map is a
134134
// std::map, std::map move is noexcept; std::byte[64] is trivially
135135
// movable; per-subclass body move ctors are noexcept by static_assert in
136-
// detail/body.hpp).
136+
// detail/response_body.hpp).
137137
// -----------------------------------------------------------------------
138138
http_response::http_response(http_response&& other) noexcept
139139
: status_code_(other.status_code_),

src/http_response_factories.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
#include <utility>
3838
#include <vector>
3939

40-
#include "httpserver/detail/body.hpp" // complete type for body_->~response_body()
40+
#include "httpserver/detail/response_body.hpp" // complete type for body_->~response_body()
4141
#include "httpserver/detail/http_field_validation.hpp"
4242
#include "httpserver/feature_unavailable.hpp"
4343
#include "httpserver/http_utils.hpp"
@@ -63,7 +63,7 @@ namespace httpserver {
6363
// Defined out-of-line in this TU because every factory in this file
6464
// instantiates it (so no separate-TU instantiation is needed) and the
6565
// template body needs the complete type detail::response_body. Per-T size+align
66-
// guards duplicate the SBO budget asserts in detail/body.hpp so an
66+
// guards duplicate the SBO budget asserts in detail/response_body.hpp so an
6767
// over-sized future body subclass fails to compile at the factory site
6868
// rather than silently triggering the heap fallback.
6969
// -----------------------------------------------------------------------
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@
2828
//
2929
// Header-hygiene contract: only library .cpp files (and build-tree unit
3030
// tests compiled with -DHTTPSERVER_COMPILATION) may include this file.
31-
#ifndef SRC_HTTPSERVER_DETAIL_BODY_HPP_
32-
#define SRC_HTTPSERVER_DETAIL_BODY_HPP_
31+
#ifndef SRC_HTTPSERVER_DETAIL_RESPONSE_BODY_HPP_
32+
#define SRC_HTTPSERVER_DETAIL_RESPONSE_BODY_HPP_
3333

3434
#ifndef HTTPSERVER_COMPILATION
35-
#error "detail/body.hpp is internal; build with -DHTTPSERVER_COMPILATION."
35+
#error "detail/response_body.hpp is internal; build with -DHTTPSERVER_COMPILATION."
3636
#endif
3737

3838
#include <microhttpd.h>
@@ -490,4 +490,4 @@ static_assert(std::is_nothrow_move_constructible_v<digest_challenge_response_bod
490490
} // namespace detail
491491

492492
} // namespace httpserver
493-
#endif // SRC_HTTPSERVER_DETAIL_BODY_HPP_
493+
#endif // SRC_HTTPSERVER_DETAIL_RESPONSE_BODY_HPP_

src/httpserver/iovec_entry.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@ namespace httpserver {
3636
// Layout is pinned to match POSIX `struct iovec` and libmicrohttpd's
3737
// `MHD_IoVec` so the dispatch path can `reinterpret_cast` a contiguous
3838
// array of iovec_entry into either C type at zero copy. The pinning
39-
// asserts live next to the cast site in `src/detail/body.cpp`
39+
// asserts live next to the cast site in `src/detail/response_body.cpp`
4040
// (iovec_response_body::materialize).
4141
//
4242
// `base` is `const void*` because libhttpserver never writes through
4343
// these buffers on the response path.
4444
//
45-
// Both fields are accessed from src/http_response.cpp and src/detail/body.cpp
45+
// Both fields are accessed from src/http_response.cpp and src/detail/response_body.cpp
4646
// (offsetof layout pinning + iovec construction); cppcheck analyses each TU
4747
// in isolation and cannot see the uses, so unusedStructMember is suppressed
4848
// per-member below.

src/webserver.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
#include "httpserver/http_response.hpp"
8282
#include "httpserver/http_utils.hpp"
8383
#include "httpserver/string_utilities.hpp"
84-
#include "httpserver/detail/body.hpp"
84+
#include "httpserver/detail/response_body.hpp"
8585
#include "httpserver/constants.hpp"
8686
#include "httpserver/hook_action.hpp"
8787
#include "httpserver/hook_context.hpp"

0 commit comments

Comments
 (0)