Module Name: src Committed By: maya Date: Sat May 11 03:26:43 UTC 2019
Modified Files: src/sys/dev/audio: audio.c Log Message: Don't use a confusing GCC extension. NFC To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/dev/audio/audio.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/dev/audio/audio.c diff -u src/sys/dev/audio/audio.c:1.2 src/sys/dev/audio/audio.c:1.3 --- src/sys/dev/audio/audio.c:1.2 Wed May 8 13:40:17 2019 +++ src/sys/dev/audio/audio.c Sat May 11 03:26:43 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: audio.c,v 1.2 2019/05/08 13:40:17 isaki Exp $ */ +/* $NetBSD: audio.c,v 1.3 2019/05/11 03:26:43 maya Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -149,7 +149,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.2 2019/05/08 13:40:17 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.3 2019/05/11 03:26:43 maya Exp $"); #ifdef _KERNEL_OPT #include "audio.h" @@ -7214,7 +7214,7 @@ audiogetinfo(struct audio_softc *sc, str * XXX hiwat/lowat is a playback-only parameter. What should I * return for a record-only descriptor? */ - track = ptrack ?: rtrack; + track = ptrack ? ptrack : rtrack; if (track) { ai->blocksize = track->usrbuf_blksize; ai->hiwat = track->usrbuf_usedhigh / track->usrbuf_blksize;