Mercurial > irccd
changeset 597:3763a7e63776
Common: remove sys::program_name function
| author | David Demelier <markand@malikania.fr> |
|---|---|
| date | Wed, 06 Dec 2017 13:54:28 +0100 |
| parents | 35832b7f4f9d |
| children | a3eeb5e9c482 |
| files | irccd/main.cpp libcommon/irccd/logger.cpp libcommon/irccd/system.cpp libcommon/irccd/system.hpp |
| diffstat | 4 files changed, 6 insertions(+), 26 deletions(-) [+] |
line wrap: on
line diff
--- a/irccd/main.cpp Wed Dec 06 11:42:44 2017 +0100 +++ b/irccd/main.cpp Wed Dec 06 13:54:28 2017 +0100 @@ -70,7 +70,7 @@ void usage() { - std::cerr << "usage: " << sys::program_name() << " [options...]\n\n"; + std::cerr << "usage: irccd [options...]\n\n"; std::cerr << "Available options:\n"; std::cerr << " -c, --config file specify the configuration file\n"; std::cerr << " -f, --foreground do not run as a daemon\n"; @@ -146,7 +146,7 @@ log::set_verbose(true); } } catch (const std::exception& ex) { - log::warning() << sys::program_name() << ": " << ex.what() << std::endl; + log::warning() << "irccd: " << ex.what() << std::endl; usage(); }
--- a/libcommon/irccd/logger.cpp Wed Dec 06 11:42:44 2017 +0100 +++ b/libcommon/irccd/logger.cpp Wed Dec 06 13:54:28 2017 +0100 @@ -216,7 +216,7 @@ syslog_logger::syslog_logger() { - openlog(sys::program_name().c_str(), LOG_PID, LOG_DAEMON); + openlog("irccd", LOG_PID, LOG_DAEMON); } syslog_logger::~syslog_logger()
--- a/libcommon/irccd/system.cpp Wed Dec 06 11:42:44 2017 +0100 +++ b/libcommon/irccd/system.cpp Wed Dec 06 13:54:28 2017 +0100 @@ -115,14 +115,6 @@ namespace { /* - * The setprogname() function keeps a pointer without copying it so when - * main's argv is modified, we're not using the same name so create our own - * copy. - */ - -std::string program_name_value; - -/* * set_privileges. * ------------------------------------------------------------------ * @@ -409,18 +401,13 @@ void set_program_name(std::string name) noexcept { - program_name_value = std::move(name); - #if defined(HAVE_SETPROGNAME) - setprogname(program_name_value.c_str()); + setprogname(name.c_str()); +#else + (void)name; #endif } -const std::string& program_name() noexcept -{ - return program_name_value; -} - std::string name() { #if defined(IRCCD_SYSTEM_LINUX)
--- a/libcommon/irccd/system.hpp Wed Dec 06 11:42:44 2017 +0100 +++ b/libcommon/irccd/system.hpp Wed Dec 06 13:54:28 2017 +0100 @@ -47,13 +47,6 @@ IRCCD_EXPORT void set_program_name(std::string name) noexcept; /** - * Get the program name. - * - * \return the program name - */ -IRCCD_EXPORT const std::string& program_name() noexcept; - -/** * Get the system name. * * \return the name