summaryrefslogtreecommitdiff
path: root/wm
diff options
context:
space:
mode:
authorjoerg <joerg>2013-05-23 15:08:50 +0000
committerjoerg <joerg>2013-05-23 15:08:50 +0000
commit82913a2ec611650c99a51dee6286a310f83b7fbe (patch)
treee5de7e39cb05d02b7ce2a3da5115a859294fcbc4 /wm
parent8b9e1f7d6fd0add27a9157725758ef55de5c0a11 (diff)
downloadpkgsrc-82913a2ec611650c99a51dee6286a310f83b7fbe.tar.gz
Always return a value from non-void functions.
Diffstat (limited to 'wm')
-rw-r--r--wm/windowmaker/distinfo4
-rw-r--r--wm/windowmaker/patches/patch-WINGs_proplist.c22
2 files changed, 25 insertions, 1 deletions
diff --git a/wm/windowmaker/distinfo b/wm/windowmaker/distinfo
index b78c0e3fd4e..d70b7f8e24b 100644
--- a/wm/windowmaker/distinfo
+++ b/wm/windowmaker/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.32 2013/05/22 11:33:35 hans Exp $
+$NetBSD: distinfo,v 1.33 2013/05/23 15:08:50 joerg Exp $
SHA1 (WindowMaker-0.95.4.tar.gz) = 1477954668012010cf7991cb8139205768205717
RMD160 (WindowMaker-0.95.4.tar.gz) = 9316c30d9d2ebd1080711596ec1b97158997fa3a
Size (WindowMaker-0.95.4.tar.gz) = 2789390 bytes
+SHA1 (patch-WINGs_proplist.c) = 8636ebf38659b03e11c1e616c95b43a1708be69f
SHA1 (patch-aa) = e926a78bc5b800a1e5fbc8792099fc4a97ae916f
SHA1 (patch-ab) = 794946828ede1816ea3b6a4c17f00465e1ae06c9
SHA1 (patch-ac) = 0a2843e3f8e8456080082d1f3e57f58a5d440d18
@@ -15,3 +16,4 @@ SHA1 (patch-aj) = 248d7088ee2ce861898a7474cde8a08f4b879ee9
SHA1 (patch-ak) = 10ba26239b1d85746e42ac1fad983bc3cd11d0a7
SHA1 (patch-doc_cs_Makefile.in) = ab0b42a60863fec8fba0de0e8a2ae74fa3cf8103
SHA1 (patch-doc_ru_Makefile.in) = 7c0b861c6bbe457e8e55e0265335195b95bbe031
+SHA1 (patch-wrlib_Makefile.in) = da39a3ee5e6b4b0d3255bfef95601890afd80709
diff --git a/wm/windowmaker/patches/patch-WINGs_proplist.c b/wm/windowmaker/patches/patch-WINGs_proplist.c
new file mode 100644
index 00000000000..fb240d0e385
--- /dev/null
+++ b/wm/windowmaker/patches/patch-WINGs_proplist.c
@@ -0,0 +1,22 @@
+$NetBSD: patch-WINGs_proplist.c,v 1.1 2013/05/23 15:08:50 joerg Exp $
+
+--- WINGs/proplist.c.orig 2013-05-23 12:40:45.000000000 +0000
++++ WINGs/proplist.c
+@@ -1162,7 +1162,7 @@ WMPropList *WMMergePLDictionaries(WMProp
+ 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(WMP
+ 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);