X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a45068485c8fbc9db4daf77c724747992f81a90e..a9102b3671a45d116d781b0c8e90d2e9a84fbdcb:/src/msw/gsocket.cpp diff --git a/src/msw/gsocket.cpp b/src/msw/gsocket.cpp index 86cbb3bfef..fbe81c4a01 100644 --- a/src/msw/gsocket.cpp +++ b/src/msw/gsocket.cpp @@ -1,6 +1,6 @@ /* ------------------------------------------------------------------------- * Project: GSocket (Generic Socket) - * Name: gsocket.c + * Name: gsocket.cpp * Author: Guillermo Rodriguez Garcia * Purpose: GSocket main MSW file * Licence: The wxWindows licence @@ -8,9 +8,12 @@ * ------------------------------------------------------------------------- */ -/* - * PLEASE don't put C++ comments here - this is a C source file. - */ +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + +#ifdef __BORLANDC__ + #pragma hdrstop +#endif #ifdef _MSC_VER /* RPCNOTIFICATION_ROUTINE in rasasync.h (included from winsock.h), @@ -81,7 +84,7 @@ /* Table of GUI-related functions. We must call them indirectly because * of wxBase and GUI separation: */ -static class GSocketGUIFunctionsTable *gs_gui_functions; +static GSocketGUIFunctionsTable *gs_gui_functions; class GSocketGUIFunctionsTableNull: public GSocketGUIFunctionsTable { @@ -101,17 +104,17 @@ void GSocketGUIFunctionsTableNull::OnExit() {} bool GSocketGUIFunctionsTableNull::CanUseEventLoop() { return false; } -bool GSocketGUIFunctionsTableNull::Init_Socket(GSocket *socket) +bool GSocketGUIFunctionsTableNull::Init_Socket(GSocket *WXUNUSED(socket)) { return true; } -void GSocketGUIFunctionsTableNull::Destroy_Socket(GSocket *socket) +void GSocketGUIFunctionsTableNull::Destroy_Socket(GSocket *WXUNUSED(socket)) {} -void GSocketGUIFunctionsTableNull::Enable_Events(GSocket *socket) +void GSocketGUIFunctionsTableNull::Enable_Events(GSocket *WXUNUSED(socket)) {} -void GSocketGUIFunctionsTableNull::Disable_Events(GSocket *socket) +void GSocketGUIFunctionsTableNull::Disable_Events(GSocket *WXUNUSED(socket)) {} /* Global initialisers */ -void GSocket_SetGUIFunctions(struct GSocketGUIFunctionsTable *guifunc) +void GSocket_SetGUIFunctions(GSocketGUIFunctionsTable *guifunc) { gs_gui_functions = guifunc; } @@ -122,7 +125,7 @@ int GSocket_Init(void) if (!gs_gui_functions) { - static class GSocketGUIFunctionsTableNull table; + static GSocketGUIFunctionsTableNull table; gs_gui_functions = &table; } if ( !gs_gui_functions->OnInit() ) @@ -160,13 +163,13 @@ GSocket::GSocket() m_local = NULL; m_peer = NULL; m_error = GSOCK_NOERROR; - m_server = FALSE; - m_stream = TRUE; + m_server = false; + m_stream = true; m_non_blocking = false; m_timeout.tv_sec = 10 * 60; /* 10 minutes */ m_timeout.tv_usec = 0; - m_establishing = FALSE; - m_reusable = FALSE; + m_establishing = false; + m_reusable = false; assert(gs_gui_functions); /* Per-socket GUI-specific initialization */ @@ -371,8 +374,8 @@ GSocketError GSocket::SetServer() } /* Initialize all fields */ - m_server = TRUE; - m_stream = TRUE; + m_server = true; + m_stream = true; /* Create the socket */ m_fd = socket(m_local->m_realfamily, SOCK_STREAM, 0); @@ -455,7 +458,7 @@ GSocket *GSocket::WaitConnection() /* Wait for a connection (with timeout) */ if (Input_Timeout() == GSOCK_TIMEDOUT) { - GSocket_destroy(connection); + delete connection; /* m_error set by _GSocket_Input_Timeout */ return NULL; } @@ -469,19 +472,19 @@ GSocket *GSocket::WaitConnection() else m_error = GSOCK_IOERR; - GSocket_destroy(connection); + delete connection; return NULL; } /* Initialize all fields */ - connection->m_server = FALSE; - connection->m_stream = TRUE; + connection->m_server = false; + connection->m_stream = true; /* Setup the peer address field */ connection->m_peer = GAddress_new(); if (!connection->m_peer) { - GSocket_destroy(connection); + delete connection; m_error = GSOCK_MEMERR; return NULL; } @@ -489,7 +492,7 @@ GSocket *GSocket::WaitConnection() if (err != GSOCK_NOERROR) { GAddress_destroy(connection->m_peer); - GSocket_destroy(connection); + delete connection; m_error = err; return NULL; } @@ -505,17 +508,17 @@ GSocket *GSocket::WaitConnection() * make the appropriate setsockopt() call. * Implemented as a GSocket function because clients (ie, wxSocketServer) * don't have access to the GSocket struct information. -* Returns TRUE if the flag was set correctly, FALSE if an error occured +* Returns true if the flag was set correctly, false if an error occured * (ie, if the parameter was NULL) */ -int GSocket::SetReusable() +bool GSocket::SetReusable() { /* socket must not be null, and must not be in use/already bound */ if (this && m_fd == INVALID_SOCKET) { - m_reusable = TRUE; - return TRUE; + m_reusable = true; + return true; } - return FALSE; + return false; } /* Client specific parts */ @@ -567,8 +570,8 @@ GSocketError GSocket::Connect(GSocketStream stream) /* Streamed or dgram socket? */ m_stream = (stream == GSOCK_STREAMED); - m_server = FALSE; - m_establishing = FALSE; + m_server = false; + m_establishing = false; /* Create the socket */ m_fd = socket(m_peer->m_realfamily, @@ -616,7 +619,7 @@ GSocketError GSocket::Connect(GSocketStream stream) */ if ((err == WSAEWOULDBLOCK) && (m_non_blocking)) { - m_establishing = TRUE; + m_establishing = true; m_error = GSOCK_WOULDBLOCK; return GSOCK_WOULDBLOCK; } @@ -664,8 +667,8 @@ GSocketError GSocket::SetNonOriented() } /* Initialize all fields */ - m_stream = FALSE; - m_server = FALSE; + m_stream = false; + m_server = false; /* Create the socket */ m_fd = socket(m_local->m_realfamily, SOCK_DGRAM, 0); @@ -810,7 +813,7 @@ GSocketEventFlags GSocket::Select(GSocketEventFlags flags) */ if ((m_detected & GSOCK_LOST_FLAG) != 0) { - m_establishing = FALSE; + m_establishing = false; return (GSOCK_LOST_FLAG & flags); } @@ -842,7 +845,7 @@ GSocketEventFlags GSocket::Select(GSocketEventFlags flags) else { m_detected = GSOCK_LOST_FLAG; - m_establishing = FALSE; + m_establishing = false; /* LOST event: Abort any further processing */ return (GSOCK_LOST_FLAG & flags); @@ -858,7 +861,7 @@ GSocketEventFlags GSocket::Select(GSocketEventFlags flags) int error; SOCKLEN_T len = sizeof(error); - m_establishing = FALSE; + m_establishing = false; getsockopt(m_fd, SOL_SOCKET, SO_ERROR, (char*)&error, &len); @@ -884,7 +887,7 @@ GSocketEventFlags GSocket::Select(GSocketEventFlags flags) /* Check for exceptions and errors (is this useful in Unices?) */ if (FD_ISSET(m_fd, &exceptfds)) { - m_establishing = FALSE; + m_establishing = false; m_detected = GSOCK_LOST_FLAG; /* LOST event: Abort any further processing */ @@ -1525,24 +1528,15 @@ GSocketError _GAddress_Init_UNIX(GAddress *address) return GSOCK_INVADDR; } -GSocketError GAddress_UNIX_SetPath(GAddress *address, const char *path) +GSocketError GAddress_UNIX_SetPath(GAddress *address, const char *WXUNUSED(path)) { -#if defined(__BORLANDC__) - /* prevents unused variable message in Borland */ - (void)path; -#endif assert (address != NULL); address->m_error = GSOCK_INVADDR; return GSOCK_INVADDR; } -GSocketError GAddress_UNIX_GetPath(GAddress *address, char *path, size_t sbuf) +GSocketError GAddress_UNIX_GetPath(GAddress *address, char *WXUNUSED(path), size_t WXUNUSED(sbuf)) { -#if defined(__BORLANDC__) - /* prevents unused variable message in Borland */ - (void)path; - (void)sbuf; -#endif assert (address != NULL); address->m_error = GSOCK_INVADDR; return GSOCK_INVADDR;