From 00893e79fc62966067af1a106567db96bd170338 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 3 Mar 2024 19:11:32 +0100 Subject: New upstream version 1.2 --- tests/unistr/test-u-strtok.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'tests/unistr/test-u-strtok.h') diff --git a/tests/unistr/test-u-strtok.h b/tests/unistr/test-u-strtok.h index 15389ac1..74272d3b 100644 --- a/tests/unistr/test-u-strtok.h +++ b/tests/unistr/test-u-strtok.h @@ -1,5 +1,5 @@ /* Test of uN_strtok() functions. - Copyright (C) 2015-2022 Free Software Foundation, Inc. + Copyright (C) 2015-2024 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -50,10 +50,12 @@ test_u_strtok (void) 'A', 'B', 'C', 'D', 'A', 'B', 'C', 'D', 'A', 'B', 'D', 'E', 0 }; ucs4_t u_delim[] = { 0x3000, 0x3001, 0 }; - size_t input_len = 6 * SIZEOF (u_input); - UNIT *input = (UNIT *) malloc (input_len); - size_t delim_len = 6 * SIZEOF (u_delim); - UNIT *delim = (UNIT *) malloc (delim_len); + /* Convert ucs4_t[] to UNIT[]. + Every ucs4_t yields at most 4 / sizeof (UNIT) units. */ + size_t input_len = SIZEOF (u_input) * (4 / sizeof (UNIT)); + UNIT *input = (UNIT *) malloc (input_len * sizeof (UNIT)); + size_t delim_len = SIZEOF (u_delim) * (4 / sizeof (UNIT)); + UNIT *delim = (UNIT *) malloc (delim_len * sizeof (UNIT)); UNIT *state; const UNIT *result; UNIT *ptr, *first_ptr, *second_ptr; -- cgit v1.2.3