From 144dcb7ff8a49142d7047bf2a1e5e8fc8cea176f Mon Sep 17 00:00:00 2001 From: Kevin Shanahan Date: Sat, 22 Dec 2012 14:30:26 +1030 Subject: [PATCH] net: constify NET_Connect interface Signed-off-by: Kevin Shanahan --- NQ/net.h | 8 ++++---- NQ/net_dgrm.c | 4 ++-- NQ/net_dgrm.h | 2 +- NQ/net_loop.c | 2 +- NQ/net_loop.h | 2 +- NQ/net_main.c | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NQ/net.h b/NQ/net.h index cf7c870..06c1cb6 100644 --- a/NQ/net.h +++ b/NQ/net.h @@ -164,7 +164,7 @@ extern qsocket_t *net_activeSockets; extern qsocket_t *net_freeSockets; typedef struct net_landriver_s { - char *name; + const char *name; qboolean initialized; int controlSock; int (*Init)(void); @@ -186,12 +186,12 @@ extern int net_numlandrivers; extern net_landriver_t net_landrivers[]; typedef struct net_driver_s { - char *name; + const char *name; qboolean initialized; int (*Init)(void); void (*Listen)(qboolean state); void (*SearchForHosts)(qboolean xmit); - qsocket_t *(*Connect)(char *host); + qsocket_t *(*Connect)(const char *host); qsocket_t *(*CheckNewConnections)(void); int (*QGetMessage)(qsocket_t *sock); int (*QSendMessage)(qsocket_t *sock, sizebuf_t *data); @@ -268,7 +268,7 @@ struct qsocket_s *NET_CheckNewConnections(void); /* * called by client to connect to a host. Returns -1 if not able to */ -struct qsocket_s *NET_Connect(char *host); +struct qsocket_s *NET_Connect(const char *host); /* * Returns true or false if the given qsocket can currently accept a message diff --git a/NQ/net_dgrm.c b/NQ/net_dgrm.c index 48836c8..916b335 100644 --- a/NQ/net_dgrm.c +++ b/NQ/net_dgrm.c @@ -1180,7 +1180,7 @@ Datagram_SearchForHosts(qboolean xmit) static qsocket_t * -_Datagram_Connect(char *host, net_landriver_t *driver) +_Datagram_Connect(const char *host, net_landriver_t *driver) { netadr_t sendaddr; netadr_t readaddr; @@ -1318,7 +1318,7 @@ _Datagram_Connect(char *host, net_landriver_t *driver) } qsocket_t * -Datagram_Connect(char *host) +Datagram_Connect(const char *host) { int i; qsocket_t *ret = NULL; diff --git a/NQ/net_dgrm.h b/NQ/net_dgrm.h index ec0bf22..c5093a9 100644 --- a/NQ/net_dgrm.h +++ b/NQ/net_dgrm.h @@ -29,7 +29,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. int Datagram_Init(void); void Datagram_Listen(qboolean state); void Datagram_SearchForHosts(qboolean xmit); -qsocket_t *Datagram_Connect(char *host); +qsocket_t *Datagram_Connect(const char *host); qsocket_t *Datagram_CheckNewConnections(void); int Datagram_GetMessage(qsocket_t *sock); int Datagram_SendMessage(qsocket_t *sock, sizebuf_t *data); diff --git a/NQ/net_loop.c b/NQ/net_loop.c index d4c54c7..a1e03db 100644 --- a/NQ/net_loop.c +++ b/NQ/net_loop.c @@ -71,7 +71,7 @@ Loop_SearchForHosts(qboolean xmit) qsocket_t * -Loop_Connect(char *host) +Loop_Connect(const char *host) { if (strcmp(host, "local") != 0) return NULL; diff --git a/NQ/net_loop.h b/NQ/net_loop.h index da73526..37816c9 100644 --- a/NQ/net_loop.h +++ b/NQ/net_loop.h @@ -28,7 +28,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. int Loop_Init(void); void Loop_Listen(qboolean state); void Loop_SearchForHosts(qboolean xmit); -qsocket_t *Loop_Connect(char *host); +qsocket_t *Loop_Connect(const char *host); qsocket_t *Loop_CheckNewConnections(void); int Loop_GetMessage(qsocket_t *sock); int Loop_SendMessage(qsocket_t *sock, sizebuf_t *data); diff --git a/NQ/net_main.c b/NQ/net_main.c index 95a473f..6fe2288 100644 --- a/NQ/net_main.c +++ b/NQ/net_main.c @@ -378,7 +378,7 @@ int hostCacheCount = 0; hostcache_t hostcache[HOSTCACHESIZE]; qsocket_t * -NET_Connect(char *host) +NET_Connect(const char *host) { qsocket_t *ret; int i, n;