Date: Mon, 29 Sep 2025 16:18:06 GMT From: Christos Margiolis <christos@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 0532cd2d7713 - main - virtual_oss(8): Fix GCC errors and warnings Message-ID: <202509291618.58TGI6w2009259@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=0532cd2d771372d3266b97aebf4043d5b31b64bd commit 0532cd2d771372d3266b97aebf4043d5b31b64bd Author: Christos Margiolis <christos@FreeBSD.org> AuthorDate: 2025-09-29 16:16:26 +0000 Commit: Christos Margiolis <christos@FreeBSD.org> CommitDate: 2025-09-29 16:16:26 +0000 virtual_oss(8): Fix GCC errors and warnings Reported by: CI Fixes: 9cab9fde5eda ("virtual_oss: Port to base") Sponsored by: The FreeBSD Foundation MFC after: 4 days --- usr.sbin/virtual_oss/virtual_oss/httpd.c | 10 ++++++---- usr.sbin/virtual_oss/virtual_oss/int.h | 6 +++++- usr.sbin/virtual_oss/virtual_oss/main.c | 6 +++--- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/usr.sbin/virtual_oss/virtual_oss/httpd.c b/usr.sbin/virtual_oss/virtual_oss/httpd.c index faea44f07f26..dc5d6036f39d 100644 --- a/usr.sbin/virtual_oss/virtual_oss/httpd.c +++ b/usr.sbin/virtual_oss/virtual_oss/httpd.c @@ -147,8 +147,9 @@ done: } static uint16_t -voss_ipv4_csum(const uint16_t *ptr, size_t count) +voss_ipv4_csum(const void *vptr, size_t count) { + const uint16_t *ptr = vptr; uint32_t sum = 0; while (count--) @@ -161,9 +162,11 @@ voss_ipv4_csum(const uint16_t *ptr, size_t count) } static uint16_t -voss_udp_csum(uint32_t sum, const uint16_t *hdr, size_t count, +voss_udp_csum(uint32_t sum, const void *vhdr, size_t count, const uint16_t *ptr, size_t length) { + const uint16_t *hdr = vhdr; + while (count--) sum += *hdr++; @@ -233,8 +236,7 @@ voss_httpd_send_rtp_sub(vclient_t *pvc, int fd, void *ptr, size_t len, uint32_t pvc->profile->http.rtp_seqnum++; pvc->profile->http.rtp_ts += len / (2 * pvc->channels); - if (writev(fd, iov, 2) < 0) - ; + (void)writev(fd, iov, 2); } static void diff --git a/usr.sbin/virtual_oss/virtual_oss/int.h b/usr.sbin/virtual_oss/virtual_oss/int.h index 4fea69f1a11f..a48e33d7f837 100644 --- a/usr.sbin/virtual_oss/virtual_oss/int.h +++ b/usr.sbin/virtual_oss/virtual_oss/int.h @@ -54,7 +54,11 @@ extern pthread_cond_t atomic_cv; (AFMT_U8 | AFMT_S8) #define VMAX_CHAN 64 -#define VMAX_STRING 64 /* characters */ +/* + * XXX 32 - strlen("/dev") to not exceed OSS_DEVNODE_SIZE in soundcard.h. Also + * silences GCC warnings. + */ +#define VMAX_STRING 27 #define VTYPE_OSS_DAT 0 #define VTYPE_WAV_HDR 1 diff --git a/usr.sbin/virtual_oss/virtual_oss/main.c b/usr.sbin/virtual_oss/virtual_oss/main.c index 760747e90091..3f7fb84ce4c6 100644 --- a/usr.sbin/virtual_oss/virtual_oss/main.c +++ b/usr.sbin/virtual_oss/virtual_oss/main.c @@ -1185,7 +1185,7 @@ vclient_ioctl_oss(struct cuse_dev *pdev, int fflags __unused, strlcpy(data.audioinfo.name, pvc->profile->oss_name, sizeof(data.audioinfo.name)); snprintf(data.audioinfo.devnode, sizeof(data.audioinfo.devnode), - _PATH_DEV "%s", pvc->profile->oss_name); + "/dev/%s", pvc->profile->oss_name); data.audioinfo.caps = DSP_CAP_INPUT | DSP_CAP_OUTPUT; data.audioinfo.iformats = VSUPPORTED_AFMT; data.audioinfo.oformats = VSUPPORTED_AFMT; @@ -2275,7 +2275,7 @@ parse_options(int narg, char **pparg, int is_main) if (voss_ctl_device[0]) return ("-t parameter may only be used once"); - strncpy(voss_ctl_device, optarg, sizeof(voss_ctl_device)); + strlcpy(voss_ctl_device, optarg, sizeof(voss_ctl_device)); break; case 'm': ptr = optarg; @@ -2529,7 +2529,7 @@ main(int argc, char **argv) { const char *ptrerr; struct sigaction sa; - struct cuse_dev *pdev; + struct cuse_dev *pdev = NULL; TAILQ_INIT(&virtual_profile_client_head); TAILQ_INIT(&virtual_profile_loopback_head);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202509291618.58TGI6w2009259>