diff options
| author | Michael Biebl <biebl@debian.org> | 2018-09-23 10:10:27 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2018-09-23 10:10:27 +0200 |
| commit | e126f3e804c35480c4f075777430419d6ece23da (patch) | |
| tree | 5d5821ebcda8cd6ac34d2483bb3354910e508930 /dispatcher | |
| parent | c240974325c552cad177c457d6ff04e381fd77a3 (diff) | |
New upstream version 1.12.4 upstream/1.12.4
Diffstat (limited to 'dispatcher')
| -rw-r--r-- | dispatcher/meson.build | 3 | ||||
| -rw-r--r-- | dispatcher/nm-dispatcher.c | 14 | ||||
| -rw-r--r-- | dispatcher/tests/meson.build | 3 | ||||
| -rw-r--r-- | dispatcher/tests/test-dispatcher-envp.c | 2 |
4 files changed, 13 insertions, 9 deletions
diff --git a/dispatcher/meson.build b/dispatcher/meson.build index 7c92fc55..5859a6ed 100644 --- a/dispatcher/meson.build +++ b/dispatcher/meson.build @@ -31,6 +31,9 @@ deps = [ ] cflags = [ + '-DLIBEXECDIR="@0@"'.format(nm_libexecdir), + '-DSYSCONFDIR="@0@"'.format(nm_sysconfdir), + '-DNMCONFDIR="@0@"'.format(nm_pkgconfdir), '-DG_LOG_DOMAIN="@0@"'.format(name), '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT', ] diff --git a/dispatcher/nm-dispatcher.c b/dispatcher/nm-dispatcher.c index 946763f8..89966953 100644 --- a/dispatcher/nm-dispatcher.c +++ b/dispatcher/nm-dispatcher.c @@ -54,7 +54,7 @@ typedef struct { Request *current_request; GQueue *requests_waiting; - int num_requests_pending; + gint num_requests_pending; } Handler; typedef struct { @@ -131,8 +131,8 @@ struct Request { GPtrArray *scripts; /* list of ScriptInfo */ guint idx; - int num_scripts_done; - int num_scripts_nowait; + gint num_scripts_done; + gint num_scripts_nowait; }; /*****************************************************************************/ @@ -387,7 +387,7 @@ complete_script (ScriptInfo *script) } static void -script_watch_cb (GPid pid, int status, gpointer user_data) +script_watch_cb (GPid pid, gint status, gpointer user_data) { ScriptInfo *script = user_data; guint err; @@ -528,7 +528,7 @@ static gboolean script_dispatch (ScriptInfo *script) { GError *error = NULL; - char *argv[4]; + gchar *argv[4]; Request *request = script->request; if (script->dispatched) @@ -828,9 +828,9 @@ on_name_lost (GDBusConnection *connection, } static void -log_handler (const char *log_domain, +log_handler (const gchar *log_domain, GLogLevelFlags log_level, - const char *message, + const gchar *message, gpointer ignored) { int syslog_priority; diff --git a/dispatcher/tests/meson.build b/dispatcher/tests/meson.build index b18c66e5..6ead88bf 100644 --- a/dispatcher/tests/meson.build +++ b/dispatcher/tests/meson.build @@ -13,7 +13,8 @@ exe = executable( c_args: [ '-DNETWORKMANAGER_COMPILATION_TEST', '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT', - ], + ] + + nm_build_cflags, link_with: libnm_dispatcher_core ) diff --git a/dispatcher/tests/test-dispatcher-envp.c b/dispatcher/tests/test-dispatcher-envp.c index 78bcd233..5fa4a314 100644 --- a/dispatcher/tests/test-dispatcher-envp.c +++ b/dispatcher/tests/test-dispatcher-envp.c @@ -124,7 +124,7 @@ parse_device (GKeyFile *kf, GVariant **out_device_props, GError **error) { GVariantBuilder props; char *tmp; - int i; + gint i; g_variant_builder_init (&props, G_VARIANT_TYPE ("a{sv}")); |