discover: Properly handle return values

[petitboot] / discover / device-handler.c

diff --git a/discover/device-handler.c b/discover/device-handler.c
index 4e25e079ca18185e21ec187e57a5cd09f9315e0f..3804b34da08fcf781438db1abfaf04205c4cc373 100644 (file)
--- a/discover/device-handler.c
+++ b/discover/device-handler.c
@@ -862,7 +862,13 @@ int device_handler_discover(struct device_handler *handler,
 
        status = talloc_zero(handler, struct boot_status);
        status->type = BOOT_STATUS_INFO;
-       status->message = talloc_asprintf(status, "Processing %s device %s",
+       /*
+        * TRANSLATORS: this string will be passed the type and identifier
+        * of the device. For example, the first parameter could be "Disk",
+        * (which will be translated accordingly) and the second a Linux device
+        * identifier like 'sda1' (which will not be translated)
+        */
+       status->message = talloc_asprintf(status, _("Processing %s device %s"),
                                device_type_display_name(dev->device->type),
                                dev->device->id);
        boot_status(handler, status);
@@ -887,7 +893,11 @@ int device_handler_discover(struct device_handler *handler,
        device_handler_discover_context_commit(handler, ctx);
 
 out:
-       status->message = talloc_asprintf(status,"Processing %s complete\n",
+       /*
+        * TRANSLATORS: the format specifier in this string is a Linux
+        * device identifier, like 'sda1'
+        */
+       status->message = talloc_asprintf(status,_("Processing %s complete"),
                                dev->device->id);
        boot_status(handler, status);
 
@@ -906,7 +916,11 @@ int device_handler_dhcp(struct device_handler *handler,
 
        status = talloc_zero(handler, struct boot_status);
        status->type = BOOT_STATUS_INFO;
-       status->message = talloc_asprintf(status, "Processing dhcp event on %s",
+       /*
+        * TRANSLATORS: this format specifier will be the name of a network
+        * device, like 'eth0'.
+        */
+       status->message = talloc_asprintf(status, _("Processing dhcp event on %s"),
                                dev->device->id);
        boot_status(handler, status);
 
@@ -918,7 +932,11 @@ int device_handler_dhcp(struct device_handler *handler,
 
        device_handler_discover_context_commit(handler, ctx);
 
-       status->message = talloc_asprintf(status,"Processing %s complete\n",
+       /*
+        * TRANSLATORS: this format specifier will be the name of a network
+        * device, like 'eth0'.
+        */
+       status->message = talloc_asprintf(status,_("Processing %s complete"),
                                dev->device->id);
        boot_status(handler, status);
 
@@ -937,7 +955,7 @@ int device_handler_conf(struct device_handler *handler,
 
        status = talloc_zero(handler, struct boot_status);
        status->type = BOOT_STATUS_INFO;
-       status->message = talloc_asprintf(status, "Processing user config");
+       status->message = talloc_asprintf(status, _("Processing user config"));
        boot_status(handler, status);
 
        /* create our context */
@@ -949,7 +967,7 @@ int device_handler_conf(struct device_handler *handler,
        device_handler_discover_context_commit(handler, ctx);
 
        status->message = talloc_asprintf(status,
-                               "Processing user config complete");
+                               _("Processing user config complete"));
        boot_status(handler, status);
 
        talloc_free(status);
@@ -1454,7 +1472,6 @@ mount_ro:
 void device_release_write(struct discover_device *dev, bool release)
 {
        const char *fstype, *device_path;
-       int rc = 0;
 
        if (!release)
                return;
@@ -1477,10 +1494,9 @@ void device_release_write(struct discover_device *dev, bool release)
                device_path = get_device_path(dev);
        }
 
-       mount(device_path, dev->mount_path, fstype,
+       if (mount(device_path, dev->mount_path, fstype,
                        MS_RDONLY | MS_SILENT,
-                       fs_parameters(dev, MS_RDONLY));
-       if (rc)
+                       fs_parameters(dev, MS_RDONLY)))
                pb_log("Failed to remount %s read-only: %s\n",
                       device_path, strerror(errno));
        else