From 9d3ec33a02dccaaa930f839752304d1b8d0b903e Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Wed, 5 Jan 2022 11:51:38 -0800 Subject: [PATCH 2/2] stack: also update stack_size to return idx_t * lib/stack.h (_GL_STACK_PREFIX (size)): Return idx_t, not size_t. --- ChangeLog | 1 + NEWS | 3 +++ lib/stack.h | 6 +++--- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 609720a451..4829d58e83 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ * lib/stack.h (_GL_STACK_TYPE): Use idx_t for size too. Suggested by Bruno Haible in: https://lists.gnu.org/r/bug-gnulib/2022-01/msg00035.html + (_GL_STACK_PREFIX (size)): Return idx_t, not size_t. 2022-01-05 Bruno Haible diff --git a/NEWS b/NEWS index 2ce1c73014..c13a115ada 100644 --- a/NEWS +++ b/NEWS @@ -66,6 +66,9 @@ User visible incompatible changes Date Modules Changes +2022-01-05 stack This module now uses idx_t instead of size_t + for indexes and counts. + 2021-08-27 base32 These modules now use idx_t instead of size_t base64 for indexes and counts. diff --git a/lib/stack.h b/lib/stack.h index b4c35535a7..28b9d7a542 100644 --- a/lib/stack.h +++ b/lib/stack.h @@ -17,7 +17,7 @@ /* Written by Marc Nieper-Wißkirchen , 2020. */ /* This header file does not have include-guards as it is meant to be - includeable multiple times as long as the necessary defines have + includable multiple times as long as the necessary defines have been set up. A stack is implemented with a homogenous array of elements in @@ -36,7 +36,7 @@ Popping: ELEMENT element = stack_pop (&stack); Discarding: stack_discard (&stack); Top-of-stack: ELEMENT element = stack_top (&stack); - Size: size_t size = stack_size (&stack); + Size: idx_t size = stack_size (&stack); Here, ELEMENT is the type to which GL_STACK_ELEMENT was defined when this file was included. @@ -152,7 +152,7 @@ _GL_STACK_PREFIX (top) (const _GL_STACK_TYPE *stack) } /* Return the currently stored number of elements in the stack. */ -GL_STACK_STORAGECLASS _GL_ATTRIBUTE_PURE size_t +GL_STACK_STORAGECLASS _GL_ATTRIBUTE_PURE idx_t _GL_STACK_PREFIX (size) (const _GL_STACK_TYPE *stack) { return stack->size; -- 2.32.0