From 25b5ca256614020150ecf5f13637d1e931ead666 Mon Sep 17 00:00:00 2001 From: Iain Patterson Date: Mon, 15 Apr 2013 14:59:12 +0100 Subject: [PATCH] Compiler food. WMMergePLDictionaries() and WMSubtractPLDictionaries() are declared to return WMPropList * but are set to call the wassertr macro when their arguments do not pass a sanity check. The wassertr macro eventually calls return with no return value, triggering a compiler warning if -Wreturn-type is used. Change wassertr to wassertrv and force a return of NULL in the error case. --- WINGs/proplist.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/WINGs/proplist.c b/WINGs/proplist.c index 7a80f500..1f505466 100644 --- a/WINGs/proplist.c +++ b/WINGs/proplist.c @@ -1162,7 +1162,7 @@ WMPropList *WMMergePLDictionaries(WMPropList * dest, WMPropList * source, Bool r WMPropList *key, *value, *dvalue; WMHashEnumerator e; - wassertr(source->type == WPLDictionary && dest->type == WPLDictionary); + wassertrv(source->type == WPLDictionary && dest->type == WPLDictionary, NULL); if (source == dest) return dest; @@ -1189,7 +1189,7 @@ WMPropList *WMSubtractPLDictionaries(WMPropList * dest, WMPropList * source, Boo WMPropList *key, *value, *dvalue; WMHashEnumerator e; - wassertr(source->type == WPLDictionary && dest->type == WPLDictionary); + wassertrv(source->type == WPLDictionary && dest->type == WPLDictionary, NULL); if (source == dest) { WMPropList *keys = WMGetPLDictionaryKeys(dest);