diff options
Diffstat (limited to 'src/libnm-client-impl')
| -rw-r--r-- | src/libnm-client-impl/nm-client.c | 8 | ||||
| -rw-r--r-- | src/libnm-client-impl/nm-libnm-utils.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/libnm-client-impl/nm-client.c b/src/libnm-client-impl/nm-client.c index b18f47be..8476679b 100644 --- a/src/libnm-client-impl/nm-client.c +++ b/src/libnm-client-impl/nm-client.c @@ -531,7 +531,6 @@ _nm_client_dbus_call_simple(NMClient *self, nm_assert(object_path); nm_assert(interface_name); nm_assert(method_name); - nm_assert(parameters); nm_assert(reply_type); dbus_context = nm_g_main_context_push_thread_default_if_necessary(priv->dbus_context); @@ -592,20 +591,21 @@ _nm_client_dbus_call(NMClient *self, nm_assert(object_path); nm_assert(interface_name); nm_assert(method_name); - nm_assert(parameters); nm_assert(reply_type); task = nm_g_task_new(source_obj, cancellable, source_tag, user_callback, user_callback_data); if (!self) { - nm_g_variant_unref_floating(parameters); + if (parameters) + nm_g_variant_unref_floating(parameters); g_task_return_error(task, _nm_client_new_error_nm_not_cached()); return; } priv = NM_CLIENT_GET_PRIVATE(self); if (!priv->name_owner) { - nm_g_variant_unref_floating(parameters); + if (parameters) + nm_g_variant_unref_floating(parameters); g_task_return_error(task, _nm_client_new_error_nm_not_running()); return; } diff --git a/src/libnm-client-impl/nm-libnm-utils.c b/src/libnm-client-impl/nm-libnm-utils.c index 951db1bc..6a7c155e 100644 --- a/src/libnm-client-impl/nm-libnm-utils.c +++ b/src/libnm-client-impl/nm-libnm-utils.c @@ -99,14 +99,14 @@ _nml_dbus_log(NMLDBusLogLevel level, gboolean use_stdout, const char *fmt, ...) (long long) pid, prefix, ts / NM_UTILS_NSEC_PER_SEC, - (ts / (NM_UTILS_NSEC_PER_SEC / 10000)) % 10000, + (ts / (NM_UTILS_NSEC_PER_SEC / 100000)) % 100000, msg); } else { g_printerr("libnm-dbus[%lld]: %s[%" G_GINT64_FORMAT ".%05" G_GINT64_FORMAT "] %s\n", (long long) pid, prefix, ts / NM_UTILS_NSEC_PER_SEC, - (ts / (NM_UTILS_NSEC_PER_SEC / 10000)) % 10000, + (ts / (NM_UTILS_NSEC_PER_SEC / 100000)) % 100000, msg); } } |