mirror/polybar
3
0
Fork 0
mirror of https://github.com/polybar/polybar.git synced 2026-03-01 05:19:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(xcb): Deallocate using deleter

Browse Source
This commit is contained in:
Michael Carlberg
2016-12-03 16:44:08 +01:00
parent 086e498388
commit ef9b37447b
9 changed files with 39 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/main.cpp
View File

@ -20,10 +20,6 @@ struct exit_success {};
struct exit_failure {};
int main(int argc, char** argv) {
uint8_t exit_code{EXIT_SUCCESS};
bool reload{false};
int xfd;
// clang-format off
const command_line::options opts{
command_line::option{"-h", "--help", "Show help options"},
@ -40,21 +36,20 @@ int main(int argc, char** argv) {
logger& logger{configure_logger<decltype(logger)>(loglevel::WARNING).create<decltype(logger)>()};
uint8_t exit_code{EXIT_SUCCESS};
bool reload{false};
try {
//==================================================
// Connect to X server
//==================================================
XInitThreads();
xcb_connection_t* connection{nullptr};
if ((connection = xutils::get_connection()) == nullptr) {
if (!xutils::get_connection()) {
logger.err("A connection to X could not be established... ");
throw exit_failure{};
}
xfd = xcb_get_file_descriptor(connection);
//==================================================
// Parse command line arguments
//==================================================
@ -139,10 +134,6 @@ int main(int argc, char** argv) {
exit_code = EXIT_FAILURE;
}
if (xfd != 0) {
close(xfd);
}
if (!reload) {
logger.info("Reached end of application...");
return exit_code;