reactos/rosev_ircsystem
1
0
Fork 0
mirror of https://github.com/reactos/rosev_ircsystem.git synced 2025-02-18 10:53:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[ROSEV_IRCSYSTEM]

Browse Source 
Fix some -Wconversion-null warnings emitted by newer GCC versions.

svn path=/trunk/rosev_ircsystem/; revision=2080
This commit is contained in:
Colin Finck 2013-12-31 15:32:15 +00:00
parent 08d1c295bf
commit 6aea08839d
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/CConfiguration.cpp
View File

@ -2,7 +2,7 @@
* PROJECT: ReactOS Deutschland e.V. IRC System
* LICENSE: GNU GPL v2 or any later version as published by the Free Software Foundation
* with the additional exemption that compiling, linking, and/or using OpenSSL is allowed
* COPYRIGHT: Copyright 2010-2011 ReactOS Deutschland e.V. <deutschland@reactos.org>
* COPYRIGHT: Copyright 2010-2013 ReactOS Deutschland e.V. <deutschland@reactos.org>
* AUTHORS: Colin Finck <colin@reactos.org>
*/
@ -124,7 +124,7 @@ CConfiguration::ReadConfigFiles()
MotdStream.close();
/* Users file */
boost::program_options::parsed_options UsersParsedOptions(boost::program_options::parse_config_file<char>(std::string(m_ConfigPath).append(USERS_FILE).c_str(), NULL, true));
boost::program_options::parsed_options UsersParsedOptions(boost::program_options::parse_config_file<char>(std::string(m_ConfigPath).append(USERS_FILE).c_str(), 0, true));
for(std::vector< boost::program_options::basic_option<char> >::const_iterator it = UsersParsedOptions.options.begin(); it != UsersParsedOptions.options.end(); ++it)
{
/* Convert the hexadecimal string passhash into a binary one */

8
src/CIRCServer.cpp
View File

@ -2,7 +2,7 @@
* PROJECT: ReactOS Deutschland e.V. IRC System
* LICENSE: GNU GPL v2 or any later version as published by the Free Software Foundation
* with the additional exemption that compiling, linking, and/or using OpenSSL is allowed
* COPYRIGHT: Copyright 2010-2011 ReactOS Deutschland e.V. <deutschland@reactos.org>
* COPYRIGHT: Copyright 2010-2013 ReactOS Deutschland e.V. <deutschland@reactos.org>
* AUTHORS: Colin Finck <colin@reactos.org>
*/
@ -208,7 +208,7 @@ CIRCServer::Init()
std::string ConfigPath(m_Configuration.GetConfigPath());
std::map< std::string, std::set<std::string> > ChannelUsersMap;
boost::program_options::parsed_options ChannelUsersParsedOptions(boost::program_options::parse_config_file<char>(std::string(ConfigPath).append(CHANNEL_USERS_FILE).c_str(), NULL, true));
boost::program_options::parsed_options ChannelUsersParsedOptions(boost::program_options::parse_config_file<char>(std::string(ConfigPath).append(CHANNEL_USERS_FILE).c_str(), 0, true));
for(std::vector< boost::program_options::basic_option<char> >::const_iterator OptionIt = ChannelUsersParsedOptions.options.begin(); OptionIt != ChannelUsersParsedOptions.options.end(); ++OptionIt)
{
/* All config information is used for comparison, so lowercase it */
@ -233,7 +233,7 @@ CIRCServer::Init()
/* Check which channels allow observers. */
std::set<std::string> ChannelObserversSet;
boost::program_options::parsed_options ChannelObserversParsedOptions(boost::program_options::parse_config_file<char>(std::string(ConfigPath).append(CHANNEL_OBSERVERS_FILE).c_str(), NULL, true));
boost::program_options::parsed_options ChannelObserversParsedOptions(boost::program_options::parse_config_file<char>(std::string(ConfigPath).append(CHANNEL_OBSERVERS_FILE).c_str(), 0, true));
for(std::vector< boost::program_options::basic_option<char> >::const_iterator OptionIt = ChannelObserversParsedOptions.options.begin(); OptionIt != ChannelObserversParsedOptions.options.end(); ++OptionIt)
{
/* Lowercase the channel name for comparison */
@ -245,7 +245,7 @@ CIRCServer::Init()
}
/* Add the preset channels */
boost::program_options::parsed_options ChannelsParsedOptions(boost::program_options::parse_config_file<char>(std::string(ConfigPath).append(CHANNELS_FILE).c_str(), NULL, true));
boost::program_options::parsed_options ChannelsParsedOptions(boost::program_options::parse_config_file<char>(std::string(ConfigPath).append(CHANNELS_FILE).c_str(), 0, true));
if(ChannelsParsedOptions.options.empty())
BOOST_THROW_EXCEPTION(Error("You need to specify at least one channel!"));

4
src/CVoteBotManager.cpp
View File

@ -2,7 +2,7 @@
* PROJECT: ReactOS Deutschland e.V. IRC System
* LICENSE: GNU GPL v2 or any later version as published by the Free Software Foundation
* with the additional exemption that compiling, linking, and/or using OpenSSL is allowed
* COPYRIGHT: Copyright 2010 ReactOS Deutschland e.V. <deutschland@reactos.org>
* COPYRIGHT: Copyright 2010-2013 ReactOS Deutschland e.V. <deutschland@reactos.org>
* AUTHORS: Colin Finck <colin@reactos.org>
*/
@ -31,7 +31,7 @@ CVoteBotManager::Init()
}
/* Create VoteBots for all entries in the VoteBotManager configuration */
boost::program_options::parsed_options ParsedOptions(boost::program_options::parse_config_file<char>(ConfigFile.c_str(), NULL, true));
boost::program_options::parsed_options ParsedOptions(boost::program_options::parse_config_file<char>(ConfigFile.c_str(), 0, true));
for(std::vector< boost::program_options::basic_option<char> >::const_iterator it = ParsedOptions.options.begin(); it != ParsedOptions.options.end(); ++it)
{
std::auto_ptr<CVoteBot> Bot(new CVoteBot(m_IRCServer, it->string_key, it->value[0]));