Rename 'm_flag' to 'e_flag' since it's '-e' that sets it. Rename

'User_modify' to 'USER_edit' for the same reason.

4 files changed, 12 insertions, 12 deletions

diff --git a/sbin/fdisk/cmd.c b/sbin/fdisk/cmd.c
index f6e8fc497be..038c70085c9 100644
--- a/sbin/fdisk/cmd.c
+++ b/sbin/fdisk/cmd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmd.c,v 1.71 2014/03/31 23:04:03 krw Exp $	*/
+/*	$OpenBSD: cmd.c,v 1.72 2015/02/09 04:27:15 krw Exp $	*/
 
 /*
  * Copyright (c) 1997 Tobias Weingartner
@@ -262,7 +262,7 @@ Xselect(char *args, struct disk *disk, struct mbr *mbr, struct mbr *tt,
 	}
 
 	/* Recursion is beautiful! */
-	USER_modify(disk, tt, off, firstoff);
+	USER_edit(disk, tt, off, firstoff);
 	return (CMD_CONT);
 }
 
diff --git a/sbin/fdisk/fdisk.c b/sbin/fdisk/fdisk.c
index 2a169bd4923..0c71a874345 100644
--- a/sbin/fdisk/fdisk.c
+++ b/sbin/fdisk/fdisk.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fdisk.c,v 1.64 2015/01/03 15:50:50 jsing Exp $	*/
+/*	$OpenBSD: fdisk.c,v 1.65 2015/02/09 04:27:15 krw Exp $	*/
 
 /*
  * Copyright (c) 1997 Tobias Weingartner
@@ -76,7 +76,7 @@ int
 main(int argc, char *argv[])
 {
 	int ch, fd, error;
-	int i_flag = 0, m_flag = 0, u_flag = 0;
+	int i_flag = 0, e_flag = 0, u_flag = 0;
 	int c_arg = 0, h_arg = 0, s_arg = 0;
 	struct disk disk;
 	u_int32_t l_arg = 0;
@@ -99,7 +99,7 @@ main(int argc, char *argv[])
 			u_flag = 1;
 			break;
 		case 'e':
-			m_flag = 1;
+			e_flag = 1;
 			break;
 		case 'f':
 			mbrfile = optarg;
@@ -178,7 +178,7 @@ main(int argc, char *argv[])
 		    "to specify.");
 
 	/* Print out current MBRs on disk */
-	if ((i_flag + u_flag + m_flag) == 0)
+	if ((i_flag + u_flag + e_flag) == 0)
 		exit(USER_print_disk(&disk));
 
 	/* Parse mbr template, to pass on later */
@@ -202,8 +202,8 @@ main(int argc, char *argv[])
 		if (USER_init(&disk, &mbr, u_flag) == -1)
 			err(1, "error initializing MBR");
 
-	if (m_flag)
-		USER_modify(&disk, &mbr, 0, 0);
+	if (e_flag)
+		USER_edit(&disk, &mbr, 0, 0);
 
 	return (0);
 }
diff --git a/sbin/fdisk/user.c b/sbin/fdisk/user.c
index 5df8f1110d8..2f0f0f68a77 100644
--- a/sbin/fdisk/user.c
+++ b/sbin/fdisk/user.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: user.c,v 1.35 2014/03/31 22:03:29 krw Exp $	*/
+/*	$OpenBSD: user.c,v 1.36 2015/02/09 04:27:15 krw Exp $	*/
 
 /*
  * Copyright (c) 1997 Tobias Weingartner
@@ -81,7 +81,7 @@ USER_init(struct disk *disk, struct mbr *tt, int preserve)
 int modified;
 
 int
-USER_modify(struct disk *disk, struct mbr *tt, off_t offset, off_t reloff)
+USER_edit(struct disk *disk, struct mbr *tt, off_t offset, off_t reloff)
 {
 	static int editlevel;
 	struct dos_mbr dos_mbr;
diff --git a/sbin/fdisk/user.h b/sbin/fdisk/user.h
index 9cff12608c2..1c69cee5e30 100644
--- a/sbin/fdisk/user.h
+++ b/sbin/fdisk/user.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: user.h,v 1.10 2014/03/31 22:03:29 krw Exp $	*/
+/*	$OpenBSD: user.h,v 1.11 2015/02/09 04:27:15 krw Exp $	*/
 
 /*
  * Copyright (c) 1997 Tobias Weingartner
@@ -30,7 +30,7 @@
 
 /* Prototypes */
 int USER_init(struct disk *, struct mbr *, int);
-int USER_modify(struct disk *, struct mbr *, off_t, off_t);
+int USER_edit(struct disk *, struct mbr *, off_t, off_t);
 int USER_print_disk(struct disk *);
 
 #endif /* _USER_H */