autofs-5.1.6 - change mountpoint to mp in struct ext_mount

From: Ian Kent <raven@themaw.net>

Use simple name mp instead of mountpoint in struct ext_mount.

Signed-off-by: Ian Kent <raven@themaw.net>
---
 CHANGELOG    |    1 +
 lib/mounts.c |   14 +++++++-------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 1f819739..8e89d5b2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -52,6 +52,7 @@ xx/xx/2020 autofs-5.1.7
 - fix incorrect systemctl command syntax in autofs(8).
 - update list.h.
 - add hashtable implementation.
+- change mountpoint to mp in struct ext_mount.
 
 07/10/2019 autofs-5.1.6
 - support strictexpire mount option.
diff --git a/lib/mounts.c b/lib/mounts.c
index 0dd603f2..50a59f5f 100644
--- a/lib/mounts.c
+++ b/lib/mounts.c
@@ -54,7 +54,7 @@ static size_t maxgrpbuf = 0;
 #define EXT_MOUNTS_HASH_SIZE    50
 
 struct ext_mount {
-	char *mountpoint;
+	char *mp;
 	unsigned int umount;
 	struct list_head mount;
 	struct list_head mounts;
@@ -743,9 +743,9 @@ static void ext_mounts_hash_init(void)
 	ext_mounts_hash_init_done = 1;
 }
 
-static struct ext_mount *ext_mount_lookup(const char *mountpoint)
+static struct ext_mount *ext_mount_lookup(const char *mp)
 {
-	u_int32_t hval = hash(mountpoint, EXT_MOUNTS_HASH_SIZE);
+	u_int32_t hval = hash(mp, EXT_MOUNTS_HASH_SIZE);
 	struct list_head *p, *head;
 
 	if (!ext_mounts_hash_init_done)
@@ -757,7 +757,7 @@ static struct ext_mount *ext_mount_lookup(const char *mountpoint)
 	head = &ext_mounts_hash[hval];
 	list_for_each(p, head) {
 		struct ext_mount *this = list_entry(p, struct ext_mount, mount);
-		if (!strcmp(this->mountpoint, mountpoint))
+		if (!strcmp(this->mp, mp))
 			return this;
 	}
 	return NULL;
@@ -788,8 +788,8 @@ int ext_mount_add(struct list_head *entry, const char *path, unsigned int umount
 	if (!em)
 		goto done;
 
-	em->mountpoint = strdup(path);
-	if (!em->mountpoint) {
+	em->mp = strdup(path);
+	if (!em->mp) {
 		free(em);
 		goto done;
 	}
@@ -828,7 +828,7 @@ int ext_mount_remove(struct list_head *entry, const char *path)
 		if (em->umount)
 			ret = 1;
 		if (list_empty(&em->mount)) {
-			free(em->mountpoint);
+			free(em->mp);
 			free(em);
 		}
 	}