diff options
| author |   millert <millert@openbsd.org> | 2005-05-09 13:23:35 +0000 |
|---|---|---|
| committer | millert <millert@openbsd.org> | 2005-05-09 13:23:35 +0000 |
| commit | d78ee07c4a2872a9ca20079d17b0bd9966ba21db (patch) | |
| tree | a6ed335277a4eeb6121a6574edccfddf70e4eb77 /usr.bin/mixerctl/mixerctl.c | |
| parent | streamline. (diff) | |
| download | wireguard-openbsd-d78ee07c4a2872a9ca20079d17b0bd9966ba21db.tar.xz wireguard-openbsd-d78ee07c4a2872a9ca20079d17b0bd9966ba21db.zip | |
Fix mixerctl -q
Diffstat (limited to 'usr.bin/mixerctl/mixerctl.c')
| -rw-r--r-- | usr.bin/mixerctl/mixerctl.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/usr.bin/mixerctl/mixerctl.c b/usr.bin/mixerctl/mixerctl.c index 9d48f8f0696..98262241bfd 100644 --- a/usr.bin/mixerctl/mixerctl.c +++ b/usr.bin/mixerctl/mixerctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mixerctl.c,v 1.20 2005/02/07 14:29:10 millert Exp $ */ +/* $OpenBSD: mixerctl.c,v 1.21 2005/05/09 13:23:35 millert Exp $ */ /* $NetBSD: mixerctl.c,v 1.11 1998/04/27 16:55:23 augustss Exp $ */ /* @@ -57,7 +57,7 @@ struct field *findfield(char *); void adjlevel(char **, u_char *, int); void catstr(char *, char *, char *); void prfield(struct field *, char *, int); -void rdfield(int, struct field *, char *); +void rdfield(int, struct field *, char *, int); __dead void usage(void); #define FIELD_NAME_MAX 64 @@ -170,7 +170,7 @@ adjlevel(char **p, u_char *olevel, int more) } void -rdfield(int fd, struct field *p, char *q) +rdfield(int fd, struct field *p, char *q, int quiet) { mixer_ctrl_t *m, oldval; int i, mask; @@ -221,7 +221,7 @@ rdfield(int fd, struct field *p, char *q) if (ioctl(fd, AUDIO_MIXER_WRITE, p->valp) < 0) { warn("AUDIO_MIXER_WRITE"); - } else { + } else if (!quiet) { *p->valp = oldval; prfield(p, ": ", 0); if (ioctl(fd, AUDIO_MIXER_READ, p->valp) < 0) { @@ -364,7 +364,7 @@ main(int argc, char **argv) if ((p = findfield(*argv)) == NULL) { warnx("field %s does not exist", *argv); } else if (ch) { - rdfield(fd, p, q); + rdfield(fd, p, q, qflag); } else { prfield(p, sep, vflag); printf("\n"); |