ouch/inspircd
2
0
Fork 0
mirror of https://github.com/inspircd/inspircd.git synced 2025-03-10 02:59:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix compile errors under debug profile in windows.

Browse Source 
fix some warnings too.

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@10108 e03df62e-2008-0410-955e-edbf42e46eb7
This commit is contained in:
brain 2008-08-06 11:59:17 +00:00
parent eb154d31f7
commit 1ee5092d75
6 changed files with 47 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/configreader.cpp
View File

@ -82,7 +82,6 @@ bool ServerConfig::AddIOHook(Module* iomod, BufferedSocket* is)
else
{
throw ModuleException("BufferedSocket derived class already hooked by another module");
return false;
}
}
@ -136,15 +135,9 @@ bool ServerConfig::CheckOnce(const char* tag, ConfigDataHash &newconf)
int count = ConfValueEnum(newconf, tag);
if (count > 1)
{
throw CoreException("You have more than one <"+std::string(tag)+"> tag, this is not permitted.");
return false;
}
if (count < 1)
{
throw CoreException("You have not defined a <"+std::string(tag)+"> tag, this is required.");
return false;
}
return true;
}

2
src/user_resolver.cpp
View File

@ -36,7 +36,7 @@ void UserResolver::OnLookupComplete(const std::string &result, unsigned int ttl,
/* Check we didnt time out */
if (this->bound_user->registered != REG_ALL)
{
bool lcached;
bool lcached = false;
#ifdef IPV6
if (this->bound_user->GetProtocolFamily() == AF_INET6)
{

2
src/users.cpp
View File

@ -98,7 +98,7 @@ void User::StartDNSLookup()
{
try
{
bool cached;
bool cached = false;
const char* sip = this->GetIPString(false);
/* Special case for 4in6 (Have i mentioned i HATE 4in6?) */

6
win/inspircdVC80.vcproj
View File

@ -68,7 +68,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="dbghelp.lib ws2_32.lib mswsock.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib"
AdditionalDependencies="psapi.lib ws2_32.lib mswsock.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib"
ShowProgress="0"
OutputFile="$(OutDir)/inspircd.exe"
LinkIncremental="1"
@ -785,10 +785,6 @@
RelativePath="..\src\modes\umode_i.cpp"
>
</File>
<File
RelativePath="..\src\modes\umode_n.cpp"
>
</File>
<File
RelativePath="..\src\modes\umode_o.cpp"
>

84
win/inspircd_namedpipe.cpp
View File

@ -19,7 +19,7 @@ void IPCThread::Run()
{
LPTSTR Pipename = "\\\\.\\pipe\\InspIRCdStatus";
while (GetExitFlag() == false)
while (GetExitFlag() == false)
{
Pipe = CreateNamedPipe (Pipename,
PIPE_ACCESS_DUPLEX, // read/write access
@ -123,45 +123,45 @@ void IPCThread::SetResult(int newresult)
}
IPC::IPC(InspIRCd* Srv) : ServerInstance(Srv)
{
/* The IPC pipe is threaded */
thread = new IPCThread(Srv);
Srv->Threads->Create(thread);
}
void IPC::Check()
{
switch (thread->GetStatus())
{
case 'N':
/* No-Operation */
thread->SetResult(0);
thread->ClearStatus();
break;
case '1':
/* Rehash */
ServerInstance->Rehash("due to rehash command from GUI");
thread->SetResult(0);
thread->ClearStatus();
break;
case '2':
/* Shutdown */
thread->SetResult(0);
thread->ClearStatus();
ServerInstance->Exit(EXIT_STATUS_NOERROR);
break;
case '3':
/* Restart */
thread->SetResult(0);
thread->ClearStatus();
ServerInstance->Restart("Restarting due to command from GUI");
break;
}
}
IPC::~IPC()
{
thread->SetExitFlag();
delete thread;
IPC::IPC(InspIRCd* Srv) : ServerInstance(Srv)
{
/* The IPC pipe is threaded */
thread = new IPCThread(Srv);
Srv->Threads->Create(thread);
}
void IPC::Check()
{
switch (thread->GetStatus())
{
case 'N':
/* No-Operation */
thread->SetResult(0);
thread->ClearStatus();
break;
case '1':
/* Rehash */
ServerInstance->Rehash("due to rehash command from GUI");
thread->SetResult(0);
thread->ClearStatus();
break;
case '2':
/* Shutdown */
thread->SetResult(0);
thread->ClearStatus();
ServerInstance->Exit(EXIT_STATUS_NOERROR);
break;
case '3':
/* Restart */
thread->SetResult(0);
thread->ClearStatus();
ServerInstance->Restart("Restarting due to command from GUI");
break;
}
}
IPC::~IPC()
{
thread->SetExitFlag();
delete thread;
}

2
win/inspircd_win32wrapper.h
View File

@ -175,6 +175,8 @@ CoreExport int gettimeofday(struct timeval * tv, void * tz);
#pragma warning(disable:4312) // warning C4312: 'type cast' : conversion from 'int' to 'HANDLE' of greater size
#pragma warning(disable:4355) // warning C4355: 'this' : used in base member initializer list
#pragma warning(disable:4996) // warning C4996: 'std::_Traits_helper::move_s' was declared deprecated
#pragma warning(disable:4706) // warning C4706: assignment within conditional expression
#pragma warning(disable:4201) // mmsystem.h generates this warning
/* Mehhhh... typedefs. */