diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2019-01-25 10:49:37 +0100 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2019-01-25 10:49:37 +0100 |
| commit | 404ebe62622150e77e311777dff8617eb974e834 (patch) | |
| tree | cc7f73d3e435d5b3ee85e2bef833e8de1fb133e3 /dispatcher | |
| parent | 227c401a10a930af6fd5f123aef345fcd130d6aa (diff) | |
| parent | 3626b425d1bc017fdc6f1ea0cfd329d1e1681641 (diff) | |
Merge remote-tracking branch 'salsa/upstream' into upstream
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, 9 insertions, 13 deletions
diff --git a/dispatcher/meson.build b/dispatcher/meson.build index 5859a6ed..7c92fc55 100644 --- a/dispatcher/meson.build +++ b/dispatcher/meson.build @@ -31,9 +31,6 @@ 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 89966953..946763f8 100644 --- a/dispatcher/nm-dispatcher.c +++ b/dispatcher/nm-dispatcher.c @@ -54,7 +54,7 @@ typedef struct { Request *current_request; GQueue *requests_waiting; - gint num_requests_pending; + int num_requests_pending; } Handler; typedef struct { @@ -131,8 +131,8 @@ struct Request { GPtrArray *scripts; /* list of ScriptInfo */ guint idx; - gint num_scripts_done; - gint num_scripts_nowait; + int num_scripts_done; + int num_scripts_nowait; }; /*****************************************************************************/ @@ -387,7 +387,7 @@ complete_script (ScriptInfo *script) } static void -script_watch_cb (GPid pid, gint status, gpointer user_data) +script_watch_cb (GPid pid, int status, gpointer user_data) { ScriptInfo *script = user_data; guint err; @@ -528,7 +528,7 @@ static gboolean script_dispatch (ScriptInfo *script) { GError *error = NULL; - gchar *argv[4]; + char *argv[4]; Request *request = script->request; if (script->dispatched) @@ -828,9 +828,9 @@ on_name_lost (GDBusConnection *connection, } static void -log_handler (const gchar *log_domain, +log_handler (const char *log_domain, GLogLevelFlags log_level, - const gchar *message, + const char *message, gpointer ignored) { int syslog_priority; diff --git a/dispatcher/tests/meson.build b/dispatcher/tests/meson.build index 6ead88bf..b18c66e5 100644 --- a/dispatcher/tests/meson.build +++ b/dispatcher/tests/meson.build @@ -13,8 +13,7 @@ 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 5fa4a314..78bcd233 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; - gint i; + int i; g_variant_builder_init (&props, G_VARIANT_TYPE ("a{sv}")); |