From nobody Mon Sep 29 16:18:06 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cb5vf5m8nz68SjL; Mon, 29 Sep 2025 16:18:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cb5vf5BCLz3Lkw; Mon, 29 Sep 2025 16:18:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759162686; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XxamYk0yWDXGH8DP3nbh/U/ZYOd5wnFcjdbBx2MaYzg=; b=MA9uC/E61mDXgYXRbdBM9rFRb3Jgj9K17a9J4vfFb+MwJRHPUqfQ1WqY2ZgamUbyE1yih2 Z56WsgFCT8cx2ESJ+ngYhkEZ2dEknPKFb4SeohFdjN9Qn7jxiEDMzYx/2Sd8JWP4Vf7bsM Eco7x3b+kOQNgz8id5juNIKMT5yzRHmjof6LlAdekjDNTmiCXaqgx+al2KHARrqUJeqjtp WSKaMwv3aaUGuhPdM5oMpq6BQDKJ6KQ52bZPVGSRj4eIwyjASBg9uZJHZjm93EkIvtkWI0 ymnOvcZ3KlNQPvXjUOmCKggGWVAadIbz3I0LsAEDa6bUoCvQHwTj4NtEqEIEFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759162686; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XxamYk0yWDXGH8DP3nbh/U/ZYOd5wnFcjdbBx2MaYzg=; b=h7nzFdU7m2YbNHbYZnuSDmntpI5gMRtNfLHoPx3cciL3D6Xy2rWB6S5pSWK+77/b/pKLiE K5hKknOUi2z2+8dozeXYSs86oVi/nD9rWw5mrqmT55OXpeyz+r/i5gnzUEo0zpMFx45U2z RlQKu+lEhQ43ZR3bysoQkh3o3fp5XKxK8SNWAQXK4pfgmzSCBXDSuHNd2XmAtim3JKwe5N 5G0xiSM3TEOyYRaJYFadenSsf8S0gPJ12Svcf0RePHkRrZ7AbU72bj7OaHyy+758qc8Yfv UxSaDgqwlxc+R4DAVPsn028Bi5d8qRuUrfp5HneCVSGZDzQTYnuP+C78t2FHRA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759162686; a=rsa-sha256; cv=none; b=C8Aao8qH8QnV4C3YOE4im6vdlwqCcZl5Dw9i7kY5YNxEFslJLlncc4u5YeHdtfYj0Y1JHc QriVPqNz8+p0ZdUuCZ+E6u8Ah5cbzd73fpRpSxMD/Rod1H5RaoaOm+cJd3W6hEbsE0FbB9 qpkWXdUHYUXIf2/Uc1vDDiq3o66kVwjvYXVFECERcaamuZimTEDrvHGpP8XGqmjDDmax71 at1zLShBDwA5D63HDddu0IfFJY1viOVFPtVVpKHnT9GGQpCgYbXeW1g18NaypXMrA2uhgF qlQMUfaA2yjL1+WNREHoQnyZ0n5QPRRRq1vSgob/pUSKKjxRKmv/bzBb+31xGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cb5vf4jSpz1ByF; Mon, 29 Sep 2025 16:18:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58TGI6Xb009262; Mon, 29 Sep 2025 16:18:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58TGI6w2009259; Mon, 29 Sep 2025 16:18:06 GMT (envelope-from git) Date: Mon, 29 Sep 2025 16:18:06 GMT Message-Id: <202509291618.58TGI6w2009259@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 0532cd2d7713 - main - virtual_oss(8): Fix GCC errors and warnings List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0532cd2d771372d3266b97aebf4043d5b31b64bd Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=0532cd2d771372d3266b97aebf4043d5b31b64bd commit 0532cd2d771372d3266b97aebf4043d5b31b64bd Author: Christos Margiolis AuthorDate: 2025-09-29 16:16:26 +0000 Commit: Christos Margiolis 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);