[patch] disk-utils s/MOUNTED/_PATH_MOUNTED/

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



no longer use deprecated alias.
helps compiling util-linux-ng against klibc.

Signed-off-by: maximilian attems <max@xxxxxxx>

diff --git a/disk-utils/fsck.minix.c b/disk-utils/fsck.minix.c
index 8243b9c..c63df18 100644
--- a/disk-utils/fsck.minix.c
+++ b/disk-utils/fsck.minix.c
@@ -304,7 +304,7 @@ check_mount(void) {
 	int cont;
 	int fd;
 
-	if ((f = setmntent (MOUNTED, "r")) == NULL)
+	if ((f = setmntent (_PATH_MOUNTED, "r")) == NULL)
 		return;
 	while ((mnt = getmntent (f)) != NULL)
 		if (strcmp (device_name, mnt->mnt_fsname) == 0)
@@ -318,7 +318,7 @@ check_mount(void) {
 	 * probably not correct; so we won't issue a warning based on
 	 * it.
 	 */
-	fd = open(MOUNTED, O_RDWR);
+	fd = open(_PATH_MOUNTED, O_RDWR);
 	if (fd < 0 && errno == EROFS)
 		return;
 	else
diff --git a/disk-utils/mkfs.minix.c b/disk-utils/mkfs.minix.c
index a5e0992..c17db40 100644
--- a/disk-utils/mkfs.minix.c
+++ b/disk-utils/mkfs.minix.c
@@ -172,7 +172,7 @@ check_mount(void) {
 	FILE * f;
 	struct mntent * mnt;
 
-	if ((f = setmntent (MOUNTED, "r")) == NULL)
+	if ((f = setmntent (_PATH_MOUNTED, "r")) == NULL)
 		return;
 	while ((mnt = getmntent (f)) != NULL)
 		if (strcmp (device_name, mnt->mnt_fsname) == 0)
diff --git a/disk-utils/mkswap.c b/disk-utils/mkswap.c
index 0bac74a..1fec358 100644
--- a/disk-utils/mkswap.c
+++ b/disk-utils/mkswap.c
@@ -425,7 +425,7 @@ check_mount(void) {
 	FILE * f;
 	struct mntent * mnt;
 
-	if ((f = setmntent (MOUNTED, "r")) == NULL)
+	if ((f = setmntent (_PATH_MOUNTED, "r")) == NULL)
 		return 0;
 	while ((mnt = getmntent (f)) != NULL)
 		if (strcmp (device_name, mnt->mnt_fsname) == 0)


-- 
maks
--
To unsubscribe from this list: send the line "unsubscribe util-linux-ng" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Netdev]     [Ethernet Bridging]     [Linux Wireless]     [Kernel Newbies]     [Security]     [Linux for Hams]     [Netfilter]     [Bugtraq]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux RAID]     [Linux Admin]     [Samba]

  Powered by Linux