Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Warning fix.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34316 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-05-24 10:10:40 +00:00
parent 7c8b87a78a
commit 15575028ea
1 changed files with 81 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

152
src/unix/dialup.cpp
View File

@@ -82,16 +82,16 @@ public:
~wxDialUpManagerImpl();
/** Could the dialup manager be initialized correctly? If this function
returns FALSE, no other functions will work neither, so it's a good idea
returns false, no other functions will work neither, so it's a good idea
to call this function and check its result before calling any other
wxDialUpManager methods.
*/
virtual bool IsOk() const
{ return TRUE; }
{ return true; }
/** The simplest way to initiate a dial up: this function dials the given
ISP (exact meaning of the parameter depends on the platform), returns
TRUE on success or FALSE on failure and logs the appropriate error
true on success or false on failure and logs the appropriate error
message in the latter case.
@param nameOfISP optional paramater for dial program
@param username unused
@@ -105,7 +105,7 @@ public:
// Hang up the currently active dial up connection.
virtual bool HangUp();
// returns TRUE if the computer is connected to the network: under Windows,
// returns true if the computer is connected to the network: under Windows,
// this just means that a RAS connection exists, under Unix we check that
// the "well-known host" (as specified by SetWellKnownHost) is reachable
virtual bool IsOnline() const
@@ -117,11 +117,11 @@ public:
// do we have a constant net connection?
virtual bool IsAlwaysOnline() const;
// returns TRUE if (async) dialing is in progress
// returns true if (async) dialing is in progress
virtual bool IsDialing() const
{ return m_DialProcess != NULL; }
// cancel dialing the number initiated with Dial(async = TRUE)
// cancel dialing the number initiated with Dial(async = true)
// NB: this won't result in DISCONNECTED event being sent
virtual bool CancelDialing();
@@ -132,7 +132,7 @@ public:
// so, in general, the user should be allowed to override it. This function
// allows to forcefully set the online status - whatever our internal
// algorithm may think about it.
virtual void SetOnlineStatus(bool isOnline = TRUE)
virtual void SetOnlineStatus(bool isOnline = true)
{ m_IsOnline = isOnline ? Net_Connected : Net_No; }
// set misc wxDialUpManager options
@@ -144,7 +144,7 @@ public:
// Windows, the notification about the change of connection status is
// instantenous.
//
// Returns FALSE if couldn't set up automatic check for online status.
// Returns false if couldn't set up automatic check for online status.
virtual bool EnableAutoCheckOnlineStatus(size_t nSeconds);
// disable automatic check for connection status change - notice that the
@@ -222,7 +222,7 @@ private:
friend class wxDialProcess;
// determine status
void CheckStatus(bool fromAsync = FALSE) const;
void CheckStatus(bool fromAsync = false) const;
// real status check
void CheckStatusInternal();
@@ -278,7 +278,7 @@ public:
if(m_DupMan)
{
m_DupMan->m_DialProcess = NULL;
m_DupMan->CheckStatus(TRUE);
m_DupMan->CheckStatus(true);
}
}
private:
@@ -327,54 +327,54 @@ wxDialUpManagerImpl::Dial(const wxString &isp,
const wxString & WXUNUSED(password),
bool async)
{
if(m_IsOnline == Net_Connected)
return FALSE;
m_ISPname = isp;
wxString cmd;
if(m_ConnectCommand.Find(wxT("%s")))
cmd.Printf(m_ConnectCommand,m_ISPname.c_str());
else
cmd = m_ConnectCommand;
if(m_IsOnline == Net_Connected)
return false;
m_ISPname = isp;
wxString cmd;
if(m_ConnectCommand.Find(wxT("%s")))
cmd.Printf(m_ConnectCommand,m_ISPname.c_str());
else
cmd = m_ConnectCommand;
if ( async )
{
m_DialProcess = new wxDialProcess(this);
m_DialPId = (int)wxExecute(cmd, FALSE, m_DialProcess);
if(m_DialPId == 0)
{
delete m_DialProcess;
m_DialProcess = NULL;
return FALSE;
}
else
return TRUE;
}
else
return wxExecute(cmd, /* sync */ TRUE) == 0;
if ( async )
{
m_DialProcess = new wxDialProcess(this);
m_DialPId = (int)wxExecute(cmd, false, m_DialProcess);
if(m_DialPId == 0)
{
delete m_DialProcess;
m_DialProcess = NULL;
return false;
}
else
return true;
}
else
return wxExecute(cmd, /* sync */ true) == 0;
}
bool wxDialUpManagerImpl::HangUp()
{
if(m_IsOnline == Net_No)
return FALSE;
if(IsDialing())
{
wxLogError(_("Already dialling ISP."));
return FALSE;
}
wxString cmd;
if(m_HangUpCommand.Find(wxT("%s")))
cmd.Printf(m_HangUpCommand,m_ISPname.c_str(), m_DialProcess);
else
cmd = m_HangUpCommand;
return wxExecute(cmd, /* sync */ TRUE) == 0;
if(m_IsOnline == Net_No)
return false;
if(IsDialing())
{
wxLogError(_("Already dialling ISP."));
return false;
}
wxString cmd;
if(m_HangUpCommand.Find(wxT("%s")))
cmd.Printf(m_HangUpCommand,m_ISPname.c_str(), m_DialProcess);
else
cmd = m_HangUpCommand;
return wxExecute(cmd, /* sync */ true) == 0;
}
bool wxDialUpManagerImpl::CancelDialing()
{
if(! IsDialing())
return FALSE;
return false;
return kill(m_DialPId, SIGTERM) > 0;
}
@@ -640,10 +640,10 @@ int
wxDialUpManagerImpl::CheckIfconfig()
{
#ifdef __VMS
m_CanUseIfconfig = 0;
return -1;
m_CanUseIfconfig = 0;
return -1;
#else
// assume that the test doesn't work
// assume that the test doesn't work
int netDevice = NetDevice_Unknown;
// first time check for ifconfig location
@@ -691,8 +691,13 @@ wxDialUpManagerImpl::CheckIfconfig()
// VZ: a wild guess (but without it, ifconfig fails completely)
cmd << wxT(" ppp0");
#else
# pragma warning "No ifconfig information for this OS."
m_CanUseIfconfig = 0;
#if defined(__GNUG__)
#warning "No ifconfig information for this OS."
#else
#pragma warning "No ifconfig information for this OS."
#endif
m_CanUseIfconfig = 0;
return -1;
#endif
cmd << wxT(" >") << tmpfile << wxT('\'');
@@ -700,7 +705,7 @@ wxDialUpManagerImpl::CheckIfconfig()
so we could let ifconfig write directly to the tmpfile, but
this does not work. That should be faster, as it doesn<73>t call
the shell first. I have no idea why. :-( (KB) */
if ( wxExecute(cmd,TRUE /* sync */) == 0 )
if ( wxExecute(cmd,true /* sync */) == 0 )
{
m_CanUseIfconfig = 1;
wxFFile file;
@@ -711,8 +716,8 @@ wxDialUpManagerImpl::CheckIfconfig()
{
// FIXME shouldn't we grep for "^ppp"? (VZ)
bool hasModem = FALSE,
hasLAN = FALSE;
bool hasModem = false,
hasLAN = false;
#if defined(__SOLARIS__) || defined (__SUNOS__)
// dialup device under SunOS/Solaris
@@ -727,7 +732,7 @@ wxDialUpManagerImpl::CheckIfconfig()
hasModem = strstr(output, "ppp") != NULL; // PPP
#elif defined(__HPUX__)
// if could run ifconfig on interface, then it exists
hasModem = TRUE;
hasModem = true;
#endif
netDevice = NetDevice_None;
@@ -779,26 +784,31 @@ wxDialUpManagerImpl::NetConnection wxDialUpManagerImpl::CheckPing()
return Net_Unknown;
}
wxLogNull ln; // suppress all error messages
wxASSERT(m_PingPath.length());
wxString cmd;
cmd << m_PingPath << wxT(' ');
wxLogNull ln; // suppress all error messages
wxASSERT(m_PingPath.length());
wxString cmd;
cmd << m_PingPath << wxT(' ');
#if defined(__SOLARIS__) || defined (__SUNOS__)
// nothing to add to ping command
// nothing to add to ping command
#elif defined(__LINUX__) || defined (__BSD__) || defined( __VMS )
cmd << wxT("-c 1 "); // only ping once
cmd << wxT("-c 1 "); // only ping once
#elif defined(__HPUX__)
cmd << wxT("64 1 "); // only ping once (need also specify the packet size)
cmd << wxT("64 1 "); // only ping once (need also specify the packet size)
#else
# pragma warning "No Ping information for this OS."
m_CanUsePing = 0;
return Net_Unknown;
#if defined(__GNUG__)
#warning "No Ping information for this OS."
#else
#pragma warning "No Ping information for this OS."
#endif
m_CanUsePing = 0;
return Net_Unknown;
#endif
cmd << m_BeaconHost;
if(wxExecute(cmd, TRUE /* sync */) == 0)
return Net_Connected;
else
return Net_No;
cmd << m_BeaconHost;
if(wxExecute(cmd, true /* sync */) == 0)
return Net_Connected;
else
return Net_No;
}
/* static */