This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project wmaker-crm.git.
The branch, next has been updated
via 25b5ca256614020150ecf5f13637d1e931ead666 (commit)
from 729886ef52e271375625c679403cc3eb19320ed5 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://repo.or.cz/w/wmaker-crm.git/commit/25b5ca256614020150ecf5f13637d1e931ead666
commit 25b5ca256614020150ecf5f13637d1e931ead666
Author: Iain Patterson <[email protected]>
Date: Mon Apr 15 14:59:12 2013 +0100
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.
diff --git a/WINGs/proplist.c b/WINGs/proplist.c
index 7a80f50..1f50546 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);
-----------------------------------------------------------------------
Summary of changes:
WINGs/proplist.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
repo.or.cz automatic notification. Contact project admin [email protected]
if you want to unsubscribe, or site admin [email protected] if you receive
no reply.
--
wmaker-crm.git ("The Window Maker window manager")
--
To unsubscribe, send mail to [email protected].
