qmi-firmware-update: renamed 'qfu-udev-helpers.c' to 'qfu-helpers-udev.c'

And renamed all the related methods and types in the same way.

4 files changed, 75 insertions, 75 deletions

diff --git a/src/qmi-firmware-update/meson.build b/src/qmi-firmware-update/meson.build
index 11adf179..8f4fbcf1 100644
--- a/src/qmi-firmware-update/meson.build
+++ b/src/qmi-firmware-update/meson.build
@@ -38,6 +38,7 @@ sources = files(
   'qfu-device-selection.c',
   'qfu-dload-message.c',
   'qfu-helpers.c',
+  'qfu-helpers-udev.c',
   'qfu-image.c',
   'qfu-image-cwe.c',
   'qfu-image-factory.c',
@@ -51,7 +52,6 @@ sources = files(
   'qfu-reseter.c',
   'qfu-sahara-device.c',
   'qfu-sahara-message.c',
-  'qfu-udev-helpers.c',
   'qfu-updater.c',
 )
 
diff --git a/src/qmi-firmware-update/qfu-device-selection.c b/src/qmi-firmware-update/qfu-device-selection.c
index 7eeaf17a..467e7165 100644
--- a/src/qmi-firmware-update/qfu-device-selection.c
+++ b/src/qmi-firmware-update/qfu-device-selection.c
@@ -45,7 +45,7 @@ struct _QfuDeviceSelectionPrivate {
     /* peer port sysfs path */
     gchar   *peer_port;
     /* generic udev monitor */
-    QfuUdevHelperGenericMonitor *monitor;
+    QfuHelpersUdevGenericMonitor *monitor;
 #endif
 };
 
@@ -66,7 +66,7 @@ device_selection_get_single (QfuDeviceSelection   *self,
              qfu_helpers_device_type_to_string (device_type),
              self->priv->sysfs_path);
 
-    list = qfu_udev_helper_list_devices (device_type, self->priv->sysfs_path);
+    list = qfu_helpers_udev_list_devices (device_type, self->priv->sysfs_path);
     for (l = list; l; l = g_list_next (l)) {
         path = g_file_get_path (G_FILE (l->data));
         g_debug ("[qfu,device-selection]   device found: %s", path);
@@ -142,7 +142,7 @@ device_selection_get_multiple (QfuDeviceSelection   *self,
              qfu_helpers_device_type_to_string (device_type),
              self->priv->sysfs_path);
 
-    list = qfu_udev_helper_list_devices (device_type, self->priv->sysfs_path);
+    list = qfu_helpers_udev_list_devices (device_type, self->priv->sysfs_path);
     for (l = list; l; l = g_list_next (l)) {
         path = g_file_get_path (G_FILE (l->data));
         g_debug ("[qfu,device-selection]   device found: %s", path);
@@ -210,7 +210,7 @@ wait_for_device_ready (gpointer      unused,
     GError *error = NULL;
     GFile  *file;
 
-    file = qfu_udev_helper_wait_for_device_finish (res, &error);
+    file = qfu_helpers_udev_wait_for_device_finish (res, &error);
     if (!file)
         g_task_return_error (task, error);
     else
@@ -227,12 +227,12 @@ qfu_device_selection_wait_for_cdc_wdm (QfuDeviceSelection  *self,
     GTask *task;
 
     task = g_task_new (self, cancellable, callback, user_data);
-    qfu_udev_helper_wait_for_device (QFU_HELPERS_DEVICE_TYPE_CDC_WDM,
-                                     self->priv->sysfs_path,
-                                     self->priv->peer_port,
-                                     cancellable,
-                                     (GAsyncReadyCallback) wait_for_device_ready,
-                                     task);
+    qfu_helpers_udev_wait_for_device (QFU_HELPERS_DEVICE_TYPE_CDC_WDM,
+                                      self->priv->sysfs_path,
+                                      self->priv->peer_port,
+                                      cancellable,
+                                      (GAsyncReadyCallback) wait_for_device_ready,
+                                      task);
 }
 
 void
@@ -244,12 +244,12 @@ qfu_device_selection_wait_for_tty (QfuDeviceSelection  *self,
     GTask *task;
 
     task = g_task_new (self, cancellable, callback, user_data);
-    qfu_udev_helper_wait_for_device (QFU_HELPERS_DEVICE_TYPE_TTY,
-                                     self->priv->sysfs_path,
-                                     self->priv->peer_port,
-                                     cancellable,
-                                     (GAsyncReadyCallback) wait_for_device_ready,
-                                     task);
+    qfu_helpers_udev_wait_for_device (QFU_HELPERS_DEVICE_TYPE_TTY,
+                                      self->priv->sysfs_path,
+                                      self->priv->peer_port,
+                                      cancellable,
+                                      (GAsyncReadyCallback) wait_for_device_ready,
+                                      task);
 }
 
 #endif
@@ -302,9 +302,9 @@ qfu_device_selection_new (const gchar  *preferred_cdc_wdm,
     {
         /* Initialize sysfs path from inputs */
         if (preferred_vid || preferred_devnum)
-            self->priv->sysfs_path = qfu_udev_helper_find_by_device_info (preferred_vid, preferred_pid, preferred_busnum, preferred_devnum, error);
+            self->priv->sysfs_path = qfu_helpers_udev_find_by_device_info (preferred_vid, preferred_pid, preferred_busnum, preferred_devnum, error);
         else if (preferred_cdc_wdm || preferred_tty)
-            self->priv->sysfs_path = qfu_udev_helper_find_by_file_path (preferred_cdc_wdm ? preferred_cdc_wdm : preferred_tty, error);
+            self->priv->sysfs_path = qfu_helpers_udev_find_by_file_path (preferred_cdc_wdm ? preferred_cdc_wdm : preferred_tty, error);
         else
             g_assert_not_reached ();
 
@@ -314,10 +314,10 @@ qfu_device_selection_new (const gchar  *preferred_cdc_wdm,
         }
 
         /* look for a peer port */
-        self->priv->peer_port = qfu_udev_helper_find_peer_port (self->priv->sysfs_path, error);
+        self->priv->peer_port = qfu_helpers_udev_find_peer_port (self->priv->sysfs_path, error);
 
         /* Initialize right away the generic udev monitor for this sysfs path */
-        self->priv->monitor = qfu_udev_helper_generic_monitor_new (self->priv->sysfs_path);
+        self->priv->monitor = qfu_helpers_udev_generic_monitor_new (self->priv->sysfs_path);
     }
 #endif
 
@@ -338,7 +338,7 @@ finalize (GObject *object)
 
 #if defined WITH_UDEV
     if (self->priv->monitor)
-        qfu_udev_helper_generic_monitor_free (self->priv->monitor);
+        qfu_helpers_udev_generic_monitor_free (self->priv->monitor);
     g_free (self->priv->sysfs_path);
     g_free (self->priv->peer_port);
 #endif
diff --git a/src/qmi-firmware-update/qfu-udev-helpers.c b/src/qmi-firmware-update/qfu-helpers-udev.c
index 6d98052c..b97471f8 100644
--- a/src/qmi-firmware-update/qfu-udev-helpers.c
+++ b/src/qmi-firmware-update/qfu-helpers-udev.c
@@ -151,8 +151,8 @@ udev_helper_get_udev_interface_details (GUdevDevice  *device,
 /******************************************************************************/
 
 gchar *
-qfu_udev_helper_find_by_file (GFile   *file,
-                              GError **error)
+qfu_helpers_udev_find_by_file (GFile   *file,
+                               GError **error)
 {
     GUdevClient  *client = NULL;
     GUdevDevice  *device = NULL;
@@ -201,21 +201,21 @@ out:
 }
 
 gchar *
-qfu_udev_helper_find_by_file_path (const gchar  *path,
-                                   GError      **error)
+qfu_helpers_udev_find_by_file_path (const gchar  *path,
+                                    GError      **error)
 {
     GFile *file;
     gchar *sysfs_path;
 
     file = g_file_new_for_path (path);
-    sysfs_path = qfu_udev_helper_find_by_file (file, error);
+    sysfs_path = qfu_helpers_udev_find_by_file (file, error);
     g_object_unref (file);
     return sysfs_path;
 }
 
 gchar *
-qfu_udev_helper_find_peer_port (const gchar  *sysfs_path,
-                                GError      **error)
+qfu_helpers_udev_find_peer_port (const gchar  *sysfs_path,
+                                 GError      **error)
 {
     gchar *tmp, *path;
 
@@ -292,11 +292,11 @@ udev_helper_find_by_device_info_in_subsystem (GPtrArray    *sysfs_paths,
 }
 
 gchar *
-qfu_udev_helper_find_by_device_info (guint16   vid,
-                                     guint16   pid,
-                                     guint     busnum,
-                                     guint     devnum,
-                                     GError  **error)
+qfu_helpers_udev_find_by_device_info (guint16   vid,
+                                      guint16   pid,
+                                      guint     busnum,
+                                      guint     devnum,
+                                      GError  **error)
 {
     GUdevClient *udev;
     guint        i;
@@ -411,8 +411,8 @@ out:
 }
 
 GList *
-qfu_udev_helper_list_devices (QfuHelpersDeviceType  device_type,
-                              const gchar          *sysfs_path)
+qfu_helpers_udev_list_devices (QfuHelpersDeviceType  device_type,
+                               const gchar          *sysfs_path)
 {
     GUdevClient  *udev;
     const gchar **subsys_list = NULL;
@@ -480,8 +480,8 @@ wait_for_device_context_free (WaitForDeviceContext *ctx)
 }
 
 GFile *
-qfu_udev_helper_wait_for_device_finish (GAsyncResult  *res,
-                                        GError       **error)
+qfu_helpers_udev_wait_for_device_finish (GAsyncResult  *res,
+                                         GError       **error)
 {
     return G_FILE (g_task_propagate_pointer (G_TASK (res), error));
 }
@@ -583,12 +583,12 @@ wait_for_device_cancelled (GCancellable *cancellable,
 }
 
 void
-qfu_udev_helper_wait_for_device (QfuHelpersDeviceType  device_type,
-                                 const gchar          *sysfs_path,
-                                 const gchar          *peer_port,
-                                 GCancellable         *cancellable,
-                                 GAsyncReadyCallback   callback,
-                                 gpointer              user_data)
+qfu_helpers_udev_wait_for_device (QfuHelpersDeviceType  device_type,
+                                  const gchar          *sysfs_path,
+                                  const gchar          *peer_port,
+                                  GCancellable         *cancellable,
+                                  GAsyncReadyCallback   callback,
+                                  gpointer              user_data)
 {
     GTask                *task;
     WaitForDeviceContext *ctx;
@@ -630,15 +630,15 @@ qfu_udev_helper_wait_for_device (QfuHelpersDeviceType  device_type,
 
 /******************************************************************************/
 
-struct _QfuUdevHelperGenericMonitor {
+struct _QfuHelpersUdevGenericMonitor {
     GUdevClient *udev;
 };
 
 void
-qfu_udev_helper_generic_monitor_free (QfuUdevHelperGenericMonitor *self)
+qfu_helpers_udev_generic_monitor_free (QfuHelpersUdevGenericMonitor *self)
 {
     g_object_unref (self->udev);
-    g_slice_free (QfuUdevHelperGenericMonitor, self);
+    g_slice_free (QfuHelpersUdevGenericMonitor, self);
 }
 
 static void
@@ -650,8 +650,8 @@ handle_uevent_generic (GUdevClient *client,
     g_debug ("[qfu-udev] event: %s %s", action, g_udev_device_get_name (device));
 }
 
-QfuUdevHelperGenericMonitor *
-qfu_udev_helper_generic_monitor_new (const gchar *sysfs_path)
+QfuHelpersUdevGenericMonitor *
+qfu_helpers_udev_generic_monitor_new (const gchar *sysfs_path)
 {
     static const gchar *all_list[] = {
         "usbmisc", "usb",
@@ -659,9 +659,9 @@ qfu_udev_helper_generic_monitor_new (const gchar *sysfs_path)
         "net",
         NULL };
 
-    QfuUdevHelperGenericMonitor *self;
+    QfuHelpersUdevGenericMonitor *self;
 
-    self = g_slice_new0 (QfuUdevHelperGenericMonitor);
+    self = g_slice_new0 (QfuHelpersUdevGenericMonitor);
     self->udev = g_udev_client_new (all_list);
 
     /* Monitor for device events. */
diff --git a/src/qmi-firmware-update/qfu-helpers.h b/src/qmi-firmware-update/qfu-helpers.h
index 60dac914..55094c73 100644
--- a/src/qmi-firmware-update/qfu-helpers.h
+++ b/src/qmi-firmware-update/qfu-helpers.h
@@ -38,33 +38,33 @@ const gchar *qfu_helpers_device_type_to_string (QfuHelpersDeviceType type);
 
 #if defined WITH_UDEV
 
-gchar *qfu_udev_helper_find_by_file          (GFile        *file,
-                                              GError      **error);
-gchar *qfu_udev_helper_find_by_file_path     (const gchar  *path,
-                                              GError      **error);
-gchar *qfu_udev_helper_find_peer_port        (const gchar  *sysfs_path,
-                                              GError      **error);
-gchar *qfu_udev_helper_find_by_device_info   (guint16       vid,
-                                              guint16       pid,
-                                              guint         busnum,
-                                              guint         devnum,
-                                              GError      **error);
+gchar *qfu_helpers_udev_find_by_file          (GFile        *file,
+                                               GError      **error);
+gchar *qfu_helpers_udev_find_by_file_path     (const gchar  *path,
+                                               GError      **error);
+gchar *qfu_helpers_udev_find_peer_port        (const gchar  *sysfs_path,
+                                               GError      **error);
+gchar *qfu_helpers_udev_find_by_device_info   (guint16       vid,
+                                               guint16       pid,
+                                               guint         busnum,
+                                               guint         devnum,
+                                               GError      **error);
 
-GList *qfu_udev_helper_list_devices           (QfuHelpersDeviceType   device_type,
-                                               const gchar           *sysfs_path);
+GList *qfu_helpers_udev_list_devices           (QfuHelpersDeviceType   device_type,
+                                                const gchar           *sysfs_path);
 
-void   qfu_udev_helper_wait_for_device        (QfuHelpersDeviceType   device_type,
-                                               const gchar           *sysfs_path,
-                                               const gchar           *peer_port,
-                                               GCancellable          *cancellable,
-                                               GAsyncReadyCallback    callback,
-                                               gpointer               user_data);
-GFile *qfu_udev_helper_wait_for_device_finish (GAsyncResult          *res,
-                                               GError               **error);
+void   qfu_helpers_udev_wait_for_device        (QfuHelpersDeviceType   device_type,
+                                                const gchar           *sysfs_path,
+                                                const gchar           *peer_port,
+                                                GCancellable          *cancellable,
+                                                GAsyncReadyCallback    callback,
+                                                gpointer               user_data);
+GFile *qfu_helpers_udev_wait_for_device_finish (GAsyncResult          *res,
+                                                GError               **error);
 
-typedef struct _QfuUdevHelperGenericMonitor QfuUdevHelperGenericMonitor;
-QfuUdevHelperGenericMonitor *qfu_udev_helper_generic_monitor_new  (const gchar *sysfs_path);
-void                         qfu_udev_helper_generic_monitor_free (QfuUdevHelperGenericMonitor *self);
+typedef struct _QfuHelpersUdevGenericMonitor QfuHelpersUdevGenericMonitor;
+QfuHelpersUdevGenericMonitor *qfu_helpers_udev_generic_monitor_new  (const gchar *sysfs_path);
+void                          qfu_helpers_udev_generic_monitor_free (QfuHelpersUdevGenericMonitor *self);
 
 #endif