New upstream version 1.16.0 upstream/1.16.0

5 files changed, 11 insertions, 16 deletions

diff --git a/dispatcher/meson.build b/dispatcher/meson.build
index 7c92fc55..05e570d8 100644
--- a/dispatcher/meson.build
+++ b/dispatcher/meson.build
@@ -15,19 +15,19 @@ configure_file(
   output: service,
   install: true,
   install_dir: dbus_sys_dir,
-  configuration: service_conf
+  configuration: service_conf,
 )
 
 install_data(
   'nm-dispatcher.conf',
-  install_dir: dbus_conf_dir
+  install_dir: dbus_conf_dir,
 )
 
 sources = files('nm-dispatcher-utils.c')
 
 deps = [
   libnm_dep,
-  nm_core_dep
+  nm_core_dep,
 ]
 
 cflags = [
@@ -39,7 +39,7 @@ libnm_dispatcher_core = static_library(
   name + '-core',
   sources: sources,
   dependencies: deps,
-  c_args: cflags
+  c_args: cflags,
 )
 
 sources = files('nm-dispatcher.c')
@@ -48,7 +48,7 @@ sources += gnome.gdbus_codegen(
   'nmdbus-dispatcher',
   name + '.xml',
   interface_prefix: 'org.freedesktop',
-  namespace: 'NMDBus'
+  namespace: 'NMDBus',
 )
 
 executable(
@@ -60,7 +60,7 @@ executable(
   link_args: ldflags_linker_script_binary,
   link_depends: linker_script_binary,
   install: true,
-  install_dir: nm_libexecdir
+  install_dir: nm_libexecdir,
 )
 
 if enable_tests
diff --git a/dispatcher/nm-dispatcher-utils.c b/dispatcher/nm-dispatcher-utils.c
index 4d04eeca..dee00612 100644
--- a/dispatcher/nm-dispatcher-utils.c
+++ b/dispatcher/nm-dispatcher-utils.c
@@ -20,7 +20,7 @@
 
 #include "nm-default.h"
 
-#include <string.h>
+#include "nm-dispatcher-utils.h"
 
 #include "nm-dbus-interface.h"
 #include "nm-connection.h"
@@ -31,8 +31,6 @@
 #include "nm-dispatcher-api.h"
 #include "nm-utils.h"
 
-#include "nm-dispatcher-utils.h"
-
 /*****************************************************************************/
 
 static gboolean
diff --git a/dispatcher/nm-dispatcher.c b/dispatcher/nm-dispatcher.c
index 946763f8..d395942a 100644
--- a/dispatcher/nm-dispatcher.c
+++ b/dispatcher/nm-dispatcher.c
@@ -24,12 +24,10 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>
-#include <string.h>
 #include <sys/types.h>
 #include <signal.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
-#include <errno.h>
 #include <arpa/inet.h>
 #include <glib-unix.h>
 
@@ -461,7 +459,7 @@ again:
 	return FALSE;
 }
 
-static inline gboolean
+static gboolean
 check_permissions (struct stat *s, const char **out_error_msg)
 {
 	g_return_val_if_fail (s != NULL, FALSE);
diff --git a/dispatcher/tests/meson.build b/dispatcher/tests/meson.build
index b18c66e5..bf54fdff 100644
--- a/dispatcher/tests/meson.build
+++ b/dispatcher/tests/meson.build
@@ -2,7 +2,7 @@ test_unit = 'test-dispatcher-envp'
 
 incs = [
   dispatcher_inc,
-  libnm_inc
+  libnm_inc,
 ]
 
 exe = executable(
@@ -14,11 +14,11 @@ exe = executable(
       '-DNETWORKMANAGER_COMPILATION_TEST',
       '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT',
     ],
-  link_with: libnm_dispatcher_core
+  link_with: libnm_dispatcher_core,
 )
 
 test(
   'dispatcher/' + test_unit,
   test_script,
-  args: test_args + [exe.full_path()]
+  args: test_args + [exe.full_path()],
 )
diff --git a/dispatcher/tests/test-dispatcher-envp.c b/dispatcher/tests/test-dispatcher-envp.c
index 78bcd233..89ddadbb 100644
--- a/dispatcher/tests/test-dispatcher-envp.c
+++ b/dispatcher/tests/test-dispatcher-envp.c
@@ -22,7 +22,6 @@
 
 #include <arpa/inet.h>
 #include <stdlib.h>
-#include <string.h>
 
 #include "nm-dispatcher-utils.h"
 #include "nm-dispatcher-api.h"