Overhaul to console structure, a bit
This commit is contained in:
+10
-10
@@ -61,7 +61,7 @@ sys_socket_t WIPX_Init (void)
|
||||
err = WSAStartup(MAKEWORD(1,1), &winsockdata);
|
||||
if (err != 0)
|
||||
{
|
||||
Con_SafePrintf("Winsock initialization failed (%s)\n",
|
||||
console::safe_print("Winsock initialization failed (%s)\n",
|
||||
socketerror(err));
|
||||
return INVALID_SOCKET;
|
||||
}
|
||||
@@ -75,7 +75,7 @@ sys_socket_t WIPX_Init (void)
|
||||
if (gethostname(buff, MAXHOSTNAMELEN) != 0)
|
||||
{
|
||||
err = SOCKETERRNO;
|
||||
Con_SafePrintf("WIPX_Init: WARNING: gethostname failed (%s)\n",
|
||||
console::safe_print("WIPX_Init: WARNING: gethostname failed (%s)\n",
|
||||
socketerror(err));
|
||||
}
|
||||
else
|
||||
@@ -85,7 +85,7 @@ sys_socket_t WIPX_Init (void)
|
||||
|
||||
if ((net_controlsocket = WIPX_OpenSocket(0)) == INVALID_SOCKET)
|
||||
{
|
||||
Con_SafePrintf("WIPX_Init: Unable to open control socket, IPX disabled\n");
|
||||
console::safe_print("WIPX_Init: Unable to open control socket, IPX disabled\n");
|
||||
if (--winsock_initialized == 0)
|
||||
WSACleanup ();
|
||||
return INVALID_SOCKET;
|
||||
@@ -102,7 +102,7 @@ sys_socket_t WIPX_Init (void)
|
||||
if (colon)
|
||||
*colon = 0;
|
||||
|
||||
Con_SafePrintf("IPX Initialized\n");
|
||||
console::safe_print("IPX Initialized\n");
|
||||
ipxAvailable = true;
|
||||
|
||||
return net_controlsocket;
|
||||
@@ -155,14 +155,14 @@ sys_socket_t WIPX_OpenSocket (int port)
|
||||
}
|
||||
if (handle == IPXSOCKETS)
|
||||
{
|
||||
Con_SafePrintf("WIPX_OpenSocket: Out of free IPX handles.\n");
|
||||
console::safe_print("WIPX_OpenSocket: Out of free IPX handles.\n");
|
||||
return INVALID_SOCKET;
|
||||
}
|
||||
|
||||
if ((newsocket = socket (AF_IPX, SOCK_DGRAM, NSPROTO_IPX)) == INVALID_SOCKET)
|
||||
{
|
||||
err = SOCKETERRNO;
|
||||
Con_SafePrintf("WIPX_OpenSocket: %s\n", socketerror(err));
|
||||
console::safe_print("WIPX_OpenSocket: %s\n", socketerror(err));
|
||||
return INVALID_SOCKET;
|
||||
}
|
||||
|
||||
@@ -194,7 +194,7 @@ sys_socket_t WIPX_OpenSocket (int port)
|
||||
|
||||
ErrorReturn:
|
||||
err = SOCKETERRNO;
|
||||
Con_SafePrintf("WIPX_OpenSocket: %s\n", socketerror(err));
|
||||
console::safe_print("WIPX_OpenSocket: %s\n", socketerror(err));
|
||||
closesocket (newsocket);
|
||||
return INVALID_SOCKET;
|
||||
}
|
||||
@@ -253,7 +253,7 @@ int WIPX_Read (sys_socket_t handle, byte *buf, int len, struct qsockaddr *addr)
|
||||
int err = SOCKETERRNO;
|
||||
if (err == NET_EWOULDBLOCK || err == NET_ECONNREFUSED)
|
||||
return 0;
|
||||
Con_SafePrintf ("WIPX_Read, recvfrom: %s\n", socketerror(err));
|
||||
console::safe_print ("WIPX_Read, recvfrom: %s\n", socketerror(err));
|
||||
}
|
||||
|
||||
if (ret < 4)
|
||||
@@ -292,7 +292,7 @@ int WIPX_Write (sys_socket_t handle, byte *buf, int len, struct qsockaddr *addr)
|
||||
int err = SOCKETERRNO;
|
||||
if (err == NET_EWOULDBLOCK)
|
||||
return 0;
|
||||
Con_SafePrintf ("WIPX_Write, sendto: %s\n", socketerror(err));
|
||||
console::safe_print ("WIPX_Write, sendto: %s\n", socketerror(err));
|
||||
}
|
||||
|
||||
return ret;
|
||||
@@ -369,7 +369,7 @@ int WIPX_GetSocketAddr (sys_socket_t handle, struct qsockaddr *addr)
|
||||
{
|
||||
int err = SOCKETERRNO;
|
||||
/* FIXME: what action should be taken?... */
|
||||
Con_SafePrintf ("WIPX, getsockname: %s\n", socketerror(err));
|
||||
console::safe_print ("WIPX, getsockname: %s\n", socketerror(err));
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
||||
Reference in New Issue
Block a user