[dbus_service] Housekeeping

Pass GDBusMethodInvocation as a parameter to dbus_service_tag_sequence, that's the only place where sender's name is coming from.
sailfishos · Sep 2, 2020 · f62670a · f62670a
1 parent 0b3ef32
commit f62670a
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 12 deletions.
diff --git a/plugins/dbus_service/dbus_service.h b/plugins/dbus_service/dbus_service.h
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2018-2019 Jolla Ltd.
- * Copyright (C) 2018-2019 Slava Monich <slava.monich@jolla.com>
+ * Copyright (C) 2018-2020 Jolla Ltd.
+ * Copyright (C) 2018-2020 Slava Monich <slava.monich@jolla.com>
  *
  * You may use this file under the terms of BSD license as follows:
  *
@@ -112,7 +112,7 @@ dbus_service_tag_path(
 NfcTargetSequence*
 dbus_service_tag_sequence(
     DBusServiceTag* tag,
-    const char* sender);
+    GDBusMethodInvocation* call);
 
 void
 dbus_service_tag_free(

diff --git a/plugins/dbus_service/dbus_service_isodep.c b/plugins/dbus_service/dbus_service_isodep.c
@@ -69,8 +69,7 @@ dbus_service_isodep_sequence(
     DBusServiceIsoDep* self,
     GDBusMethodInvocation* call)
 {
-    return dbus_service_tag_sequence(self->owner,
-        g_dbus_method_invocation_get_sender(call));
+    return dbus_service_tag_sequence(self->owner, call);
 }
 
 /*==========================================================================*

diff --git a/plugins/dbus_service/dbus_service_tag.c b/plugins/dbus_service/dbus_service_tag.c
@@ -148,9 +148,11 @@ dbus_service_tag_find_waiter(
 NfcTargetSequence*
 dbus_service_tag_sequence(
     DBusServiceTag* self,
-    const char* sender)
+    GDBusMethodInvocation* call)
 {
-    if (G_LIKELY(self) && G_LIKELY(sender)) {
+    const char* sender = g_dbus_method_invocation_get_sender(call);
+
+    if (G_LIKELY(sender)) {
         if (self->lock && !g_strcmp0(self->lock->name, sender)) {
             return self->lock->seq;
         } else {

diff --git a/plugins/dbus_service/dbus_service_tag_t2.c b/plugins/dbus_service/dbus_service_tag_t2.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2018-2019 Jolla Ltd.
- * Copyright (C) 2018-2019 Slava Monich <slava.monich@jolla.com>
+ * Copyright (C) 2018-2020 Jolla Ltd.
+ * Copyright (C) 2018-2020 Slava Monich <slava.monich@jolla.com>
  *
  * You may use this file under the terms of BSD license as follows:
  *
@@ -126,8 +126,7 @@ dbus_service_tag_t2_sequence(
     DBusServiceTagType2* self,
     GDBusMethodInvocation* call)
 {
-    return dbus_service_tag_sequence(self->owner,
-        g_dbus_method_invocation_get_sender(call));
+    return dbus_service_tag_sequence(self->owner, call);
 }
 
 /*==========================================================================*

diff --git a/unit/plugins_dbus_service_tag/test_plugins_dbus_service_tag.c b/unit/plugins_dbus_service_tag/test_plugins_dbus_service_tag.c
@@ -332,7 +332,6 @@ test_null(
     void)
 {
     dbus_service_tag_free(NULL);
-    g_assert(!dbus_service_tag_sequence(NULL, NULL));
 }
 
 /*==========================================================================*