diff --git a/src/app/mumta.cpp b/src/app/mumta.cpp
index f9aca82989e37768e3b3e9f39229e21bde334b47..c95b1fa888cba2497dd05192f3b39f9d82421e2f 100644
--- a/src/app/mumta.cpp
+++ b/src/app/mumta.cpp
@@ -13,12 +13,15 @@
int main() {
dctl_status_msg("Checking environment");
- if(!check_version_libev()) {
+
+ if (!check_version_libev()) {
return 1;
}
+
if (!check_version_libnl()) {
return 1;
}
+
if (!check_version_openssl()) {
return 1;
}
diff --git a/src/app/nc-test.cpp b/src/app/nc-test.cpp
index 1932490d2c69653ac9fcbfd91ab889112ad82a12..270e5eee0336167cd10581eeef463c78880e774a 100644
--- a/src/app/nc-test.cpp
+++ b/src/app/nc-test.cpp
@@ -21,7 +21,7 @@ int main() {
bool loop = true;
- while(loop) {
+ while (loop) {
wint_t unichar{0};
int ct = getch(); //(&unichar); /* read character */
@@ -29,7 +29,7 @@ int main() {
mvprintw(0, 0, _("Detected key: %8x (ct=%i)"), unichar, ct);
});
- if(10 == ct) {
+ if (10 == ct) {
loop = false;
}
}
diff --git a/src/lib/nccpp/Ncurses.hpp b/src/lib/nccpp/Ncurses.hpp
index e31f0f9a4cd138311b31e77b36936f0795527ea4..04be1ae3d96f465a65df4eb4775788e66f3417ba 100644
--- a/src/lib/nccpp/Ncurses.hpp
+++ b/src/lib/nccpp/Ncurses.hpp
@@ -12,9 +12,9 @@ namespace nccpp {
#include "lib/nccpp/Window.hpp"
-namespace nccpp{
+namespace nccpp {
-class Ncurses : public Window{
+class Ncurses : public Window {
friend Ncurses &ncurses();
public:
Ncurses(const Ncurses &) = delete;
diff --git a/src/lib/nccpp/Window.cpp b/src/lib/nccpp/Window.cpp
index b5b39a306248053cac53d2d4363b0ff8704421f8..6a5070f956527f7b483e455ec4c513733a0e8bc2 100644
--- a/src/lib/nccpp/Window.cpp
+++ b/src/lib/nccpp/Window.cpp
@@ -6,7 +6,7 @@
#include "lib/nccpp/Ncurses.hpp"
#include "lib/nccpp/Subwindow.hpp"
-namespace nccpp{
+namespace nccpp {
inline Window::Window(WINDOW* win) :
win_{win},
@@ -75,7 +75,7 @@ inline Window::Window(Window const &cp) :
#endif
}
-inline Window &Window::operator=(Window const &cp){
+inline Window &Window::operator=(Window const &cp) {
if (this != &cp) {
Window tmp{cp};
*this = std::move(tmp);
diff --git a/src/mumta/evloop.cpp b/src/mumta/evloop.cpp
index 115aeb43339e579f4e0dfdf6967168362135c1d0..42710e7b1f46534e5b0c9160f9e60ad40a7f30dc 100644
--- a/src/mumta/evloop.cpp
+++ b/src/mumta/evloop.cpp
@@ -11,7 +11,7 @@ struct stdin_waiter : std::enable_shared_from_this<stdin_waiter>
::ev::io e_stdin;
stdin_waiter() : e_stdin{} {
- fcntl(0, F_SETFL, fcntl(0, F_GETFL)|O_NONBLOCK);
+ fcntl(0, F_SETFL, fcntl(0, F_GETFL) | O_NONBLOCK);
e_stdin.set<stdin_waiter, &stdin_waiter::cb>(this);
e_stdin.set(0, ::ev::READ);
e_stdin.start();
diff --git a/src/net/async_fd.hpp b/src/net/async_fd.hpp
index 72a42d7f481f3d640873586935c839c4db7922c5..b5a837ac6f98b9e7957f87e062b640d2e12a877e 100644
--- a/src/net/async_fd.hpp
+++ b/src/net/async_fd.hpp
@@ -20,11 +20,11 @@ namespace rmrf::net {
int _fd;
public:
- inline auto_fd(null_fd nfd = nullfd) noexcept : _fd{nfd} {}
+ inline auto_fd(null_fd nfd = nullfd) noexcept : _fd {nfd} {}
- explicit inline auto_fd(int fd) noexcept : _fd{fd} {}
+ explicit inline auto_fd(int fd) noexcept : _fd {fd} {}
- inline auto_fd(auto_fd &&fd) noexcept : _fd{fd.release()} {}
+ inline auto_fd(auto_fd &&fd) noexcept : _fd {fd.release()} {}
inline auto_fd &operator=(auto_fd &&fd) noexcept {
reset(fd.release());
return *this;
@@ -48,8 +48,7 @@ namespace rmrf::net {
// Close an open file descriptor. Reset the descriptor to -1.
inline void close() noexcept {
- if (_fd >= 0)
- {
+ if (_fd >= 0) {
::close(_fd);
// If fdclose() failed then no reason to expect it to succeed the next time.
@@ -58,8 +57,9 @@ namespace rmrf::net {
}
inline void reset(int fd = -1) noexcept {
- if (_fd >= 0)
+ if (_fd >= 0) {
close(); // Don't check for an error as not much we can do here.
+ }
_fd = fd;
}
diff --git a/src/net/async_server.hpp b/src/net/async_server.hpp
index eddbba2db52adc7c32abac7e708cd4d986a2cfc5..ed56463073f565b41ad8885a78310300fc4685b2 100644
--- a/src/net/async_server.hpp
+++ b/src/net/async_server.hpp
@@ -13,8 +13,8 @@ class async_server_socket : public std::enable_shared_from_this<async_server_soc
public:
typedef std::shared_ptr<async_server_socket> self_ptr_type;
- typedef std::function<void(self_ptr_type&, const auto_fd &)> accept_handler_type;
- typedef std::function<void(self_ptr_type&)> error_handler_type;
+ typedef std::function<void(self_ptr_type &, const auto_fd &)> accept_handler_type;
+ typedef std::function<void(self_ptr_type &)> error_handler_type;
private:
auto_fd socket;
@@ -25,7 +25,7 @@ private:
ev::io io;
public:
- async_server_socket(auto_fd&& fd) : socket(std::forward(fd)) {
+ async_server_socket(auto_fd &&fd) : socket(std::forward(fd)) {
// This constructor got a constructed socket as an argument
// and forwards it to libev
io.set<async_server_socket, &async_server_socket::get_accept_handler()>(this);
@@ -40,7 +40,7 @@ public:
accept_handler_type get_accept_handler() const {
return on_accept;
}
- void set_accept_handler(const accept_handler_type& value) {
+ void set_accept_handler(const accept_handler_type &value) {
on_accept = value;
}
};
diff --git a/src/service/daemonctl.hpp b/src/service/daemonctl.hpp
index b32847aca155f69bbc897111650d07185214cd0c..c2fd185133ec13372f0336abfa612b2e5391ba49 100644
--- a/src/service/daemonctl.hpp
+++ b/src/service/daemonctl.hpp
@@ -6,7 +6,7 @@ ATTR_NONNULL_ALL
void dctl_status_msg(const char* msg);
ATTR_NONNULL_ALL
-void dctl_status_err(const char *msg);
+void dctl_status_err(const char* msg);
void dctl_status_ready();
void dctl_status_reload();
diff --git a/src/service/daemonctl_rcd.cpp b/src/service/daemonctl_rcd.cpp
index ca170b90d8aae81e06f63cc872fbaedfa14b9da8..0ef175c1e975e8c9541f9cd08237672705edee13 100644
--- a/src/service/daemonctl_rcd.cpp
+++ b/src/service/daemonctl_rcd.cpp
@@ -8,7 +8,7 @@ void dctl_status_msg(const char* msg) {
}
ATTR_WEAK
-void dctl_status_err(const char *msg) {
+void dctl_status_err(const char* msg) {
(void)msg;
}
diff --git a/src/service/daemonctl_systemd.cpp b/src/service/daemonctl_systemd.cpp
index e399dde45a9e859ae3f26347625442285df125a8..5a764bf9b35c761e69986d35bbeb35c097b75b82 100644
--- a/src/service/daemonctl_systemd.cpp
+++ b/src/service/daemonctl_systemd.cpp
@@ -13,7 +13,7 @@ void dctl_status_msg(const char* msg) {
}
ATTR_NONNULL_ALL
-void dctl_status_err(const char *msg) {
+void dctl_status_err(const char* msg) {
sd_notifyf(0, "STATUS=%s", msg);
std::cerr << SD_ERR << "STATUS=" << msg << std::endl;
}