Hello Dimitry,

I've just spoted by luck that world fails at this commit:

Building
/usr/obj/usr/src/amd64.amd64/tmp/obj-tools/usr.sbin/zic/_debuginstall
In file included from /usr/src/usr.bin/vtfontcvt/vtfontcvt.c:32:
/usr/obj/usr/src/amd64.amd64/tmp/legacy/usr/include/sys/font.h:111:22:
error: expected ';' at end of declaration list
  111 |         uint8_t         fh_magic[8] __nonstring;
      |                                    ^
      |                                    ;

Cheers,

Dimitry Andric <[email protected]> escreveu (sexta, 26/12/2025 à(s) 14:32):

> The branch main has been updated by dim:
>
> URL:
> https://cgit.FreeBSD.org/src/commit/?id=e2c93ed09f259ed049923bdaa9b697b3586e2f1a
>
> commit e2c93ed09f259ed049923bdaa9b697b3586e2f1a
> Author:     Dimitry Andric <[email protected]>
> AuthorDate: 2025-12-26 14:31:43 +0000
> Commit:     Dimitry Andric <[email protected]>
> CommitDate: 2025-12-26 14:32:09 +0000
>
>     sys/font.h: avoid warnings about too-long initializer strings
>
>     Mark `font_header::fh_magic` as `__non_string`, to avoid a warning from
>     clang 21 similar to:
>
>         /usr/src/usr.bin/vtfontcvt/vtfontcvt.c:763:15: error:
> initializer-string for character array is too long, array size is 8 but
> initializer has size 9 (including the null terminating character); did you
> mean to use the 'nonstring' attribute?
> [-Werror,-Wunterminated-string-initialization]
>           763 |                 .fh_magic = FONT_HEADER_MAGIC,
>               |                             ^~~~~~~~~~~~~~~~~
>         /usr/obj/usr/src/amd64.amd64/tmp/usr/include/sys/font.h:109:27:
> note: expanded from macro 'FONT_HEADER_MAGIC'
>           109 | #define FONT_HEADER_MAGIC       "VFNT0002"
>               |                                 ^~~~~~~~~~
>
>     MFC after:      3 days
> ---
>  sys/sys/font.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/sys/sys/font.h b/sys/sys/font.h
> index fb5fbbc9e557..d486dbc3a011 100644
> --- a/sys/sys/font.h
> +++ b/sys/sys/font.h
> @@ -108,7 +108,7 @@ typedef STAILQ_HEAD(font_list, fontlist) font_list_t;
>
>  #define        FONT_HEADER_MAGIC       "VFNT0002"
>  struct font_header {
> -       uint8_t         fh_magic[8];
> +       uint8_t         fh_magic[8] __nonstring;
>         uint8_t         fh_width;
>         uint8_t         fh_height;
>         uint16_t        fh_pad;
>
>

-- 
Nuno Teixeira
FreeBSD UNIX:  <[email protected]>   Web:  https://FreeBSD.org

Reply via email to