diff options
| author | Kenneth D. Merry <ken@FreeBSD.org> | 2001-02-07 20:35:55 +0000 |
|---|---|---|
| committer | Kenneth D. Merry <ken@FreeBSD.org> | 2001-02-07 20:35:55 +0000 |
| commit | 2f23784cc131460a19a4add8cc7d225e989d9d1e (patch) | |
| tree | 0b33d17c45d70dfe133574689623831b1957e1b4 /audio | |
| parent | I knew I forgot something... the patch is reported to substantially (diff) | |
Add a couple of fixes for compiler warnings from PR 23755, which also
addresses the core dump problem I fixed in the last version of this patch.
PR: ports/23755
Submitted by: Kentaro Inagaki <inagaki@tg.rim.or.jp>
Notes
Notes:
svn path=/head/; revision=38079
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/tosha/files/patch-aa | 55 |
1 files changed, 54 insertions, 1 deletions
diff --git a/audio/tosha/files/patch-aa b/audio/tosha/files/patch-aa index 6b13be7d9e5d..d8a03754384f 100644 --- a/audio/tosha/files/patch-aa +++ b/audio/tosha/files/patch-aa @@ -1,5 +1,5 @@ *** tosha.c.orig Fri Jan 1 16:57:49 1999 ---- tosha.c Sun Dec 10 01:04:54 2000 +--- tosha.c Wed Feb 7 13:29:21 2001 *************** *** 240,247 **** return template; @@ -21,3 +21,56 @@ strcat (tmpstr + prefix, formatspec->ext); prefix += strlen(formatspec->ext); strcat (tmpstr + prefix, cptr + 2); +*************** +*** 369,379 **** + frmctl = trackctl[i]; + break; + } +! if (frmctl < 0) /* Ugh! */ + if (numtracks >= 1 && start >= trackstart[1]) + frmctl = trackctl[numtracks - 1]; + else + frmctl = trackctl[0]; + } + if ((frmctl & 4) == 0) + return 1; +--- 371,382 ---- + frmctl = trackctl[i]; + break; + } +! if (frmctl < 0) { /* Ugh! */ + if (numtracks >= 1 && start >= trackstart[1]) + frmctl = trackctl[numtracks - 1]; + else + frmctl = trackctl[0]; ++ } + } + if ((frmctl & 4) == 0) + return 1; +*************** +*** 698,704 **** + * Now get us the stuff! + */ + +! if (!indexonly && (singlefile = startsec >= 0 || !strchr(outname, '%'))) + if (!strcmp(outname, "-")) + pcmfd = 1; + else { +--- 701,707 ---- + * Now get us the stuff! + */ + +! if (!indexonly && (singlefile = startsec >= 0 || !strchr(outname, '%'))){ + if (!strcmp(outname, "-")) + pcmfd = 1; + else { +*************** +*** 710,715 **** +--- 713,719 ---- + O_TRUNC, 0644)) < 0) + die ("open(output file)"); + } ++ } + if (!quiet) + print_head(); + get_time (&starttime); |