[PATCH] Simplify get_mountpoint

[Jan Kiszka]

From: Jan Kiszka <jan.k...@siemens.com>

We can write the same thing much simpler, avoiding the duplicate cleanup
paths.

Signed-off-by: Jan Kiszka <jan.k...@siemens.com>
---
env/env_disk_utils.c | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/env/env_disk_utils.c b/env/env_disk_utils.c
index 78ad130..cb70407 100644
--- a/env/env_disk_utils.c
+++ b/env/env_disk_utils.c
@@ -22,6 +22,7 @@ const char *tmp_mnt_dir = "/tmp/mnt-XXXXXX";

char *get_mountpoint(char *devpath)
{
+ char *mntpoint = NULL;
struct mntent *part;
FILE *mtab;

@@ -33,19 +34,13 @@ char *get_mountpoint(char *devpath)
while ((part = getmntent(mtab)) != NULL) {
if ((part->mnt_fsname != NULL) &&
(strcmp(part->mnt_fsname, devpath)) == 0) {
- char *mntpoint;
-
mntpoint = strdup(part->mnt_dir);
- if (!mntpoint) {
- break;
- }
- endmntent(mtab);
- return mntpoint;
+ break;
}
}
endmntent(mtab);

- return NULL;
+ return mntpoint;
}

bool mount_partition(CONFIG_PART *cfgpart)
--
2.16.4