From nobody Fri May 30 15:57:25 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 4b87D65Vyrz5xpqC; Fri, 30 May 2025 15:57:26 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b87D60sBRz3RLb; Fri, 30 May 2025 15:57:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748620646; 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=tsbhP3dNLXoMdrzhTbQYs7RFwYwHoXYDpUXc4ajQngY=; b=ifNNMd2xLD7Pqtcn5MKwPPcC6OButaBXg0ePALXnojOKLq/5dDby/eUbj8MB7nOOHfp0SL wQqPwuMAYn5O5bjgX6Pe4hPwQFX9LN7KLydrljb9pXpiqoseVBMFH5m9XyRhBZ8T9n9KFX QoDaB2uv3UDoj68AonSYSFC2FjYrUGRmcPZFMqUR172TJuASh+V91I61mDH74FD0DxMfXp qWyIS/LWq+B+48LTFz2w5DHG5FuMxFRgjkKiZniIpb3Rqf1NOzvfhdqFT7nA3tBYvyfaVH nD9rFZaaMUfCLMmnRh6BoTuQvaJCmGq9grL0YcnlfATFbl5mENlXeYr2pHI8tg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748620646; a=rsa-sha256; cv=none; b=sdc1CIKgrElFrMZHtgUGDTw04ceS+zQKT+X55rgMEfZGoSQRkw6A9OSIwsqoIIRlpPItMP aT5VR4qDhP0yZhJWX91qj52a8ooEiNEUNcvBa6oNYd9H+nXMrwIUQsRc5pk9am+XDHNoDD tIFjxJHTORY1+TUf+5aN6/1DWWRfJTUbzZlWO2fXlgxfRSEuJ+8dxLEHYQc191JiOncJmy s9MYQWz6dgUQ/NYLs9XocitnXtX9kF3UEBbq3fQrjedIAfbGKGqWcy+eSZ6O+ixvOVcbgH YSck8jggh7+Jz/ezCy83yMMhAGCgb9VgYPC3e6XuqnDKL0kr2FLsGNh239lvlw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748620646; 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=tsbhP3dNLXoMdrzhTbQYs7RFwYwHoXYDpUXc4ajQngY=; b=tnM47JjbtzH0I8atrcFts35CMP+/fLLhoV4S8ZErIpvkWNHL4LkyNubf6z0IRVPiCvRlWb 5pDY7eBhn15YhSQZfJtAGrjsN5iJFW2w4EtgQVqenpaBEyPg7UuwdhdEreqcSWqTrXQHz8 myj/ms2rtcTxDI4IVR8r6GOx/p/XEScw1FMs203k8u3qKirdza/+YZIjHQ8x7+oyI/hTvo bsV4n3U5eolGlJC8EEq8d8LQgIWwVCkzfibcjT9lXOM7i1bFMaADByONheVXaVellxGr3q c5GAu1dyWdrzAcKDoABtYgOh6udVerfxAyoGjJcAkTH5LU6doAtsvbhbWTBKTQ== 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 4b87D60HFXzyh8; Fri, 30 May 2025 15:57:26 +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 54UFvP29079434; Fri, 30 May 2025 15:57:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54UFvPEr079431; Fri, 30 May 2025 15:57:25 GMT (envelope-from git) Date: Fri, 30 May 2025 15:57:25 GMT Message-Id: <202505301557.54UFvPEr079431@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: aeb446be4ea2 - main - style: Use static consistently 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aeb446be4ea2d214ee48b82bcefd1828c7c256c5 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=aeb446be4ea2d214ee48b82bcefd1828c7c256c5 commit aeb446be4ea2d214ee48b82bcefd1828c7c256c5 Author: Warner Losh AuthorDate: 2025-05-30 14:14:50 +0000 Commit: Warner Losh CommitDate: 2025-05-30 15:56:50 +0000 style: Use static consistently C doesn't require that we have static on both the declaration and definition of a function. But stylistically, FreeBSD does. Make that so. Also make a function static that wasn't because, it seems, that static and struct look a lot alike in a column of text. Sponsored by: Netflix Reviewed by: tsoome, jhibbits Differential Revision: https://reviews.freebsd.org/D50588 --- stand/common/module.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/stand/common/module.c b/stand/common/module.c index ed57ebf0caf8..bc06ba01fa06 100644 --- a/stand/common/module.c +++ b/stand/common/module.c @@ -66,7 +66,7 @@ static char * mod_searchmodule_pnpinfo(const char *bus, const char *pnpinfo); static void file_insert_tail(struct preloaded_file *mp); static void file_remove(struct preloaded_file *fp); static void file_remove_tail(struct preloaded_file *fp); -struct file_metadata* metadata_next(struct file_metadata *base_mp, int type); +static struct file_metadata * metadata_next(struct file_metadata *base_mp, int type); static void moduledir_readhints(struct moduledir *mdp); static void moduledir_rebuild(void); @@ -554,7 +554,7 @@ command_pnpautoload(int argc, char *argv[]) /* * File level interface, functions file_* */ -int +static int file_load(char *filename, vm_offset_t dest, struct preloaded_file **result) { static int last_file_format = 0; @@ -915,7 +915,7 @@ file_findfile(const char *name, const char *type) * Find a module matching (name) inside of given file. * NULL may be passed as a wildcard. */ -struct kernel_module * +static struct kernel_module * file_findmodule(struct preloaded_file *fp, char *modname, struct mod_depend *verinfo) { @@ -1047,7 +1047,7 @@ file_addbuf(const char *name, const char *type, size_t len, void *buf) return(0); } -struct file_metadata * +static struct file_metadata * metadata_next(struct file_metadata *md, int type) {