diff options
| author | dholland <dholland> | 2011-09-04 04:49:09 +0000 |
|---|---|---|
| committer | dholland <dholland> | 2011-09-04 04:49:09 +0000 |
| commit | c5deff2561e82063e5416f1e714be2a660fee47f (patch) | |
| tree | b4c09912f36bec1faedb8c797336d9c3f19b3763 /audio | |
| parent | 5958f78b761fd59b8ddd2fff14403b166497e065 (diff) | |
| download | pkgsrc-c5deff2561e82063e5416f1e714be2a660fee47f.tar.gz | |
Fix mismatched return statements, which clang dislikes
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/mserv-devel/distinfo | 4 | ||||
| -rw-r--r-- | audio/mserv-devel/patches/patch-ab | 29 |
2 files changed, 27 insertions, 6 deletions
diff --git a/audio/mserv-devel/distinfo b/audio/mserv-devel/distinfo index 44f4a727f5c..2e50c48f364 100644 --- a/audio/mserv-devel/distinfo +++ b/audio/mserv-devel/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.2 2005/02/23 20:39:49 agc Exp $ +$NetBSD: distinfo,v 1.3 2011/09/04 04:49:09 dholland Exp $ SHA1 (mserv-0.39a.tar.gz) = cb101fe7e4aca8b5fd950eec408938a2b3bf1a1b RMD160 (mserv-0.39a.tar.gz) = 5afd2e4573594a7a8526148a61b6b49adce6aa62 Size (mserv-0.39a.tar.gz) = 333570 bytes SHA1 (patch-aa) = 167417f1d0cd15bea6dbef46a3a0e0841d41fa4c -SHA1 (patch-ab) = f6692d59b1da163a273639347cd53ee7c56ec64b +SHA1 (patch-ab) = d4b0f912a382713b06b8fb6fcae1297f64433543 SHA1 (patch-ac) = 47ac4716cbba0ff3f2acde1b896e56c309abe102 diff --git a/audio/mserv-devel/patches/patch-ab b/audio/mserv-devel/patches/patch-ab index 4a44e08fe4b..ae97fd57cb3 100644 --- a/audio/mserv-devel/patches/patch-ab +++ b/audio/mserv-devel/patches/patch-ab @@ -1,8 +1,11 @@ -$NetBSD: patch-ab,v 1.1.1.1 2004/01/12 04:18:18 kim Exp $ +$NetBSD: patch-ab,v 1.2 2011/09/04 04:49:09 dholland Exp $ ---- mserv/mserv.c.orig Sun Aug 31 18:52:34 2003 -+++ mserv/mserv.c Tue Oct 14 17:50:57 2003 -@@ -67,7 +67,7 @@ +- fix wrong include (?) (no history for first hunk) +- fix mismatched return statements, which clang dislikes + +--- mserv/mserv.c.orig 2003-08-31 22:52:34.000000000 +0000 ++++ mserv/mserv.c +@@ -67,7 +67,7 @@ met: #include "cmd.h" #include "acl.h" #include "mp3info.h" @@ -11,3 +14,21 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/01/12 04:18:18 kim Exp $ #include "defconf.h" #include "conf.h" #include "opt.h" +@@ -2910,7 +2910,7 @@ static t_author *mserv_authorlist(void) + if ((author->tracks = malloc(author->tracks_size * + sizeof(t_track *))) == NULL) { + mserv_log("Out of memory creating author structure"); +- return; ++ return NULL; + } + for (ui = 0; ui < author->tracks_size; ui++) + author->tracks[ui] = NULL; +@@ -2923,7 +2923,7 @@ static t_author *mserv_authorlist(void) + (author->tracks_size + 64) * + sizeof(t_track *))) == NULL) { + mserv_log("Out of memory increasing size of author structure"); +- return; ++ return NULL; + } + for (ui = author->tracks_size; ui < author->tracks_size + 64; ui++) + author->tracks[ui] = NULL; |