From e6cf670066a2e6818c437d088f7b421d9e9d3e23 Mon Sep 17 00:00:00 2001
From: Ozkan Sezer <sezeroz@gmail.com>
Date: Sun, 18 Dec 2011 10:00:36 +0000
Subject: [PATCH] net_win.c, net_sdl.c, net_bsd.c, net_defs.h: removed fixed
 size from net_drivers and net_landrivers. changed net_numdrivers and
 net_numlandrivers into const int and assigned their values using array size
 macros instead of hardcoded numbers.

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@528 af15c1b1-3010-417e-b628-4374ebc0bcbd
---
 Quake/net_bsd.c  | 17 +++++++----------
 Quake/net_defs.h |  8 ++++----
 Quake/net_sdl.c  | 17 +++++++----------
 Quake/net_win.c  | 20 ++++++++------------
 4 files changed, 26 insertions(+), 36 deletions(-)

diff --git a/Quake/net_bsd.c b/Quake/net_bsd.c
index 5231aadb..ff5ee4ef 100644
--- a/Quake/net_bsd.c
+++ b/Quake/net_bsd.c
@@ -27,10 +27,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "net_dgrm.h"
 #include "net_loop.h"
 
-net_driver_t net_drivers[MAX_NET_DRIVERS] =
+net_driver_t net_drivers[] =
 {
-	{
-		"Loopback",
+	{	"Loopback",
 		false,
 		Loop_Init,
 		Loop_Listen,
@@ -46,8 +45,7 @@ net_driver_t net_drivers[MAX_NET_DRIVERS] =
 		Loop_Shutdown
 	},
 
-	{
-		"Datagram",
+	{	"Datagram",
 		false,
 		Datagram_Init,
 		Datagram_Listen,
@@ -64,14 +62,13 @@ net_driver_t net_drivers[MAX_NET_DRIVERS] =
 	}
 };
 
-int net_numdrivers = 2;
+const int net_numdrivers = (sizeof(net_drivers) / sizeof(net_drivers[0]));
 
 #include "net_udp.h"
 
-net_landriver_t	net_landrivers[MAX_NET_DRIVERS] =
+net_landriver_t	net_landrivers[] =
 {
-	{
-		"UDP",
+	{	"UDP",
 		false,
 		0,
 		UDP_Init,
@@ -95,5 +92,5 @@ net_landriver_t	net_landrivers[MAX_NET_DRIVERS] =
 	}
 };
 
-int net_numlandrivers = 1;
+const int net_numlandrivers = (sizeof(net_landrivers) / sizeof(net_landrivers[0]));
 
diff --git a/Quake/net_defs.h b/Quake/net_defs.h
index 0cb59a85..80224e1a 100644
--- a/Quake/net_defs.h
+++ b/Quake/net_defs.h
@@ -193,8 +193,8 @@ typedef struct
 } net_landriver_t;
 
 #define	MAX_NET_DRIVERS		8
-extern net_landriver_t	net_landrivers[MAX_NET_DRIVERS];
-extern int 		net_numlandrivers;
+extern net_landriver_t	net_landrivers[];
+extern const int	net_numlandrivers;
 
 typedef struct
 {
@@ -214,8 +214,8 @@ typedef struct
 	void		(*Shutdown) (void);
 } net_driver_t;
 
-extern net_driver_t	net_drivers[MAX_NET_DRIVERS];
-extern int		net_numdrivers;
+extern net_driver_t	net_drivers[];
+extern const int	net_numdrivers;
 
 /* Loop driver must always be registered the first */
 #define IS_LOOP_DRIVER(p)	((p) == 0)
diff --git a/Quake/net_sdl.c b/Quake/net_sdl.c
index 2e70da16..e56d7af7 100644
--- a/Quake/net_sdl.c
+++ b/Quake/net_sdl.c
@@ -29,10 +29,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "net_dgrm.h"
 #include "net_loop.h"
 
-net_driver_t net_drivers[MAX_NET_DRIVERS] =
+net_driver_t net_drivers[] =
 {
-	{
-		"Loopback",
+	{	"Loopback",
 		false,
 		Loop_Init,
 		Loop_Listen,
@@ -48,8 +47,7 @@ net_driver_t net_drivers[MAX_NET_DRIVERS] =
 		Loop_Shutdown
 	},
 
-	{
-		"Datagram",
+	{	"Datagram",
 		false,
 		Datagram_Init,
 		Datagram_Listen,
@@ -66,14 +64,13 @@ net_driver_t net_drivers[MAX_NET_DRIVERS] =
 	}
 };
 
-int net_numdrivers = 2;
+const int net_numdrivers = (sizeof(net_drivers) / sizeof(net_drivers[0]));
 
 #include "net_sdlnet.h"
 
-net_landriver_t	net_landrivers[MAX_NET_DRIVERS] =
+net_landriver_t	net_landrivers[] =
 {
-	{
-		"UDP",
+	{	"UDP",
 		false,
 		0,
 		SDLN_Init,
@@ -97,5 +94,5 @@ net_landriver_t	net_landrivers[MAX_NET_DRIVERS] =
 	}
 };
 
-int net_numlandrivers = 1;
+const int net_numlandrivers = (sizeof(net_landrivers) / sizeof(net_landrivers[0]));
 
diff --git a/Quake/net_win.c b/Quake/net_win.c
index 847cd2e5..8420dc85 100644
--- a/Quake/net_win.c
+++ b/Quake/net_win.c
@@ -28,10 +28,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "net_dgrm.h"
 #include "net_loop.h"
 
-net_driver_t net_drivers[MAX_NET_DRIVERS] =
+net_driver_t net_drivers[] =
 {
-	{
-		"Loopback",
+	{	"Loopback",
 		false,
 		Loop_Init,
 		Loop_Listen,
@@ -47,8 +46,7 @@ net_driver_t net_drivers[MAX_NET_DRIVERS] =
 		Loop_Shutdown
 	},
 
-	{
-		"Datagram",
+	{	"Datagram",
 		false,
 		Datagram_Init,
 		Datagram_Listen,
@@ -65,16 +63,15 @@ net_driver_t net_drivers[MAX_NET_DRIVERS] =
 	}
 };
 
-int net_numdrivers = 2;
+const int net_numdrivers = (sizeof(net_drivers) / sizeof(net_drivers[0]));
 
 
 #include "net_wins.h"
 #include "net_wipx.h"
 
-net_landriver_t	net_landrivers[MAX_NET_DRIVERS] =
+net_landriver_t	net_landrivers[] =
 {
-	{
-		"Winsock TCPIP",
+	{	"Winsock TCPIP",
 		false,
 		0,
 		WINS_Init,
@@ -97,8 +94,7 @@ net_landriver_t	net_landrivers[MAX_NET_DRIVERS] =
 		WINS_SetSocketPort
 	},
 
-	{
-		"Winsock IPX",
+	{	"Winsock IPX",
 		false,
 		0,
 		WIPX_Init,
@@ -122,5 +118,5 @@ net_landriver_t	net_landrivers[MAX_NET_DRIVERS] =
 	}
 };
 
-int net_numlandrivers = 2;
+const int net_numlandrivers = (sizeof(net_landrivers) / sizeof(net_landrivers[0]));