[net] Use designated initializers for drivers

Not that I expect anything to change any time soon, but nice to have
the initializers explicitly named.
This commit is contained in:
Bill Currie 2022-04-06 18:46:28 +09:00
parent 3f575ab025
commit 8f56f28ad7
2 changed files with 102 additions and 98 deletions

View file

@ -34,36 +34,37 @@
net_driver_t net_drivers[MAX_NET_DRIVERS] = { net_driver_t net_drivers[MAX_NET_DRIVERS] = {
{ {
"Loopback", .name = "Loopback",
false, .initialized = false,
Loop_Init, .Init = Loop_Init,
Loop_Listen, .Listen = Loop_Listen,
Loop_SearchForHosts, .SearchForHosts = Loop_SearchForHosts,
Loop_Connect, .Connect = Loop_Connect,
Loop_CheckNewConnections, .CheckNewConnections = Loop_CheckNewConnections,
Loop_GetMessage, .QGetMessage = Loop_GetMessage,
Loop_SendMessage, .QSendMessage = Loop_SendMessage,
Loop_SendUnreliableMessage, .SendUnreliableMessage = Loop_SendUnreliableMessage,
Loop_CanSendMessage, .CanSendMessage = Loop_CanSendMessage,
Loop_CanSendUnreliableMessage, .CanSendUnreliableMessage = Loop_CanSendUnreliableMessage,
Loop_Close, .Close = Loop_Close,
Loop_Shutdown} .Shutdown = Loop_Shutdown,
, },
{ {
"Datagram", .name = "Datagram",
false, .initialized = false,
Datagram_Init, .Init = Datagram_Init,
Datagram_Listen, .Listen = Datagram_Listen,
Datagram_SearchForHosts, .SearchForHosts = Datagram_SearchForHosts,
Datagram_Connect, .Connect = Datagram_Connect,
Datagram_CheckNewConnections, .CheckNewConnections = Datagram_CheckNewConnections,
Datagram_GetMessage, .QGetMessage = Datagram_GetMessage,
Datagram_SendMessage, .QSendMessage = Datagram_SendMessage,
Datagram_SendUnreliableMessage, .SendUnreliableMessage = Datagram_SendUnreliableMessage,
Datagram_CanSendMessage, .CanSendMessage = Datagram_CanSendMessage,
Datagram_CanSendUnreliableMessage, .CanSendUnreliableMessage = Datagram_CanSendUnreliableMessage,
Datagram_Close, .Close = Datagram_Close,
Datagram_Shutdown} .Shutdown = Datagram_Shutdown,
},
}; };
int net_numdrivers = 2; int net_numdrivers = 2;
@ -72,26 +73,27 @@ int net_numdrivers = 2;
net_landriver_t net_landrivers[MAX_NET_DRIVERS] = { net_landriver_t net_landrivers[MAX_NET_DRIVERS] = {
{ {
"UDP", .name = "UDP",
false, .initialized = false,
0, .controlSock = 0,
UDP_Init, .Init = UDP_Init,
UDP_Shutdown, .Shutdown = UDP_Shutdown,
UDP_Listen, .Listen = UDP_Listen,
UDP_OpenSocket, .OpenSocket = UDP_OpenSocket,
UDP_CloseSocket, .CloseSocket = UDP_CloseSocket,
UDP_Connect, .Connect = UDP_Connect,
UDP_CheckNewConnections, .CheckNewConnections = UDP_CheckNewConnections,
UDP_Read, .Read = UDP_Read,
UDP_Write, .Write = UDP_Write,
UDP_Broadcast, .Broadcast = UDP_Broadcast,
UDP_AddrToString, .AddrToString = UDP_AddrToString,
UDP_GetSocketAddr, .GetSocketAddr = UDP_GetSocketAddr,
UDP_GetNameFromAddr, .GetNameFromAddr = UDP_GetNameFromAddr,
UDP_GetAddrFromName, .GetAddrFromName = UDP_GetAddrFromName,
UDP_AddrCompare, .AddrCompare = UDP_AddrCompare,
UDP_GetSocketPort, .GetSocketPort = UDP_GetSocketPort,
UDP_SetSocketPort} .SetSocketPort = UDP_SetSocketPort,
},
}; };
int net_numlandrivers = 1; int net_numlandrivers = 1;

View file

@ -33,36 +33,37 @@
net_driver_t net_drivers[MAX_NET_DRIVERS] = { net_driver_t net_drivers[MAX_NET_DRIVERS] = {
{ {
"Loopback", .name = "Loopback",
false, .initialized = false,
Loop_Init, .Init = Loop_Init,
Loop_Listen, .Listen = Loop_Listen,
Loop_SearchForHosts, .SearchForHosts = Loop_SearchForHosts,
Loop_Connect, .Connect = Loop_Connect,
Loop_CheckNewConnections, .CheckNewConnections = Loop_CheckNewConnections,
Loop_GetMessage, .QGetMessage = Loop_GetMessage,
Loop_SendMessage, .QSendMessage = Loop_SendMessage,
Loop_SendUnreliableMessage, .SendUnreliableMessage = Loop_SendUnreliableMessage,
Loop_CanSendMessage, .CanSendMessage = Loop_CanSendMessage,
Loop_CanSendUnreliableMessage, .CanSendUnreliableMessage = Loop_CanSendUnreliableMessage,
Loop_Close, .Close = Loop_Close,
Loop_Shutdown} .Shutdown = Loop_Shutdown,
, },
{ {
"Datagram", .name = "Datagram",
false, .initialized = false,
Datagram_Init, .Init = Datagram_Init,
Datagram_Listen, .Listen = Datagram_Listen,
Datagram_SearchForHosts, .SearchForHosts = Datagram_SearchForHosts,
Datagram_Connect, .Connect = Datagram_Connect,
Datagram_CheckNewConnections, .CheckNewConnections = Datagram_CheckNewConnections,
Datagram_GetMessage, .QGetMessage = Datagram_GetMessage,
Datagram_SendMessage, .QSendMessage = Datagram_SendMessage,
Datagram_SendUnreliableMessage, .SendUnreliableMessage = Datagram_SendUnreliableMessage,
Datagram_CanSendMessage, .CanSendMessage = Datagram_CanSendMessage,
Datagram_CanSendUnreliableMessage, .CanSendUnreliableMessage = Datagram_CanSendUnreliableMessage,
Datagram_Close, .Close = Datagram_Close,
Datagram_Shutdown} .Shutdown = Datagram_Shutdown,
},
}; };
int net_numdrivers = 2; int net_numdrivers = 2;
@ -72,26 +73,27 @@ int net_numdrivers = 2;
net_landriver_t net_landrivers[MAX_NET_DRIVERS] = { net_landriver_t net_landrivers[MAX_NET_DRIVERS] = {
{ {
"Winsock TCPIP", .name = "Winsock TCPIP",
false, .initialized = false,
0, .controlSock = 0,
WINS_Init, .Init = WINS_Init,
WINS_Shutdown, .Shutdown = WINS_Shutdown,
WINS_Listen, .Listen = WINS_Listen,
WINS_OpenSocket, .OpenSocket = WINS_OpenSocket,
WINS_CloseSocket, .CloseSocket = WINS_CloseSocket,
WINS_Connect, .Connect = WINS_Connect,
WINS_CheckNewConnections, .CheckNewConnections = WINS_CheckNewConnections,
WINS_Read, .Read = WINS_Read,
WINS_Write, .Write = WINS_Write,
WINS_Broadcast, .Broadcast = WINS_Broadcast,
WINS_AddrToString, .AddrToString = WINS_AddrToString,
WINS_GetSocketAddr, .GetSocketAddr = WINS_GetSocketAddr,
WINS_GetNameFromAddr, .GetNameFromAddr = WINS_GetNameFromAddr,
WINS_GetAddrFromName, .GetAddrFromName = WINS_GetAddrFromName,
WINS_AddrCompare, .AddrCompare = WINS_AddrCompare,
WINS_GetSocketPort, .GetSocketPort = WINS_GetSocketPort,
WINS_SetSocketPort}, .SetSocketPort = WINS_SetSocketPort,
},
}; };
int net_numlandrivers = 1; int net_numlandrivers = 1;