Fix mismatched return statements, which clang dislikes

4 files changed, 40 insertions, 7 deletions

diff --git a/audio/tfmxplay/distinfo b/audio/tfmxplay/distinfo
index c1b61fbac6e..9464b8a0bf9 100644
--- a/audio/tfmxplay/distinfo
+++ b/audio/tfmxplay/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.9 2011/09/04 21:04:56 dholland Exp $
+$NetBSD: distinfo,v 1.10 2011/09/12 06:42:12 dholland Exp $
 
 SHA1 (tfmxplay-0.6.tgz) = 8028a03d4198da0733fa297e9e6ada864f0c782a
 RMD160 (tfmxplay-0.6.tgz) = 52c31309588b4a8073bf0987f0237ca9d6274b35
 Size (tfmxplay-0.6.tgz) = 24271 bytes
 SHA1 (patch-aa) = 38bf1771c8773e7e12dbd1a563fa30ec9ae43c0f
 SHA1 (patch-ab) = 298f7e457456911c3ea29e293adf5f6b70ac924d
-SHA1 (patch-ac) = a81e9f5dbbf8245d619546859d193ff93ee8ad95
+SHA1 (patch-ac) = 370de23a0138bd786bff325b2f89b34dc3c9c775
 SHA1 (patch-ad) = 159c2810806edccbbc415ac230a2f9adeeba0622
 SHA1 (patch-player_h) = 059b0ee0735bb36e242dc3825643660f0cc3c9b2
diff --git a/audio/tfmxplay/patches/patch-ac b/audio/tfmxplay/patches/patch-ac
index f7746e28a9a..a1fe890497e 100644
--- a/audio/tfmxplay/patches/patch-ac
+++ b/audio/tfmxplay/patches/patch-ac
@@ -1,7 +1,8 @@
-$NetBSD: patch-ac,v 1.4 2011/09/04 21:04:57 dholland Exp $
+$NetBSD: patch-ac,v 1.5 2011/09/12 06:42:12 dholland Exp $
 
 - needs stdlib.h
 - use valid C (string constants cannot span lines)
+- fix mismatched return statements, which clang dislikes
 
 --- tfmx.c.orig	2001-08-02 18:49:40.000000000 +0000
 +++ tfmx.c
@@ -54,3 +55,12 @@ $NetBSD: patch-ac,v 1.4 2011/09/04 21:04:57 dholland Exp $
  );
  
  }
+@@ -348,7 +347,7 @@ dump_pattern(int x)
+ 	}
+ }
+ 
+-do_debug()
++void do_debug()
+ {
+ 	char in[81];
+ 	int x,y;
diff --git a/audio/xcdplayer/distinfo b/audio/xcdplayer/distinfo
index e78ab52544f..478b6f5f651 100644
--- a/audio/xcdplayer/distinfo
+++ b/audio/xcdplayer/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2011/09/04 22:05:39 dholland Exp $
+$NetBSD: distinfo,v 1.8 2011/09/12 06:50:00 dholland Exp $
 
 SHA1 (xcdplayer-2.2.tar.Z) = e518f2df9fcc5e21e1123fe6f5b1193f232b76ef
 RMD160 (xcdplayer-2.2.tar.Z) = ba34fe8092aa96d6370320b20fa46b0b0d043176
@@ -10,7 +10,7 @@ SHA1 (patch-ad) = 7a8956993438fe592aa36f6452222b6aa29ca911
 SHA1 (patch-ae) = 19d0222e673f41efe2733277062e56991960a9ed
 SHA1 (patch-af) = 54c96ac87764c222e48e0dcf4267a93cdd966843
 SHA1 (patch-ag) = cb787b19c00d8bda99367eb71dc5e234857a4539
-SHA1 (patch-ah) = 1cb1b6cbe95a0b921cd4dc0ac62dadd5d17e0735
+SHA1 (patch-ah) = 51a6170c10456469ba2fc31d4b74993fb053f25a
 SHA1 (patch-ai) = 1bf094380473d4a88c61378ff6172a90df510541
 SHA1 (patch-aj) = da8f0dccc7f0678bf9d2e820008813156ea25182
 SHA1 (patch-ak) = 60f93385ab2eb0347a40e5516ec925117ce94b9d
diff --git a/audio/xcdplayer/patches/patch-ah b/audio/xcdplayer/patches/patch-ah
index 5bbbe22f79f..cbe58e28019 100644
--- a/audio/xcdplayer/patches/patch-ah
+++ b/audio/xcdplayer/patches/patch-ah
@@ -1,6 +1,11 @@
-$NetBSD: patch-ah,v 1.5 2006/08/12 14:51:39 darcy Exp $
+$NetBSD: patch-ah,v 1.6 2011/09/12 06:50:00 dholland Exp $
 
---- internals.c.orig	Tue Jan 12 19:59:45 1993
+- support cdrom access on BSDs
+- get function decls out of function bodies, which gcc dislikes
+- fix mismatched return statements, which clang dislikes
+- ...more (?)
+
+--- internals.c.orig	1993-01-12 18:59:45.000000000 +0000
 +++ internals.c
 @@ -22,6 +22,9 @@
  
@@ -28,6 +33,24 @@ $NetBSD: patch-ah,v 1.5 2006/08/12 14:51:39 darcy Exp $
  
  int
  cdrom_get_curtime() {
+@@ -46,7 +50,7 @@ cdrom_get_curtime() {
+ 
+ 	if (cdrom_open() == -1) {
+ 		debug_printf(1, "cdrom_get_curtime: error from cdrom_open\n");
+-		return;
++		return 0;
+ 	}
+ 
+ 	switch (cdrom_status()) {
+@@ -54,7 +58,7 @@ cdrom_get_curtime() {
+ 	case CDROM_PLAYING:
+ 	    if (cdrom_get_curmsf(&curmsf) == -1) {
+ 		debug_printf(1, "get_curtime: error reading location\n");
+-		return;
++		return 0;
+ 	    }
+ 
+ 	    if (((curtrack = cdrom_get_curtrack()) == -1) ||
 @@ -76,6 +80,170 @@ cdrom_get_curtime() {
  	}
  }