upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-04 14:26:03 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

loader: Retire CTASSERT

Browse source 
The project is moving away from CTASSERT in favor of
_Static_assert. Cleanup the few instances in the loader proactively.

Sponsored by:		Netflix
Reviewed by:		manu, tsoome
Differential Revision:	https://reviews.freebsd.org/D44006

(cherry picked from commit 32568e5f24)
This commit is contained in:
Warner Losh 2024-02-21 08:48:32 -07:00
parent c3f5ae85ce
commit e9620c27f1
4 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
stand/common/bootstrap.h
View file

@ -382,8 +382,4 @@ int gen_setcurrdev(struct env_var *ev, int flags, const void *value);
int mount_currdev(struct env_var *, int, const void *);
void set_currdev(const char *devname);
#ifndef CTASSERT
#define CTASSERT(x) _Static_assert(x, "compile-time assertion failed")
#endif
#endif /* !_BOOTSTRAP_H_ */

2
stand/efi/loader/arch/amd64/multiboot2.c
View file

@ -334,7 +334,7 @@ exec(struct preloaded_file *fp)
struct mb2hdr *hdr;
CTASSERT(sizeof(header) <= PAGE_SIZE);
_Static_assert(sizeof(header) <= PAGE_SIZE, "header too big");
if ((md = file_findmetadata(fp,
MODINFOMD_NOCOPY | MODINFOMD_MB2HDR)) == NULL) {

2
stand/i386/libi386/multiboot.c
View file

@ -165,7 +165,7 @@ multiboot_exec(struct preloaded_file *fp)
int error, mod_num;
struct xen_header header;
CTASSERT(sizeof(header) <= PAGE_SIZE);
_Static_assert(sizeof(header) <= PAGE_SIZE, "header too large for page");
/*
* Don't pass the memory size found by the bootloader, the memory

9
stand/i386/loader/main.c
View file

@ -51,14 +51,13 @@
#include "libzfs.h"
#endif
CTASSERT(sizeof(struct bootargs) == BOOTARGS_SIZE);
CTASSERT(offsetof(struct bootargs, bootinfo) == BA_BOOTINFO);
CTASSERT(offsetof(struct bootargs, bootflags) == BA_BOOTFLAGS);
CTASSERT(offsetof(struct bootinfo, bi_size) == BI_SIZE);
_Static_assert(sizeof(struct bootargs) == BOOTARGS_SIZE, "Bootarg size bad");
_Static_assert(offsetof(struct bootargs, bootinfo) == BA_BOOTINFO, "BA_BOOTINFO");
_Static_assert(offsetof(struct bootargs, bootflags) == BA_BOOTFLAGS, "BA_BOOTFLAGS");
_Static_assert(offsetof(struct bootinfo, bi_size) == BI_SIZE, "BI_SIZE");
/* Arguments passed in from the boot1/boot2 loader */
static struct bootargs *kargs;
static uint32_t initial_howto;
static uint32_t initial_bootdev;
static struct bootinfo *initial_bootinfo;