From owner-svn-src-head@freebsd.org Thu Nov 5 23:28:06 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0B9D02D361B; Thu, 5 Nov 2020 23:28:06 +0000 (UTC) (envelope-from jhb@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CS07T6SMwz3n5Y; Thu, 5 Nov 2020 23:28:05 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D09C61BA42; Thu, 5 Nov 2020 23:28:05 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0A5NS52e043649; Thu, 5 Nov 2020 23:28:05 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0A5NS5oF043647; Thu, 5 Nov 2020 23:28:05 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <202011052328.0A5NS5oF043647@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Thu, 5 Nov 2020 23:28:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r367404 - head/sys/opencrypto X-SVN-Group: head X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: head/sys/opencrypto X-SVN-Commit-Revision: 367404 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Nov 2020 23:28:06 -0000 Author: jhb Date: Thu Nov 5 23:28:05 2020 New Revision: 367404 URL: https://svnweb.freebsd.org/changeset/base/367404 Log: Style fixes for function prototypes and definitions. Reviewed by: markj Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D27066 Modified: head/sys/opencrypto/crypto.c head/sys/opencrypto/cryptodev.c Modified: head/sys/opencrypto/crypto.c ============================================================================== --- head/sys/opencrypto/crypto.c Thu Nov 5 23:26:02 2020 (r367403) +++ head/sys/opencrypto/crypto.c Thu Nov 5 23:28:05 2020 (r367404) @@ -286,7 +286,9 @@ keybuf_init(void) } /* It'd be nice if we could store these in some kind of secure memory... */ -struct keybuf * get_keybuf(void) { +struct keybuf * +get_keybuf(void) +{ return (keybuf); } Modified: head/sys/opencrypto/cryptodev.c ============================================================================== --- head/sys/opencrypto/cryptodev.c Thu Nov 5 23:26:02 2020 (r367403) +++ head/sys/opencrypto/cryptodev.c Thu Nov 5 23:28:05 2020 (r367404) @@ -351,13 +351,13 @@ SYSCTL_TIMEVAL_SEC(_kern, OID_AUTO, cryptodev_warn_int &warninterval, "Delay in seconds between warnings of deprecated /dev/crypto algorithms"); -static int cryptof_ioctl(struct file *, u_long, void *, - struct ucred *, struct thread *); -static int cryptof_stat(struct file *, struct stat *, - struct ucred *, struct thread *); -static int cryptof_close(struct file *, struct thread *); -static int cryptof_fill_kinfo(struct file *, struct kinfo_file *, - struct filedesc *); +static int cryptof_ioctl(struct file *, u_long, void *, struct ucred *, + struct thread *); +static int cryptof_stat(struct file *, struct stat *, struct ucred *, + struct thread *); +static int cryptof_close(struct file *, struct thread *); +static int cryptof_fill_kinfo(struct file *, struct kinfo_file *, + struct filedesc *); static struct fileops cryptofops = { .fo_read = invfo_rdwr, @@ -381,12 +381,12 @@ static struct csession *csecreate(struct fcrypt *, cry struct auth_hash *, void *); static void csefree(struct csession *); -static int cryptodev_op(struct csession *, const struct crypt_op *, - struct ucred *, struct thread *td); -static int cryptodev_aead(struct csession *, struct crypt_aead *, - struct ucred *, struct thread *); -static int cryptodev_key(struct crypt_kop *); -static int cryptodev_find(struct crypt_find_op *); +static int cryptodev_op(struct csession *, const struct crypt_op *, + struct ucred *, struct thread *); +static int cryptodev_aead(struct csession *, struct crypt_aead *, + struct ucred *, struct thread *); +static int cryptodev_key(struct crypt_kop *); +static int cryptodev_find(struct crypt_find_op *); /* * Check a crypto identifier to see if it requested @@ -417,12 +417,8 @@ checkforsoftware(int *cridp) /* ARGSUSED */ static int -cryptof_ioctl( - struct file *fp, - u_long cmd, - void *data, - struct ucred *active_cred, - struct thread *td) +cryptof_ioctl(struct file *fp, u_long cmd, void *data, + struct ucred *active_cred, struct thread *td) { static struct timeval keywarn, featwarn; struct crypto_session_params csp; @@ -940,11 +936,8 @@ cod_free(struct cryptop_data *cod) } static int -cryptodev_op( - struct csession *cse, - const struct crypt_op *cop, - struct ucred *active_cred, - struct thread *td) +cryptodev_op(struct csession *cse, const struct crypt_op *cop, + struct ucred *active_cred, struct thread *td) { struct cryptop_data *cod = NULL; struct cryptop *crp = NULL; @@ -1154,11 +1147,8 @@ bail: } static int -cryptodev_aead( - struct csession *cse, - struct crypt_aead *caead, - struct ucred *active_cred, - struct thread *td) +cryptodev_aead(struct csession *cse, struct crypt_aead *caead, + struct ucred *active_cred, struct thread *td) { struct cryptop_data *cod = NULL; struct cryptop *crp = NULL; @@ -1515,11 +1505,8 @@ cryptodev_find(struct crypt_find_op *find) /* ARGSUSED */ static int -cryptof_stat( - struct file *fp, - struct stat *sb, - struct ucred *active_cred, - struct thread *td) +cryptof_stat(struct file *fp, struct stat *sb, struct ucred *active_cred, + struct thread *td) { return (EOPNOTSUPP); @@ -1545,7 +1532,8 @@ cryptof_close(struct file *fp, struct thread *td) } static int -cryptof_fill_kinfo(struct file *fp, struct kinfo_file *kif, struct filedesc *fdp) +cryptof_fill_kinfo(struct file *fp, struct kinfo_file *kif, + struct filedesc *fdp) { kif->kf_type = KF_TYPE_CRYPTO; @@ -1634,7 +1622,8 @@ csefree(struct csession *cse) } static int -cryptoioctl(struct cdev *dev, u_long cmd, caddr_t data, int flag, struct thread *td) +cryptoioctl(struct cdev *dev, u_long cmd, caddr_t data, int flag, + struct thread *td) { struct file *f; struct fcrypt *fcr;