fcgi/SConnection: inline all StockItem wrapper functions

CM4all · Feb 25, 2025 · c0eef5e · c0eef5e
1 parent ada0cfb
commit c0eef5e
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 49 deletions.
diff --git a/src/fcgi/SConnection.cxx b/src/fcgi/SConnection.cxx
@@ -19,7 +19,7 @@ FcgiStockConnection::FcgiStockConnection(CreateStockItem c, ListenChildStockItem
 {
 }
 
-inline void
+void
 FcgiStockConnection::SetAborted() noexcept
 {
 	if (fresh)
@@ -73,40 +73,3 @@ FcgiStockConnection::~FcgiStockConnection() noexcept
 {
 	event.Close();
 }
-
-UniqueFileDescriptor
-fcgi_stock_item_get_stderr(const StockItem &item) noexcept
-{
-	const auto &connection = (const FcgiStockConnection &)item;
-	return connection.GetStderr();
-}
-
-void
-fcgi_stock_item_set_site(StockItem &item, const char *site) noexcept
-{
-	auto &connection = (FcgiStockConnection &)item;
-	connection.SetSite(site);
-}
-
-void
-fcgi_stock_item_set_uri(StockItem &item, const char *uri) noexcept
-{
-	auto &connection = (FcgiStockConnection &)item;
-	connection.SetUri(uri);
-}
-
-SocketDescriptor
-fcgi_stock_item_get(const StockItem &item) noexcept
-{
-	const auto *connection = (const FcgiStockConnection *)&item;
-
-	return connection->GetSocket();
-}
-
-void
-fcgi_stock_aborted(StockItem &item) noexcept
-{
-	auto *connection = (FcgiStockConnection *)&item;
-
-	connection->SetAborted();
-}
diff --git a/src/fcgi/SConnection.hxx b/src/fcgi/SConnection.hxx
@@ -75,20 +75,37 @@ private:
 	void OnSocketEvent(unsigned events) noexcept;
 };
 
-void
-fcgi_stock_item_set_site(StockItem &item, const char *site) noexcept;
-
-void
-fcgi_stock_item_set_uri(StockItem &item, const char *uri) noexcept;
+static inline void
+fcgi_stock_item_set_site(StockItem &item, const char *site) noexcept
+{
+	auto &connection = (FcgiStockConnection &)item;
+	connection.SetSite(site);
+}
+
+static inline void
+fcgi_stock_item_set_uri(StockItem &item, const char *uri) noexcept
+{
+	auto &connection = (FcgiStockConnection &)item;
+	connection.SetUri(uri);
+}
 
 /**
  * Returns the socket descriptor of the specified stock item.
  */
-SocketDescriptor
-fcgi_stock_item_get(const StockItem &item) noexcept;
+static inline SocketDescriptor
+fcgi_stock_item_get(const StockItem &item) noexcept
+{
+	const auto *connection = (const FcgiStockConnection *)&item;
+
+	return connection->GetSocket();
+}
 
-UniqueFileDescriptor
-fcgi_stock_item_get_stderr(const StockItem &item) noexcept;
+static inline UniqueFileDescriptor
+fcgi_stock_item_get_stderr(const StockItem &item) noexcept
+{
+	const auto &connection = (const FcgiStockConnection &)item;
+	return connection.GetStderr();
+}
 
 /**
  * Let the fcgi_stock know that the client is being aborted.  The
@@ -97,5 +114,10 @@ fcgi_stock_item_get_stderr(const StockItem &item) noexcept;
  * release the process - fcgi_stock_put() stil needs to be called
  * after this function.
  */
-void
-fcgi_stock_aborted(StockItem &item) noexcept;
+static inline void
+fcgi_stock_aborted(StockItem &item) noexcept
+{
+	auto *connection = (FcgiStockConnection *)&item;
+
+	connection->SetAborted();
+}