adam/flenser
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Server_t is now a C++ type.

Browse Source
This commit is contained in:
ADAM David Alan Martin
2026-01-09 23:31:35 -05:00
parent 7fa9114984
commit 4df86c6a22
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/IO/http.cc
+6 -9
View File
@@ -1068,26 +1068,23 @@ static void Http_socket_enqueue(Server_t *srv, SocketData_t* sock)
static Server_t *Http_server_get(const char *host, uint_t port, bool https) static Server_t *Http_server_get(const char *host, uint_t port, bool https)
{ {
int i; for (int i = 0; i < servers.size(); i++) {
Server_t *srv; auto srv = servers.at( i );
for (i = 0; i < servers.size(); i++) {
srv = servers.at( i );
if (port == srv->port && https == srv->https && if (port == srv->port && https == srv->https &&
!dStrAsciiCasecmp(host, srv->host)) !dStrAsciiCasecmp(host, srv->host))
return srv; return srv;
} }
srv = dNew0(Server_t, 1); auto srv = std::make_unique< Server_t >();
srv->queue = dList_new(10); srv->queue = dList_new(10);
srv->running_the_queue = 0; srv->running_the_queue = 0;
srv->host = dStrdup(host); srv->host = dStrdup(host);
srv->port = port; srv->port = port;
srv->https = https; srv->https = https;
servers.push_back( srv ); servers.push_back( srv.get() );
return srv; return srv.release();
} }
static void Http_server_remove(Server_t *srv) static void Http_server_remove(Server_t *srv)
@@ -1113,7 +1110,7 @@ static void Http_servers_remove_all(void)
srv = servers.at( 0 ); srv = servers.at( 0 );
while ((sd = reinterpret_cast< SocketData_t * >( dList_nth_data(srv->queue, 0) ))) { while ((sd = reinterpret_cast< SocketData_t * >( dList_nth_data(srv->queue, 0) ))) {
dList_remove(srv->queue, sd); dList_remove(srv->queue, sd);
dFree(sd); delete sd;
} }
Http_server_remove(srv); Http_server_remove(srv);
} }