Module Name: src
Committed By: uwe
Date: Wed Jun 8 19:47:11 UTC 2022
Modified Files:
src/sys/dev/wsfont: wsfont.c
Log Message:
wsfont.c: use __arraycount instead of defining it locally
To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.78 src/sys/dev/wsfont/wsfont.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/wsfont/wsfont.c
diff -u src/sys/dev/wsfont/wsfont.c:1.77 src/sys/dev/wsfont/wsfont.c:1.78
--- src/sys/dev/wsfont/wsfont.c:1.77 Fri Dec 24 18:12:58 2021
+++ src/sys/dev/wsfont/wsfont.c Wed Jun 8 19:47:10 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: wsfont.c,v 1.77 2021/12/24 18:12:58 jmcneill Exp $ */
+/* $NetBSD: wsfont.c,v 1.78 2022/06/08 19:47:10 uwe Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsfont.c,v 1.77 2021/12/24 18:12:58 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsfont.c,v 1.78 2022/06/08 19:47:10 uwe Exp $");
#include "opt_wsfont.h"
@@ -1045,7 +1045,6 @@ static const struct wsfont_level1_glyphm
{ iso7_level1, 0, 0x26 }, /* WSDISPLAY_FONTENC_ISO7 */
};
-#define MAX_ENCODING (sizeof(encodings) / sizeof(encodings[0]))
/*
* Remap Unicode character to glyph
@@ -1057,7 +1056,7 @@ wsfont_map_unichar(struct wsdisplay_font
const struct wsfont_level2_glyphmap *map2;
int hi, lo;
- if (font->encoding < 0 || font->encoding >= MAX_ENCODING)
+ if (font->encoding < 0 || font->encoding >= __arraycount(encodings))
return (-1);
hi = (c >> 8);
