Merge pull request #33 from ssahani/tiny_cleanup

Introduce github CI and cleanups
systemd · May 13, 2022 · 4977106 · 4977106
2 parents 0b8ed18 + daeb2a9
commit 4977106
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 30 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -0,0 +1,23 @@
+name: systemd-netlogd CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: update
+      run: sudo apt-get update
+    - name: install python
+      run: sudo apt-get install python3 python3-pip python3-dev python3-setuptools build-essential meson ninja-build sphinx-doc sphinx-common python-configparser
+    - name: install build essentials
+      run: sudo apt-get install -y ninja-build glib-2.0-dev libudev-dev libyaml-dev libsystemd-dev clang gperf libcap-dev build-essential
+    - name: build
+      run: make
diff --git a/.lgtm.yml b/.lgtm.yml
diff --git a/.travis.yml b/.travis.yml
diff --git a/src/netlog/netlog-manager.c b/src/netlog/netlog-manager.c
@@ -484,8 +484,6 @@ int manager_new(Manager **ret, const char *state_file, const char *cursor) {
         if (r < 0)
                 return r;
 
-        *ret = m;
-        m = NULL;
-
+        *ret = TAKE_PTR(m);
         return 0;
 }
diff --git a/src/netlog/netlog-network.c b/src/netlog/netlog-network.c
@@ -207,6 +207,7 @@ int manager_open_network_socket(Manager *m) {
         if (SYSLOG_TRANSMISSION_PROTOCOL_TCP == m->protocol) {
                 union sockaddr_union sa;
                 socklen_t salen;
+
                 switch (m->address.sockaddr.sa.sa_family) {
                         case AF_INET:
                                 sa = (union sockaddr_union) {
@@ -228,6 +229,7 @@ int manager_open_network_socket(Manager *m) {
                                 r = -EAFNOSUPPORT;
                                 goto fail;
                 }
+
                 r = connect(m->socket, &m->address.sockaddr.sa, salen);
                 if (r < 0 && errno != EINPROGRESS) {
                         r = -errno;
@@ -239,7 +241,7 @@ int manager_open_network_socket(Manager *m) {
                         return r;
         }
 
-        r = fd_nonblock(m->socket, 1);
+        r = fd_nonblock(m->socket, true);
         if (r < 0)
                 goto fail;
 

diff --git a/src/share/macro.h b/src/share/macro.h
@@ -399,4 +399,15 @@ static inline unsigned long ALIGN_POWER2(unsigned long u) {
         }                                                       \
         struct __useless_struct_to_allow_trailing_semicolon__
 
+/* Takes inspiration from Rust's Option::take() method: reads and returns a pointer, but at the same time
+ * resets it to NULL. See: https://doc.rust-lang.org/std/option/enum.Option.html#method.take */
+#define TAKE_PTR(ptr)                           \
+        ({                                      \
+                typeof(ptr) *_pptr_ = &(ptr);   \
+                typeof(ptr) _ptr_ = *_pptr_;    \
+                *_pptr_ = NULL;                 \
+                _ptr_;                          \
+        })
+
+
 #include "log.h"