From: Petr Uzel <petr.uzel@suse.cz>
Date: Thu, 12 Jul 2012 09:47:19 +0000 (+0200)
Subject: fdisk: rename label probing functions
X-Git-Tag: v2.22-rc1~145
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=da4ea9f54bc10507475db6ea1d3486de4bef4f7f;p=thirdparty%2Futil-linux.git

fdisk: rename label probing functions

Rename check_$foo_label() to $foo_probe_label():

1/ 'probe' is more appropriate verb than 'check' for these functions
2/ making label name first part of the funciton name is IMO more
   friendly for tags completion (e.g. vim + cscope/ctags).

Signed-off-by: Petr Uzel <petr.uzel@suse.cz>
---

diff --git a/fdisks/fdiskaixlabel.c b/fdisks/fdiskaixlabel.c
index f908abcb89..ebf9365e8b 100644
--- a/fdisks/fdiskaixlabel.c
+++ b/fdisks/fdiskaixlabel.c
@@ -49,7 +49,7 @@ aix_nolabel(struct fdisk_context *cxt)
     return;
 }
 
-static int check_aix_label(struct fdisk_context *cxt)
+static int aix_probe_label(struct fdisk_context *cxt)
 {
     if (aixlabel->magic != AIX_LABEL_MAGIC &&
 	aixlabel->magic != AIX_LABEL_MAGIC_SWAPPED) {
@@ -68,5 +68,5 @@ static int check_aix_label(struct fdisk_context *cxt)
 const struct fdisk_label aix_label =
 {
 	.name = "aix",
-	.probe = check_aix_label
+	.probe = aix_probe_label,
 };
diff --git a/fdisks/fdiskbsdlabel.c b/fdisks/fdiskbsdlabel.c
index 9ede3ef761..548a86d3bc 100644
--- a/fdisks/fdiskbsdlabel.c
+++ b/fdisks/fdiskbsdlabel.c
@@ -110,7 +110,7 @@ static struct xbsd_disklabel xbsd_dlabel;
  * so this does not mean that there is a BSD disk label.
  */
 static int
-check_osf_label(struct fdisk_context *cxt) {
+osf_probe_label(struct fdisk_context *cxt) {
 	if (xbsd_readlabel (cxt, NULL, &xbsd_dlabel) == 0)
 		return 0;
 	return 1;
@@ -849,5 +849,5 @@ alpha_bootblock_checksum (char *boot)
 const struct fdisk_label bsd_label =
 {
 	.name = "bsd",
-	.probe = check_osf_label
+	.probe = osf_probe_label,
 };
diff --git a/fdisks/fdiskdoslabel.c b/fdisks/fdiskdoslabel.c
index 27536da38d..a115e66157 100644
--- a/fdisks/fdiskdoslabel.c
+++ b/fdisks/fdiskdoslabel.c
@@ -316,7 +316,7 @@ void dos_delete_partition(int i)
 	}
 }
 
-static int check_dos_label(struct fdisk_context *cxt)
+static int dos_probe_label(struct fdisk_context *cxt)
 {
 	int i;
 
@@ -684,5 +684,5 @@ void dos_write_table(struct fdisk_context *cxt)
 const struct fdisk_label dos_label =
 {
 	.name = "dos",
-	.probe = check_dos_label,
+	.probe = dos_probe_label,
 };
diff --git a/fdisks/fdiskmaclabel.c b/fdisks/fdiskmaclabel.c
index cbdf5926f8..555245d888 100644
--- a/fdisks/fdiskmaclabel.c
+++ b/fdisks/fdiskmaclabel.c
@@ -48,7 +48,7 @@ mac_nolabel(struct fdisk_context *cxt)
 }
 
 static int
-check_mac_label(struct fdisk_context *cxt)
+mac_probe_label(struct fdisk_context *cxt)
 {
 	/*
 	Conversion: only 16 bit should compared
@@ -83,5 +83,5 @@ IS_MAC:
 const struct fdisk_label mac_label =
 {
 	.name = "mac",
-	.probe = check_mac_label
+	.probe = mac_probe_label,
 };
diff --git a/fdisks/fdisksgilabel.c b/fdisks/fdisksgilabel.c
index c0b346ac0b..071a84e7bd 100644
--- a/fdisks/fdisksgilabel.c
+++ b/fdisks/fdisksgilabel.c
@@ -128,7 +128,7 @@ two_s_complement_32bit_sum(unsigned int *base, int size /* in bytes */) {
 }
 
 static int
-check_sgi_label(struct fdisk_context *cxt) {
+sgi_probe_label(struct fdisk_context *cxt) {
 	if (sizeof(sgilabel) > 512) {
 		fprintf(stderr,
 			_("According to MIPS Computer Systems, Inc the "
@@ -880,5 +880,5 @@ fill_sgiinfo(void)
 const struct fdisk_label sgi_label =
 {
 	.name = "sgi",
-	.probe = check_sgi_label
+	.probe = sgi_probe_label,
 };
diff --git a/fdisks/fdisksunlabel.c b/fdisks/fdisksunlabel.c
index d1f6054135..909f159e4c 100644
--- a/fdisks/fdisksunlabel.c
+++ b/fdisks/fdisksunlabel.c
@@ -78,7 +78,7 @@ static void init(void)
 	partitions = SUN_NUM_PARTITIONS;
 }
 
-static int check_sun_label(struct fdisk_context *cxt)
+static int sun_probe_label(struct fdisk_context *cxt)
 {
 	unsigned short *ush;
 	int csum;
@@ -646,5 +646,5 @@ int sun_get_sysid(struct fdisk_context *cxt, int i)
 const struct fdisk_label sun_label =
 {
 	.name = "sun",
-	.probe = check_sun_label,
+	.probe = sun_probe_label,
 };