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>
This commit is contained in:
Kenneth D. Merry 2001-02-07 20:35:55 +00:00
parent 53414b33c4
commit 2f23784cc1
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=38079

View file

@ -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);