discover: Properly handle return values

[petitboot] / discover / device-handler.c

diff --git a/discover/device-handler.c b/discover/device-handler.c
index bfe5fffe033dac37b6d06c16886dc078e063d54e..3804b34da08fcf781438db1abfaf04205c4cc373 100644 (file)
--- a/discover/device-handler.c
+++ b/discover/device-handler.c
@@ -1472,7 +1472,6 @@ mount_ro:
 void device_release_write(struct discover_device *dev, bool release)
 {
        const char *fstype, *device_path;
 void device_release_write(struct discover_device *dev, bool release)
 {
        const char *fstype, *device_path;

-       int rc = 0;

 
        if (!release)
                return;
 
        if (!release)
                return;


@@ -1495,10 +1494,9 @@ void device_release_write(struct discover_device *dev, bool release)
                device_path = get_device_path(dev);
        }
 
                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,
                        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
                pb_log("Failed to remount %s read-only: %s\n",
                       device_path, strerror(errno));
        else