diff options
author | peter <peter@FreeBSD.org> | 2002-05-19 06:31:56 +0000 |
---|---|---|
committer | peter <peter@FreeBSD.org> | 2002-05-19 06:31:56 +0000 |
commit | deabbc94a064073a49863de83acceeac248bc42a (patch) | |
tree | dad2a2f7012fdb415162fca5c7646e228f356fba /sys | |
parent | af017dfb54692466502aa2c9ca6db1cc564b1ef7 (diff) | |
download | FreeBSD-src-deabbc94a064073a49863de83acceeac248bc42a.zip FreeBSD-src-deabbc94a064073a49863de83acceeac248bc42a.tar.gz |
Try and solve some cases of labels at end of compound statements that gcc
now objects to (as it should, it is not legal C).
Diffstat (limited to 'sys')
-rw-r--r-- | sys/dev/sound/pcm/feeder.c | 5 | ||||
-rw-r--r-- | sys/dev/sound/pcm/sound.c | 12 |
2 files changed, 7 insertions, 10 deletions
diff --git a/sys/dev/sound/pcm/feeder.c b/sys/dev/sound/pcm/feeder.c index db7c6ed..e9d21b1 100644 --- a/sys/dev/sound/pcm/feeder.c +++ b/sys/dev/sound/pcm/feeder.c @@ -273,9 +273,9 @@ feeder_fmtchain(u_int32_t *to, struct pcm_feeder *source, struct pcm_feeder *sto SLIST_FOREACH(fte, &feedertab, link) { if (fte->desc == NULL) - goto no; + continue; if (fte->desc->type != FEEDER_FMT) - goto no; + continue; if (fte->desc->in == source->desc->out) { try = feeder_create(fte->feederclass, fte->desc); if (try) { @@ -286,7 +286,6 @@ feeder_fmtchain(u_int32_t *to, struct pcm_feeder *source, struct pcm_feeder *sto feeder_destroy(try); } } -no: } /* printf("giving up %s...\n", source->class->name); */ diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c index 6a982df..85efa26 100644 --- a/sys/dev/sound/pcm/sound.c +++ b/sys/dev/sound/pcm/sound.c @@ -280,10 +280,9 @@ pcm_setmaxautovchans(struct snddev_info *d, int num) err = vchan_destroy(c); if (err) device_printf(d->dev, "vchan_destroy(%s) == %d\n", c->name, err); - goto restart; + break; /* restart */ } } -restart: } } } @@ -782,9 +781,9 @@ sndstat_prepare_pcm(struct sbuf *s, device_t dev, int verbose) } sbuf_printf(s, "{%s}", (c->direction == PCMDIR_REC)? "userland" : "hardware"); } -skipverbose: } else sbuf_printf(s, " (mixer only)"); +skipverbose: snd_mtxunlock(d->lock); return 0; @@ -826,13 +825,13 @@ sysctl_hw_snd_vchans(SYSCTL_HANDLER_ARGS) c = sce->channel; /* not a candidate if not a play channel */ if (c->direction != PCMDIR_PLAY) - goto addskip; + continue; /* not a candidate if a virtual channel */ if (c->flags & CHN_F_VIRTUAL) - goto addskip; + continue; /* not a candidate if it's in use */ if ((c->flags & CHN_F_BUSY) && (SLIST_EMPTY(&c->children))) - goto addskip; + continue; /* * if we get here we're a nonvirtual play channel, and either * 1) not busy @@ -841,7 +840,6 @@ sysctl_hw_snd_vchans(SYSCTL_HANDLER_ARGS) * thus we can add children */ goto addok; -addskip: } pcm_unlock(d); return EBUSY; |