WARNS=2 cleanup.
PR: bin/32646 MFC after: 2 weeks
This commit is contained in:
parent
f95e635552
commit
319097faa5
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=87568
@ -5,4 +5,6 @@ PROG= cdcontrol
|
|||||||
DPADD= ${LIBEDIT} ${LIBTERMCAP}
|
DPADD= ${LIBEDIT} ${LIBTERMCAP}
|
||||||
LDADD= -ledit -ltermcap
|
LDADD= -ledit -ltermcap
|
||||||
|
|
||||||
|
WARNS?= 2
|
||||||
|
|
||||||
.include <bsd.prog.mk>
|
.include <bsd.prog.mk>
|
||||||
|
@ -78,9 +78,9 @@ static const char rcsid[] =
|
|||||||
|
|
||||||
struct cmdtab {
|
struct cmdtab {
|
||||||
int command;
|
int command;
|
||||||
char *name;
|
const char *name;
|
||||||
unsigned min;
|
unsigned min;
|
||||||
char *args;
|
const char *args;
|
||||||
} cmdtab[] = {
|
} cmdtab[] = {
|
||||||
{ CMD_CLOSE, "close", 1, "" },
|
{ CMD_CLOSE, "close", 1, "" },
|
||||||
{ CMD_DEBUG, "debug", 1, "on | off" },
|
{ CMD_DEBUG, "debug", 1, "on | off" },
|
||||||
@ -103,7 +103,7 @@ struct cmdtab {
|
|||||||
{ CMD_STOP, "stop", 3, "" },
|
{ CMD_STOP, "stop", 3, "" },
|
||||||
{ CMD_VOLUME, "volume", 1, "<l> <r> | left | right | mute | mono | stereo" },
|
{ CMD_VOLUME, "volume", 1, "<l> <r> | left | right | mute | mono | stereo" },
|
||||||
{ CMD_CDID, "cdid", 2, "" },
|
{ CMD_CDID, "cdid", 2, "" },
|
||||||
{ 0, }
|
{ 0, NULL, 0, NULL }
|
||||||
};
|
};
|
||||||
|
|
||||||
struct cd_toc_entry toc_buffer[100];
|
struct cd_toc_entry toc_buffer[100];
|
||||||
@ -133,11 +133,18 @@ unsigned int msf2lba __P((u_char m, u_char s, u_char f));
|
|||||||
int play_blocks __P((int blk, int len));
|
int play_blocks __P((int blk, int len));
|
||||||
int run __P((int cmd, char *arg));
|
int run __P((int cmd, char *arg));
|
||||||
char *parse __P((char *buf, int *cmd));
|
char *parse __P((char *buf, int *cmd));
|
||||||
|
void help __P((void));
|
||||||
|
void usage __P((void));
|
||||||
|
char *use_cdrom_instead __P((const char *));
|
||||||
|
__const char *strstatus __P((int));
|
||||||
|
static u_int dbprog_discid __P((void));
|
||||||
|
__const char *cdcontrol_prompt __P((void));
|
||||||
|
|
||||||
void help ()
|
void help ()
|
||||||
{
|
{
|
||||||
struct cmdtab *c;
|
struct cmdtab *c;
|
||||||
char *s, n;
|
const char *s;
|
||||||
|
char n;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
for (c=cmdtab; c->name; ++c) {
|
for (c=cmdtab; c->name; ++c) {
|
||||||
@ -165,7 +172,7 @@ void usage ()
|
|||||||
exit (1);
|
exit (1);
|
||||||
}
|
}
|
||||||
|
|
||||||
char *use_cdrom_instead(char *old_envvar)
|
char *use_cdrom_instead(const char *old_envvar)
|
||||||
{
|
{
|
||||||
char *device;
|
char *device;
|
||||||
|
|
||||||
@ -427,7 +434,8 @@ int run (int cmd, char *arg)
|
|||||||
int play (char *arg)
|
int play (char *arg)
|
||||||
{
|
{
|
||||||
struct ioc_toc_header h;
|
struct ioc_toc_header h;
|
||||||
int rc, n, start, end = 0, istart = 1, iend = 1;
|
unsigned int n;
|
||||||
|
int rc, start, end = 0, istart = 1, iend = 1;
|
||||||
|
|
||||||
rc = ioctl (fd, CDIOREADTOCHEADER, &h);
|
rc = ioctl (fd, CDIOREADTOCHEADER, &h);
|
||||||
|
|
||||||
@ -736,7 +744,7 @@ int next_prev (char *arg, int cmd)
|
|||||||
return (play_track (trk, 1, n, 1));
|
return (play_track (trk, 1, n, 1));
|
||||||
}
|
}
|
||||||
|
|
||||||
char *strstatus (int sts)
|
const char *strstatus (int sts)
|
||||||
{
|
{
|
||||||
switch (sts) {
|
switch (sts) {
|
||||||
case ASTS_INVALID: return ("invalid");
|
case ASTS_INVALID: return ("invalid");
|
||||||
@ -905,7 +913,7 @@ int cdid ()
|
|||||||
return id ? 0 : 1;
|
return id ? 0 : 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
int info (char *arg)
|
int info (char *arg __unused)
|
||||||
{
|
{
|
||||||
struct ioc_toc_header h;
|
struct ioc_toc_header h;
|
||||||
int rc, i, n;
|
int rc, i, n;
|
||||||
@ -1146,7 +1154,7 @@ char *parse (char *buf, int *cmd)
|
|||||||
{
|
{
|
||||||
struct cmdtab *c;
|
struct cmdtab *c;
|
||||||
char *p;
|
char *p;
|
||||||
int len;
|
unsigned int len;
|
||||||
|
|
||||||
for (p=buf; isspace (*p); p++)
|
for (p=buf; isspace (*p); p++)
|
||||||
continue;
|
continue;
|
||||||
|
Loading…
Reference in New Issue
Block a user