fte/quakespasm
2
0
Fork 0
mirror of https://github.com/Shpoike/Quakespasm.git synced 2025-02-13 07:21:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

net_win.c, net_sdl.c, net_bsd.c, net_defs.h: removed fixed size from net_drivers

Browse source 
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
This commit is contained in:
Ozkan Sezer 2011-12-18 10:00:36 +00:00
parent 5b9d317733
commit e6cf670066
4 changed files with 26 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
Quake/net_bsd.c
View file

@ -27,10 +27,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "net_dgrm.h" #include "net_dgrm.h"
#include "net_loop.h" #include "net_loop.h"
net_driver_t net_drivers[MAX_NET_DRIVERS] = net_driver_t net_drivers[] =
{ {
{ { "Loopback",
"Loopback",
false, false,
Loop_Init, Loop_Init,
Loop_Listen, Loop_Listen,
@ -46,8 +45,7 @@ net_driver_t net_drivers[MAX_NET_DRIVERS] =
Loop_Shutdown Loop_Shutdown
}, },
{ { "Datagram",
"Datagram",
false, false,
Datagram_Init, Datagram_Init,
Datagram_Listen, 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" #include "net_udp.h"
net_landriver_t net_landrivers[MAX_NET_DRIVERS] = net_landriver_t net_landrivers[] =
{ {
{ { "UDP",
"UDP",
false, false,
0, 0,
UDP_Init, 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]));

8
Quake/net_defs.h
View file

@ -193,8 +193,8 @@ typedef struct
} net_landriver_t; } net_landriver_t;
#define MAX_NET_DRIVERS 8 #define MAX_NET_DRIVERS 8
extern net_landriver_t net_landrivers[MAX_NET_DRIVERS]; extern net_landriver_t net_landrivers[];
extern int net_numlandrivers; extern const int net_numlandrivers;
typedef struct typedef struct
{ {
@ -214,8 +214,8 @@ typedef struct
void (*Shutdown) (void); void (*Shutdown) (void);
} net_driver_t; } net_driver_t;
extern net_driver_t net_drivers[MAX_NET_DRIVERS]; extern net_driver_t net_drivers[];
extern int net_numdrivers; extern const int net_numdrivers;
/* Loop driver must always be registered the first */ /* Loop driver must always be registered the first */
#define IS_LOOP_DRIVER(p) ((p) == 0) #define IS_LOOP_DRIVER(p) ((p) == 0)

17
Quake/net_sdl.c
View file

@ -29,10 +29,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "net_dgrm.h" #include "net_dgrm.h"
#include "net_loop.h" #include "net_loop.h"
net_driver_t net_drivers[MAX_NET_DRIVERS] = net_driver_t net_drivers[] =
{ {
{ { "Loopback",
"Loopback",
false, false,
Loop_Init, Loop_Init,
Loop_Listen, Loop_Listen,
@ -48,8 +47,7 @@ net_driver_t net_drivers[MAX_NET_DRIVERS] =
Loop_Shutdown Loop_Shutdown
}, },
{ { "Datagram",
"Datagram",
false, false,
Datagram_Init, Datagram_Init,
Datagram_Listen, 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" #include "net_sdlnet.h"
net_landriver_t net_landrivers[MAX_NET_DRIVERS] = net_landriver_t net_landrivers[] =
{ {
{ { "UDP",
"UDP",
false, false,
0, 0,
SDLN_Init, 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]));

20
Quake/net_win.c
View file

@ -28,10 +28,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "net_dgrm.h" #include "net_dgrm.h"
#include "net_loop.h" #include "net_loop.h"
net_driver_t net_drivers[MAX_NET_DRIVERS] = net_driver_t net_drivers[] =
{ {
{ { "Loopback",
"Loopback",
false, false,
Loop_Init, Loop_Init,
Loop_Listen, Loop_Listen,
@ -47,8 +46,7 @@ net_driver_t net_drivers[MAX_NET_DRIVERS] =
Loop_Shutdown Loop_Shutdown
}, },
{ { "Datagram",
"Datagram",
false, false,
Datagram_Init, Datagram_Init,
Datagram_Listen, 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_wins.h"
#include "net_wipx.h" #include "net_wipx.h"
net_landriver_t net_landrivers[MAX_NET_DRIVERS] = net_landriver_t net_landrivers[] =
{ {
{ { "Winsock TCPIP",
"Winsock TCPIP",
false, false,
0, 0,
WINS_Init, WINS_Init,
@ -97,8 +94,7 @@ net_landriver_t net_landrivers[MAX_NET_DRIVERS] =
WINS_SetSocketPort WINS_SetSocketPort
}, },
{ { "Winsock IPX",
"Winsock IPX",
false, false,
0, 0,
WIPX_Init, 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]));