1
0
mirror of https://github.com/openbsd/src.git synced 2025-01-03 06:45:37 -08:00

static inline, not inline static

c99 6.11.5:
"The placement of a storage-class specifier other than at the beginning
of the declaration specifiers in a declaration is an obsolescent
feature."

ok guenther@
This commit is contained in:
jsg 2022-08-29 02:58:13 +00:00
parent 07c7d596a1
commit c50e9b2274
8 changed files with 23 additions and 23 deletions

View File

@ -1,4 +1,4 @@
/* $OpenBSD: wctoint.h,v 1.2 2015/09/13 11:38:08 guenther Exp $ */
/* $OpenBSD: wctoint.h,v 1.3 2022/08/29 02:58:13 jsg Exp $ */
/* $NetBSD: __wctoint.h,v 1.1 2001/09/28 11:25:37 yamt Exp $ */
/*-
@ -30,7 +30,7 @@
*/
inline static int
static inline int
wctoint(wchar_t wc)
{
int n;

View File

@ -1,4 +1,4 @@
/* $OpenBSD: pmap.h,v 1.80 2022/06/01 17:47:18 dv Exp $ */
/* $OpenBSD: pmap.h,v 1.81 2022/08/29 02:58:13 jsg Exp $ */
/* $NetBSD: pmap.h,v 1.1 2003/04/26 18:39:46 fvdl Exp $ */
/*
@ -434,7 +434,7 @@ pmap_remove_all(struct pmap *pmap)
* if hardware doesn't support one-page flushing)
*/
inline static void
static inline void
pmap_update_pg(vaddr_t va)
{
invlpg(va);
@ -449,7 +449,7 @@ pmap_update_pg(vaddr_t va)
* unprotecting a page is done on-demand at fault time.
*/
inline static void
static inline void
pmap_page_protect(struct vm_page *pg, vm_prot_t prot)
{
if ((prot & PROT_WRITE) == 0) {
@ -469,7 +469,7 @@ pmap_page_protect(struct vm_page *pg, vm_prot_t prot)
* unprotecting a page is done on-demand at fault time.
*/
inline static void
static inline void
pmap_protect(struct pmap *pmap, vaddr_t sva, vaddr_t eva, vm_prot_t prot)
{
if ((prot & PROT_WRITE) == 0) {

View File

@ -1,4 +1,4 @@
/* $OpenBSD: cpu.h,v 1.178 2022/08/25 17:25:25 cheloha Exp $ */
/* $OpenBSD: cpu.h,v 1.179 2022/08/29 02:58:13 jsg Exp $ */
/* $NetBSD: cpu.h,v 1.35 1996/05/05 19:29:26 christos Exp $ */
/*-
@ -217,7 +217,7 @@ extern struct cpu_info *cpu_info_list;
static struct cpu_info *curcpu(void);
__inline static struct cpu_info *
static __inline struct cpu_info *
curcpu(void)
{
struct cpu_info *ci;

View File

@ -1,4 +1,4 @@
/* $OpenBSD: pmap.h,v 1.90 2022/06/01 17:16:00 dv Exp $ */
/* $OpenBSD: pmap.h,v 1.91 2022/08/29 02:58:13 jsg Exp $ */
/* $NetBSD: pmap.h,v 1.44 2000/04/24 17:18:18 thorpej Exp $ */
/*
@ -392,7 +392,7 @@ void pmap_flush_page_pae(paddr_t);
* Unprotecting a page is done on-demand at fault time.
*/
__inline static void
static __inline void
pmap_page_protect(struct vm_page *pg, vm_prot_t prot)
{
if ((prot & PROT_WRITE) == 0) {
@ -412,7 +412,7 @@ pmap_page_protect(struct vm_page *pg, vm_prot_t prot)
* Unprotecting a page is done on-demand at fault time.
*/
__inline static void
static __inline void
pmap_protect(struct pmap *pmap, vaddr_t sva, vaddr_t eva, vm_prot_t prot)
{
if ((prot & PROT_WRITE) == 0) {
@ -429,25 +429,25 @@ pmap_protect(struct pmap *pmap, vaddr_t sva, vaddr_t eva, vm_prot_t prot)
* modules from both uvm_pmap.h and pmap.h. Since uvm_pmap.h defines these
* as functions, inline them here to suppress linker warnings.
*/
__inline static vaddr_t
static __inline vaddr_t
pmap_growkernel(vaddr_t maxkvaddr)
{
return (*pmap_growkernel_p)(maxkvaddr);
}
__inline static int
static __inline int
pmap_enter(struct pmap *pmap, vaddr_t va, paddr_t pa, vm_prot_t prot, int flags)
{
return (*pmap_enter_p)(pmap, va, pa, prot, flags);
}
__inline static void
static __inline void
pmap_enter_special(vaddr_t va, paddr_t pa, vm_prot_t prot, u_int32_t flags)
{
(*pmap_enter_special_p)(va, pa, prot, flags);
}
__inline static int
static __inline int
pmap_extract(struct pmap *pmap, vaddr_t va, paddr_t *pa)
{
return (*pmap_extract_p)(pmap, va, pa);

View File

@ -1,11 +1,11 @@
/* $OpenBSD: mb89352.c,v 1.33 2022/04/16 19:19:58 naddy Exp $ */
/* $OpenBSD: mb89352.c,v 1.34 2022/08/29 02:58:13 jsg Exp $ */
/* $NetBSD: mb89352.c,v 1.5 2000/03/23 07:01:31 thorpej Exp $ */
/* NecBSD: mb89352.c,v 1.4 1998/03/14 07:31:20 kmatsuda Exp */
#ifdef DDB
#define integrate
#else
#define integrate __inline static
#define integrate static __inline
#endif
/*-

View File

@ -1,4 +1,4 @@
/* $OpenBSD: uvm_aobj.c,v 1.106 2022/08/01 14:15:46 mpi Exp $ */
/* $OpenBSD: uvm_aobj.c,v 1.107 2022/08/29 02:58:13 jsg Exp $ */
/* $NetBSD: uvm_aobj.c,v 1.39 2001/02/18 21:19:08 chs Exp $ */
/*
@ -241,7 +241,7 @@ uao_find_swhash_elt(struct uvm_aobj *aobj, int pageidx, boolean_t create)
/*
* uao_find_swslot: find the swap slot number for an aobj/pageidx
*/
inline static int
static inline int
uao_find_swslot(struct uvm_object *uobj, int pageidx)
{
struct uvm_aobj *aobj = (struct uvm_aobj *)uobj;

View File

@ -1,4 +1,4 @@
/* $OpenBSD: uvm_page.c,v 1.169 2022/08/01 14:15:46 mpi Exp $ */
/* $OpenBSD: uvm_page.c,v 1.170 2022/08/29 02:58:13 jsg Exp $ */
/* $NetBSD: uvm_page.c,v 1.44 2000/11/27 08:40:04 chs Exp $ */
/*
@ -130,7 +130,7 @@ int uvm_page_owner_locked_p(struct vm_page *);
* => call should have already set pg's object and offset pointers
* and bumped the version counter
*/
inline static void
static inline void
uvm_pageinsert(struct vm_page *pg)
{
struct vm_page *dupe;

View File

@ -1,4 +1,4 @@
/* $OpenBSD: npppd_pool.c,v 1.10 2017/05/30 17:22:00 yasuoka Exp $ */
/* $OpenBSD: npppd_pool.c,v 1.11 2022/08/29 02:58:13 jsg Exp $ */
/*-
* Copyright (c) 2009 Internet Initiative Japan Inc.
@ -338,7 +338,7 @@ npppd_pool_get_dynamic(npppd_pool *_this, npppd_ppp *ppp)
return (uint32_t)0;
}
inline static int
static inline int
npppd_is_ifcace_ip4addr(npppd *_this, uint32_t ip4addr)
{
int i;