sbus: unify naming of handler data variable

We used three different names to express handler data:
- pvt
- instace_data
- handler_data

Reviewed-by: Jakub Hrozek <jhrozek@redhat.com>

4 files changed, 15 insertions, 15 deletions

diff --git a/src/sbus/sbus_codegen b/src/sbus/sbus_codegen
index b4e63f33e..4ab7a5498 100755
--- a/src/sbus/sbus_codegen
+++ b/src/sbus/sbus_codegen
@@ -282,7 +282,7 @@ def source_method_invoker(signature, args):
     out("    }")
     out("")
 
-    out("    return (handler)(dbus_req, dbus_req->intf->instance_data", new_line=False)
+    out("    return (handler)(dbus_req, dbus_req->intf->handler_data", new_line=False)
     for i in range(0, len(args)):
         arg = args[i]
         out(",\n                     arg_%d", i, new_line=False)
@@ -323,7 +323,7 @@ def source_getter_invoker(prop):
     out(" = function_ptr;")
     out("")
 
-    out("    (handler)(dbus_req, dbus_req->intf->instance_data, &prop_val", new_line=False)
+    out("    (handler)(dbus_req, dbus_req->intf->handler_data, &prop_val", new_line=False)
     if prop.is_array:
         out(", &prop_len", new_line=False)
     out(");")
@@ -380,7 +380,7 @@ def source_getall_invoker(iface, prop_invokers):
         out("    if (property != NULL && property->flags & SBUS_PROPERTY_READABLE) {")
         out("        %s_handler = VTABLE_FUNC(intf->vtable, property->vtable_offset_get);", prop.type)
         out("        if (%s_handler) {", prop.type)
-        out("            (%s_handler)(dbus_req, dbus_req->intf->instance_data, &%s_prop_val", prop.type, prop.type, new_line=False)
+        out("            (%s_handler)(dbus_req, dbus_req->intf->handler_data, &%s_prop_val", prop.type, prop.type, new_line=False)
         if prop.is_array:
             out(", &%s_prop_len", prop.type, new_line=False)
         out(");")
diff --git a/src/sbus/sssd_dbus.h b/src/sbus/sssd_dbus.h
index 0d021f8fd..87cffe284 100644
--- a/src/sbus/sssd_dbus.h
+++ b/src/sbus/sssd_dbus.h
@@ -55,7 +55,7 @@ struct sbus_request;
 #endif /* DBUS_ERROR_INIT */
 
 typedef int (*sbus_msg_handler_fn)(struct sbus_request *dbus_req,
-                                   void *instance_data);
+                                   void *handler_data);
 
 /*
  * sbus_conn_destructor_fn
@@ -110,7 +110,7 @@ struct sbus_vtable {
 struct sbus_interface {
     const char *path;
     struct sbus_vtable *vtable;
-    void *instance_data;
+    void *handler_data;
 };
 
 /* Server Functions */
@@ -168,7 +168,7 @@ void sbus_disconnect(struct sbus_connection *conn);
 int sbus_conn_register_iface(struct sbus_connection *conn,
                              struct sbus_vtable *iface_vtable,
                              const char *object_path,
-                             void *pvt);
+                             void *handler_data);
 
 errno_t
 sbus_conn_reregister_paths(struct sbus_connection *conn);
diff --git a/src/sbus/sssd_dbus_interface.c b/src/sbus/sssd_dbus_interface.c
index 0a652ba4d..a528e3cc9 100644
--- a/src/sbus/sssd_dbus_interface.c
+++ b/src/sbus/sssd_dbus_interface.c
@@ -430,7 +430,7 @@ static struct sbus_interface *
 sbus_new_interface(TALLOC_CTX *mem_ctx,
                    const char *object_path,
                    struct sbus_vtable *iface_vtable,
-                   void *instance_data)
+                   void *handler_data)
 {
     struct sbus_interface *intf;
 
@@ -448,7 +448,7 @@ sbus_new_interface(TALLOC_CTX *mem_ctx,
     }
 
     intf->vtable = iface_vtable;
-    intf->instance_data = instance_data;
+    intf->handler_data = handler_data;
     return intf;
 }
 
@@ -513,7 +513,7 @@ errno_t
 sbus_conn_register_iface(struct sbus_connection *conn,
                          struct sbus_vtable *iface_vtable,
                          const char *object_path,
-                         void *pvt)
+                         void *handler_data)
 {
     struct sbus_interface *iface = NULL;
     bool path_known;
@@ -523,7 +523,7 @@ sbus_conn_register_iface(struct sbus_connection *conn,
         return EINVAL;
     }
 
-    iface = sbus_new_interface(conn, object_path, iface_vtable, pvt);
+    iface = sbus_new_interface(conn, object_path, iface_vtable, handler_data);
     if (iface == NULL) {
         return ENOMEM;
     }
@@ -599,7 +599,7 @@ sbus_message_handler_got_caller_id(struct tevent_req *req);
 static DBusHandlerResult
 sbus_message_handler(DBusConnection *dbus_conn,
                      DBusMessage *message,
-                     void *user_data)
+                     void *handler_data)
 {
     struct tevent_req *req;
     struct sbus_connection *conn;
@@ -611,7 +611,7 @@ sbus_message_handler(DBusConnection *dbus_conn,
     const char *path;
     const char *sender;
 
-    conn = talloc_get_type(user_data, struct sbus_connection);
+    conn = talloc_get_type(handler_data, struct sbus_connection);
 
     /* header information */
     iface_name = dbus_message_get_interface(message);
@@ -688,7 +688,7 @@ sbus_message_handler_got_caller_id(struct tevent_req *req)
 
     handler = VTABLE_FUNC(sbus_req->intf->vtable, method->vtable_offset);
     invoker = method->invoker;
-    pvt = sbus_req->intf->instance_data;
+    pvt = sbus_req->intf->handler_data;
 
     sbus_request_invoke_or_finish(sbus_req, handler, pvt, invoker);
     return;
diff --git a/src/sbus/sssd_dbus_properties.c b/src/sbus/sssd_dbus_properties.c
index bdaef4591..060da584e 100644
--- a/src/sbus/sssd_dbus_properties.c
+++ b/src/sbus/sssd_dbus_properties.c
@@ -203,7 +203,7 @@ static int sbus_properties_get(struct sbus_request *sbus_req, void *pvt)
     }
 
     return sbus_properties_invoke(sbus_req, iface, handler_fn,
-                                  iface->instance_data, prop->invoker_get);
+                                  iface->handler_data, prop->invoker_get);
 
 fail:
     return sbus_request_fail_and_finish(sbus_req, error);
@@ -277,7 +277,7 @@ static int sbus_properties_set(struct sbus_request *sbus_req, void *pvt)
     }
 
     return sbus_properties_invoke(sbus_req, iface, handler_fn,
-                                  iface->instance_data, prop->invoker_set);
+                                  iface->handler_data, prop->invoker_set);
 
 fail:
     return sbus_request_fail_and_finish(sbus_req, error);