ui/ncurses: Remove redundant assignment

[petitboot] / discover / device-handler.c

diff --git a/discover/device-handler.c b/discover/device-handler.c
index 9868e5112c419d2c8faad2ec34e9fdd25919830f..3804b34da08fcf781438db1abfaf04205c4cc373 100644 (file)
--- a/discover/device-handler.c
+++ b/discover/device-handler.c
@@ -897,7 +897,7 @@ out:
         * TRANSLATORS: the format specifier in this string is a Linux
         * device identifier, like 'sda1'
         */
-       status->message = talloc_asprintf(status,_("Processing %s complete\n"),
+       status->message = talloc_asprintf(status,_("Processing %s complete"),
                                dev->device->id);
        boot_status(handler, status);
 
@@ -936,7 +936,7 @@ int device_handler_dhcp(struct device_handler *handler,
         * TRANSLATORS: this format specifier will be the name of a network
         * device, like 'eth0'.
         */
-       status->message = talloc_asprintf(status,_("Processing %s complete\n"),
+       status->message = talloc_asprintf(status,_("Processing %s complete"),
                                dev->device->id);
        boot_status(handler, status);
 
@@ -1472,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;
@@ -1495,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