From nobody Sat Nov 30 19:09:05 2024 X-Original-To: dev-commits-src-all@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 4Y102n51t6z5fVqK; Sat, 30 Nov 2024 19:09:05 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y102n34CDz4FQF; Sat, 30 Nov 2024 19:09:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732993745; 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=VznP2dU+YQYpadYgmY/l4oSUiOgw2+JXurEkw8cvwXM=; b=h0DOl80CUrDTjafeSnPJhp+cYmWKhmbD3HKvVq/Vy/XF31jIB5D2QgyjBtthw7WfQfEkmw SbEL3K/307TUvZ0SGpizEWeb/36h98ga0WXlotdio/+Wafvh6lNSd3BYrtTf0rr+lNMPsv +0yzEL333zIeFYZaUnu0t1WowQllCaiqHxDlArY00lMAoSrGMplpMYKyUl+c5kCxG0BhXY jAHB1iTJ3wKwiMZw//K5/tPZoLM9KqVYZQn5ZMixRxlvYn4aJYTZRrQHxXTiBQgD2qWhdX W0vfGP3F5t4tuN4SSylsqQ4YKAtcy/Jbt71A/FhYn+r8oZT0pYtdy+ecVUr2iQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732993745; 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=VznP2dU+YQYpadYgmY/l4oSUiOgw2+JXurEkw8cvwXM=; b=S6vTOE6Km+dNcKhdzwXoaZ4GM5CkGJwF8kDmhd65hESMGT8ZvbKWWF+H44L2Jp68x8qniR zChZZ6DFFVvGXNkdjG7zr068c5V/2PYz4H5FeuXuEDCDrEmhtwQpGNSKpdLbICCtxfIIti XmMRvE5VrVJjVDkfhmSVpN6eV2uda5sGfWk8ropV07+pAIHsdmVtiCcTt67vwLct8fwO/V Qs2O7FjqS3qZ/cOFX9oub/wwzNMMcbFv3+NzKDgMmAYCZgKPtvSFccvPxNkwApYWMpwfz4 FrazUJ4zJk1XcoALXeRH0647IqxVLiExlVAnDlXL8nec+m+cbx07ZmPDSz4mfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1732993745; a=rsa-sha256; cv=none; b=g6zX7YPNcpbs84CZ5deisUZsQTWqXx9FAjCzUfD1Tkvwqh0BnF5pNnFfTBYa5JI3O6u/ud U7h4wPtGjAcI7+GRpwZfIZaZusDOXbdKnHo4Wbo6V79oi46SVspabqxC8nPmEUX7AyZoeL anoRcxbLGPXDnUI8mSmH/edmF9AVAnB2MV/JVIbzklNLGOS7CCH7HgzeeSbbkBfCH3t2nT 090Q7Yp4q/YJPpnQTbiSuzHORIWzVI2etQn89aCDvu2zTE/p6Zil9TckMSYc9kRKoJRjqI /vI/vo0q2gI9Ut51f09bFbigGvVKNQgnCBw+blqu+HoTeY9xRrQNE5efpPY7hw== 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 4Y102n2P5gzKsS; Sat, 30 Nov 2024 19:09:05 +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 4AUJ95v2097129; Sat, 30 Nov 2024 19:09:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AUJ95gN097126; Sat, 30 Nov 2024 19:09:05 GMT (envelope-from git) Date: Sat, 30 Nov 2024 19:09:05 GMT Message-Id: <202411301909.4AUJ95gN097126@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: c58efaec2192 - stable/13 - ngatm: Fix mismatches between function definitions and prototypes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c58efaec21926b960ed76f0d4a02794fc858a662 Auto-Submitted: auto-generated The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=c58efaec21926b960ed76f0d4a02794fc858a662 commit c58efaec21926b960ed76f0d4a02794fc858a662 Author: John Baldwin AuthorDate: 2024-11-30 18:07:30 +0000 Commit: John Baldwin CommitDate: 2024-11-30 18:25:00 +0000 ngatm: Fix mismatches between function definitions and prototypes This is a direct commit to stable/13 (ngatm was removed in 14.0) to fix warnings reported by GCC 13 such as: /freebsd/stable/13/sys/contrib/ngatm/netnatm/sig/sig_reset.c:82:1: error: conflicting types for 'uni_sig_start' due to enum/integer mismatch; have 'void(struct uni *, u_int, uint32_t, struct uni_msg *, struct uni_all *)' {aka 'void(struct uni *, unsigned int, unsigned int, struct uni_msg *, struct uni_all *)'} [-Werror=enum-int-mismatch] 82 | uni_sig_start(struct uni *uni, u_int sig, uint32_t cookie, | ^~~~~~~~~~~~~ In file included from /freebsd/stable/13/sys/contrib/ngatm/netnatm/sig/sig_reset.c:40: /freebsd/stable/13/sys/contrib/ngatm/netnatm/sig/unipriv.h:257:6: note: previous declaration of 'uni_sig_start' with type 'void(struct uni *, enum start_sig, uint32_t, struct uni_msg *, struct uni_all *)' {aka 'void(struct uni *, enum start_sig, unsigned int, struct uni_msg *, struct uni_all *)'} 257 | void uni_sig_start(struct uni *, enum start_sig, uint32_t cookie, | ^~~~~~~~~~~~~ Reported by: GCC -Wenum-int-mismatch --- sys/contrib/ngatm/netnatm/api/ccatm.h | 2 +- sys/contrib/ngatm/netnatm/sig/sig_reset.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/contrib/ngatm/netnatm/api/ccatm.h b/sys/contrib/ngatm/netnatm/api/ccatm.h index 1b4a179a3348..920aa5a065ac 100644 --- a/sys/contrib/ngatm/netnatm/api/ccatm.h +++ b/sys/contrib/ngatm/netnatm/api/ccatm.h @@ -134,7 +134,7 @@ struct ccuser *cc_user_create(struct ccdata *, void *, const char *); void cc_user_destroy(struct ccuser *); /* signal from user */ -int cc_user_signal(struct ccuser *, u_int, struct uni_msg *); +int cc_user_signal(struct ccuser *, enum atmop, struct uni_msg *); /* Management is given up on this node. */ void cc_unmanage(struct ccdata *); diff --git a/sys/contrib/ngatm/netnatm/sig/sig_reset.c b/sys/contrib/ngatm/netnatm/sig/sig_reset.c index 469b9f762a6e..615d5fa00d08 100644 --- a/sys/contrib/ngatm/netnatm/sig/sig_reset.c +++ b/sys/contrib/ngatm/netnatm/sig/sig_reset.c @@ -79,7 +79,7 @@ TIMER_FUNC_UNI(t316, t316_func) * Reset-Start process. */ void -uni_sig_start(struct uni *uni, u_int sig, uint32_t cookie, +uni_sig_start(struct uni *uni, enum start_sig sig, uint32_t cookie, struct uni_msg *m, struct uni_all *u) { if (sig >= SIGS_END) { @@ -435,7 +435,7 @@ start_status(struct uni *uni, struct uni_msg *m, struct uni_all *u) * Reset-Respond process. */ void -uni_sig_respond(struct uni *uni, u_int sig, uint32_t cookie, +uni_sig_respond(struct uni *uni, enum respond_sig sig, uint32_t cookie, struct uni_msg *m, struct uni_all *u) { if (sig >= SIGR_END) {