From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 13 Dec 2011 01:08:14 +0000 (+0100)
Subject: 	* include/grub/list.h: Explicitly cast return of grub_bad_type_cast
X-Git-Tag: 2.00~906
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d1c930f99be8b836eea675232dc5628f7e9d8a46;p=thirdparty%2Fgrub.git

	* include/grub/list.h: Explicitly cast return of grub_bad_type_cast
	to match types.
---

diff --git a/ChangeLog b/ChangeLog
index cbe2c13f5..672bb9dd2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-13  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* include/grub/list.h: Explicitly cast return of grub_bad_type_cast
+	to match types.
+
 2011-12-13  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/fs/hfsplus.c (grub_hfsplus_btree_recoffset): Handle the
diff --git a/include/grub/list.h b/include/grub/list.h
index 75353010c..3dfb97ac6 100644
--- a/include/grub/list.h
+++ b/include/grub/list.h
@@ -54,11 +54,11 @@ grub_bad_type_cast_real (int line, const char *file)
 
 #define GRUB_AS_LIST(ptr) \
   (GRUB_FIELD_MATCH (ptr, grub_list_t, next) ? \
-   (grub_list_t) ptr : grub_bad_type_cast ())
+   (grub_list_t) ptr : (grub_list_t) grub_bad_type_cast ())
 
 #define GRUB_AS_LIST_P(pptr) \
   (GRUB_FIELD_MATCH (*pptr, grub_list_t, next) ? \
-   (grub_list_t *) (void *) pptr : grub_bad_type_cast ())
+   (grub_list_t *) (void *) pptr : (grub_list_t *) grub_bad_type_cast ())
 
 struct grub_named_list
 {
@@ -73,12 +73,12 @@ void * EXPORT_FUNC(grub_named_list_find) (grub_named_list_t head,
 #define GRUB_AS_NAMED_LIST(ptr) \
   ((GRUB_FIELD_MATCH (ptr, grub_named_list_t, next) && \
     GRUB_FIELD_MATCH (ptr, grub_named_list_t, name))? \
-   (grub_named_list_t) ptr : grub_bad_type_cast ())
+   (grub_named_list_t) ptr : (grub_named_list_t) grub_bad_type_cast ())
 
 #define GRUB_AS_NAMED_LIST_P(pptr) \
   ((GRUB_FIELD_MATCH (*pptr, grub_named_list_t, next) && \
     GRUB_FIELD_MATCH (*pptr, grub_named_list_t, name))? \
-   (grub_named_list_t *) (void *) pptr : grub_bad_type_cast ())
+   (grub_named_list_t *) (void *) pptr : (grub_named_list_t *) grub_bad_type_cast ())
 
 #define GRUB_PRIO_LIST_PRIO_MASK	0xff
 #define GRUB_PRIO_LIST_FLAG_ACTIVE	0x100
@@ -106,12 +106,14 @@ grub_prio_list_remove (grub_prio_list_t *head, grub_prio_list_t item)
   ((GRUB_FIELD_MATCH (ptr, grub_prio_list_t, next) && \
     GRUB_FIELD_MATCH (ptr, grub_prio_list_t, name) && \
     GRUB_FIELD_MATCH (ptr, grub_prio_list_t, prio))? \
-   (grub_prio_list_t) ptr : grub_bad_type_cast ())
+   (grub_prio_list_t) ptr \
+   : (grub_prio_list_t) grub_bad_type_cast ())
 
 #define GRUB_AS_PRIO_LIST_P(pptr) \
   ((GRUB_FIELD_MATCH (*pptr, grub_prio_list_t, next) && \
     GRUB_FIELD_MATCH (*pptr, grub_prio_list_t, name) && \
-    GRUB_FIELD_MATCH (*pptr, grub_prio_list_t, prio))? \
-   (grub_prio_list_t *) (void *) pptr : grub_bad_type_cast ())
+    GRUB_FIELD_MATCH (*pptr, grub_prio_list_t, prio)) ? \
+   (grub_prio_list_t *) (void *) pptr \
+   : (grub_prio_list_t *) grub_bad_type_cast ())
 
 #endif /* ! GRUB_LIST_HEADER */