blockdev-util: let's initialize return parameter on success

We document the rule that return values >= 0 of functions are supposed
to indicate success, and that in case of success all return parameters
should be initialized. Let's actually do so.

Just a tiny coding style fix-up.

diff --git a/src/basic/blockdev-util.c b/src/basic/blockdev-util.c
index b15b8cf7703c05b24cd8fe489e2d5b1f05bf60a0..6495a7165847121daaf10f4c06ff17543ca241f6 100644 (file)
--- a/src/basic/blockdev-util.c
+++ b/src/basic/blockdev-util.c
@@ -81,6 +81,7 @@ int get_block_device(const char *path, dev_t *dev) {
         if (F_TYPE_EQUAL(sfs.f_type, BTRFS_SUPER_MAGIC))
                 return btrfs_get_block_device(path, dev);
 
+        *dev = 0;
         return 0;
 }
 

diff --git a/src/basic/btrfs-util.c b/src/basic/btrfs-util.c
index 7720d98009f1fdae28b8834b383a53cb4336a7d0..32a022f7ce18f21beaa0f3e9fdefb72d1717c2aa 100644 (file)
--- a/src/basic/btrfs-util.c
+++ b/src/basic/btrfs-util.c
@@ -277,8 +277,10 @@ int btrfs_get_block_device_fd(int fd, dev_t *dev) {
                 return -errno;
 
         /* We won't do this for btrfs RAID */
-        if (fsi.num_devices != 1)
+        if (fsi.num_devices != 1) {
+                *dev = 0;
                 return 0;
+        }
 
         for (id = 1; id <= fsi.max_id; id++) {
                 struct btrfs_ioctl_dev_info_args di = {