[syslinux:master] chain: Remove type-assurance macro for declarations

[syslinux-bot for Shao Miller]

Commit-ID:  a11be40aa29342d4b0ac33ebddb8f19918a0e531
Gitweb:     http://syslinux.zytor.com/commit/a11be40aa29342d4b0ac33ebddb8f19918a0e531
Author:     Shao Miller <shao.miller at yrdsb.edu.on.ca>
AuthorDate: Thu, 24 Jun 2010 14:21:30 -0400
Committer:  Shao Miller <shao.miller at yrdsb.edu.on.ca>
CommitDate: Thu, 24 Jun 2010 14:21:30 -0400

chain: Remove type-assurance macro for declarations

A coding pattern from WinVBlock leaked through whereby a
macro is used to declare functions having the same
prototype.  This makes their declarations look a little less
like a traditional declarations however, so that pattern
has been removed.

Signed-off-by: Shao Miller <shao.miller at yrdsb.edu.on.ca>


---
 com32/modules/chain.c |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/com32/modules/chain.c b/com32/modules/chain.c
index 8fe4522..0e617d4 100644
--- a/com32/modules/chain.c
+++ b/com32/modules/chain.c
@@ -430,9 +430,8 @@ static int find_disk(uint32_t mbr_sig)
 struct disk_part_iter;
 
 /* Partition-/scheme-specific routine returning the next partition */
-#define disk_part_iter_func_decl(func) \
-struct disk_part_iter *func(struct disk_part_iter *part)
-typedef disk_part_iter_func_decl((*disk_part_iter_func));
+typedef struct disk_part_iter *(*disk_part_iter_func) (struct disk_part_iter *
+						       part);
 
 /* Contains details for a partition under examination */
 struct disk_part_iter {
@@ -471,7 +470,7 @@ struct disk_part_iter {
     } private;
 };
 
-static disk_part_iter_func_decl(next_ebr_part)
+static struct disk_part_iter *next_ebr_part(struct disk_part_iter *part)
 {
     const struct part_entry *ebr_table;
     const struct part_entry *parent_table =
@@ -547,7 +546,7 @@ out_finished:
     return NULL;
 }
 
-static disk_part_iter_func_decl(next_mbr_part)
+static struct disk_part_iter *next_mbr_part(struct disk_part_iter *part)
 {
     struct disk_part_iter *ebr_part;
     /* Look at the partition table */
@@ -753,7 +752,7 @@ static void gpt_dump(const struct gpt *gpt)
 }
 #endif
 
-static disk_part_iter_func_decl(next_gpt_part)
+static struct disk_part_iter *next_gpt_part(struct disk_part_iter *part)
 {
     const struct gpt_part *gpt_part = NULL;
 
@@ -786,7 +785,7 @@ err_last:
     return NULL;
 }
 
-static disk_part_iter_func_decl(get_first_partition)
+static struct disk_part_iter *get_first_partition(struct disk_part_iter *part)
 {
     const struct gpt *gpt_candidate;