From nobody Wed Oct 30 19:28:44 2024 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 4Xdxxm376kz5bt7T; Wed, 30 Oct 2024 19:28:44 +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 4Xdxxm2Rzvz4Xdh; Wed, 30 Oct 2024 19:28:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730316524; 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=FIK+hZRIowonx/0G3tmx4BeEiYtDXbwP5whcnTixPfc=; b=Wtm/TgMyDJLzCtbVwB5U1aMNllooHrFPE9HFY3Xq13k1D9XC/c5BM+5oMIg0Zn/0we4rd/ CAYYhlqFgxfDUBp2qbl2qkHO8+gFA64zZuE+oUE3MgILUdtGorXL6Afh2tj+VugPuxl9Zm LN6MjaRJiektzPu6G6L8tHQOAc66U3L1oPLR2FEgTJi+Jw+LKUv5teOP4R9pL3Yin8TSw7 x4V/LQ3mmsPeIMl8FSxwHyo4kUcLqKiz15UvqqJ3zcoaBgC2HkynPTn+t+EyrANk59YXWR FvtFeepQrOMxkq6wUPkQHn2dlkKF7kSKehZkNq0jmCanTj2giZ4D/FAx/idbYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730316524; 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=FIK+hZRIowonx/0G3tmx4BeEiYtDXbwP5whcnTixPfc=; b=lCfYguH67AYEd5xThv4qN4QWJ791ENBtQ6oDRzYRostodZxQaF8fnmaTk3mCpgziPGVKz6 OMh5Cw1fcvXO7Gamt6TKkkL7nPdwuk/pMpGPBYqy9DzPdPQ1IY2GhZMtxl4A7Nb6u/PmXz yb3TvcJ2c+yYISrT+78TZ9bBlUds+HFEXK1vk2hY+77Uio7zBoBsmODwLgIG9EGh5YG/wR PP9s/D/AOjiiZ0Xx35uec/BvIyaD8PRNU/YJh6tf+koHyaHqFIUxkSb1mucLgndPiIHnnA vvzshZQ/tGD4MOBRvEtprDjHLbC+fU3HbDVfDR6DTnzrpcRIcyvxeQVh58LeTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730316524; a=rsa-sha256; cv=none; b=Ylc3s4j2DhOFiYbMkYMEUoHzAqUv10Vw2iivcWV+03tXF2mIDCbOgz3HTDxuQaFdcZxkUT Ha0n66Qt89Py3qeMF26SHhCG43GS34Cn+zNSfP+NZfloqDLk2/XKRibE0Hgs8P1R16XQs6 A0X0jE53RNGu8C5SVunHqbrfBdfKZR3HMNLa7KXb+Bl56iIPdr6Oe8DrW0b2640ROSaHTR xfQBk/yPJa/zEmHj/rYPxClnvKehTDYc9T55h7b/dSrznE8OGGRy2StXeSqsvoTNNVg1VZ 8uL+Mg9xYlwjnQRS+TvxnSYkFysu09UUb5yj4lwN1AX8HFo4VvoCxSIeTRGfzg== 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 4Xdxxm22ygz1KD6; Wed, 30 Oct 2024 19:28:44 +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 49UJSiZ0066057; Wed, 30 Oct 2024 19:28:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49UJSiQR066054; Wed, 30 Oct 2024 19:28:44 GMT (envelope-from git) Date: Wed, 30 Oct 2024 19:28:44 GMT Message-Id: <202410301928.49UJSiQR066054@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: a5d1cf5e362a - main - rpc: Fix the definition of xdr_void() 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a5d1cf5e362a2e3c3ebdf6d8f2b86658a6d0b9d6 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a5d1cf5e362a2e3c3ebdf6d8f2b86658a6d0b9d6 commit a5d1cf5e362a2e3c3ebdf6d8f2b86658a6d0b9d6 Author: Mark Johnston AuthorDate: 2024-10-30 19:27:18 +0000 Commit: Mark Johnston CommitDate: 2024-10-30 19:27:18 +0000 rpc: Fix the definition of xdr_void() xdr_void() should have type xdrproc_t, make it so. PR: 280514 Reviewed by: brooks, dim MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D47340 --- include/rpc/xdr.h | 2 +- lib/libc/xdr/xdr.c | 4 +--- sys/rpc/xdr.h | 2 +- sys/xdr/xdr.c | 3 +-- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/include/rpc/xdr.h b/include/rpc/xdr.h index 11d6a8d13b49..ecf10e1659e4 100644 --- a/include/rpc/xdr.h +++ b/include/rpc/xdr.h @@ -278,7 +278,7 @@ struct xdr_discrim { * These are the "generic" xdr routines. */ __BEGIN_DECLS -extern bool_t xdr_void(void); +extern bool_t xdr_void(XDR *, void *); extern bool_t xdr_int(XDR *, int *); extern bool_t xdr_u_int(XDR *, u_int *); extern bool_t xdr_long(XDR *, long *); diff --git a/lib/libc/xdr/xdr.c b/lib/libc/xdr/xdr.c index 6992cae69bf1..59a843405abf 100644 --- a/lib/libc/xdr/xdr.c +++ b/lib/libc/xdr/xdr.c @@ -84,13 +84,11 @@ xdr_free(xdrproc_t proc, void *objp) * XDR nothing */ bool_t -xdr_void(void) +xdr_void(XDR *xdrs __unused, void *ptr __unused) { - return (TRUE); } - /* * XDR integers */ diff --git a/sys/rpc/xdr.h b/sys/rpc/xdr.h index 745eb115f58f..1bb03a2a58ba 100644 --- a/sys/rpc/xdr.h +++ b/sys/rpc/xdr.h @@ -285,7 +285,7 @@ struct xdr_discrim { * These are the "generic" xdr routines. */ __BEGIN_DECLS -extern bool_t xdr_void(void); +extern bool_t xdr_void(XDR *, void *); extern bool_t xdr_int(XDR *, int *); extern bool_t xdr_u_int(XDR *, u_int *); extern bool_t xdr_long(XDR *, long *); diff --git a/sys/xdr/xdr.c b/sys/xdr/xdr.c index 245ac7cef4fb..81d238ebf19f 100644 --- a/sys/xdr/xdr.c +++ b/sys/xdr/xdr.c @@ -84,9 +84,8 @@ xdr_free(xdrproc_t proc, void *objp) * XDR nothing */ bool_t -xdr_void(void) +xdr_void(XDR *xrds __unused, void *ptr __unused) { - return (TRUE); }