Update SyncManager to use the new API

2 files changed, 20 insertions, 29 deletions

diff --git a/modules/benchmark.c b/modules/benchmark.c
index c0f3ff16..6b71bae9 100644
--- a/modules/benchmark.c
+++ b/modules/benchmark.c
@@ -780,7 +780,7 @@ const ModuleAbout *hi_module_get_about(void)
     return &ma;
 }
 
-static gchar *get_benchmark_results()
+static gchar *get_benchmark_results(gsize *len)
 {
     void (*scan_callback)(gboolean);
     JsonBuilder *builder;
@@ -862,7 +862,7 @@ static gchar *get_benchmark_results()
     json_generator_set_root(generator, json_builder_get_root(builder));
     json_generator_set_pretty(generator, TRUE);
 
-    out = json_generator_to_data(generator, NULL);
+    out = json_generator_to_data(generator, len);
 
     g_object_unref(generator);
     g_object_unref(builder);
@@ -931,14 +931,13 @@ void hi_module_init(void)
 {
     static SyncEntry se[] = {
         {
-            .fancy_name = N_("Send benchmark results"),
-            .name = "SendBenchmarkResults",
-            .get_data = get_benchmark_results,
+            .name = N_("Send benchmark results"),
+            .file_name = "benchmark.json",
+            .generate_contents_for_upload = get_benchmark_results,
         },
         {
-            .fancy_name = N_("Receive benchmark results"),
-            .name = "RecvBenchmarkResults",
-            .save_to = "benchmark.conf",
+            .name = N_("Receive benchmark results"),
+            .file_name = "benchmark.json",
         },
     };
 
diff --git a/modules/devices.c b/modules/devices.c
index 7eae11b9..05d3bf8a 100644
--- a/modules/devices.c
+++ b/modules/devices.c
@@ -830,29 +830,21 @@ guchar hi_module_get_weight(void)
 
 void hi_module_init(void)
 {
-    if (!g_file_test("/usr/share/misc/pci.ids", G_FILE_TEST_EXISTS)) {
-        static SyncEntry se = {
-             .fancy_name = N_("Update PCI ID listing"),
-             .name = "GetPCIIds",
-             .save_to = "pci.ids",
-             .get_data = NULL
-        };
-
-        sync_manager_add_entry(&se);
-    }
+    static SyncEntry pci_ids = {
+        .name = N_("Update PCI ID listing"),
+        .file_name = "pci.ids",
+    };
+
+    sync_manager_add_entry(&pci_ids);
 
 #if defined(ARCH_x86) || defined(ARCH_x86_64)
-    {
-      static SyncEntry se = {
-        .fancy_name = N_("Update CPU feature database"),
-        .name = "RecvCPUFlags",
-        .save_to = "cpuflags.conf",
-        .get_data = NULL
-      };
-
-      sync_manager_add_entry(&se);
-    }
-#endif	/* defined(ARCH_x86) */
+    static SyncEntry cpuflags_conf = {
+        .name = N_("Update CPU feature database"),
+        .file_name = "cpuflags.conf",
+    };
+
+    sync_manager_add_entry(&cpuflags_conf);
+#endif /* defined(ARCH_x86) */
 
     init_cups();
     sensors_init();