From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS22989 209.51.188.0/24 X-Spam-Status: No, score=-3.8 required=3.0 tests=AWL,BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dcvr.yhbt.net (Postfix) with ESMTPS id B0A3F1F5AE for ; Sat, 12 Jun 2021 00:26:55 +0000 (UTC) Received: from localhost ([::1]:58944 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lrrUE-0000gM-QM for normalperson@yhbt.net; Fri, 11 Jun 2021 20:26:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54130) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrrTf-0008V5-5X for bug-gnulib@gnu.org; Fri, 11 Jun 2021 20:26:19 -0400 Received: from zimbra.cs.ucla.edu ([131.179.128.68]:39200) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrrTd-0003qm-EQ for bug-gnulib@gnu.org; Fri, 11 Jun 2021 20:26:18 -0400 Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id 83B1B160120 for ; Fri, 11 Jun 2021 17:26:14 -0700 (PDT) Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id Q6Mtbs9z2W3f; Fri, 11 Jun 2021 17:26:12 -0700 (PDT) Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id 804EC160095; Fri, 11 Jun 2021 17:26:12 -0700 (PDT) X-Virus-Scanned: amavisd-new at zimbra.cs.ucla.edu Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id 46JLLRsZxwiA; Fri, 11 Jun 2021 17:26:12 -0700 (PDT) Received: from day.example.com (cpe-172-91-119-151.socal.res.rr.com [172.91.119.151]) by zimbra.cs.ucla.edu (Postfix) with ESMTPSA id 5044316011F; Fri, 11 Jun 2021 17:26:12 -0700 (PDT) From: Paul Eggert To: bug-gnulib@gnu.org Subject: [PATCH 11/13] stack: prefer idx_t for indexes Date: Fri, 11 Jun 2021 17:25:51 -0700 Message-Id: <20210612002553.1105537-11-eggert@cs.ucla.edu> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210612002553.1105537-1-eggert@cs.ucla.edu> References: <20210612002553.1105537-1-eggert@cs.ucla.edu> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=131.179.128.68; envelope-from=eggert@cs.ucla.edu; helo=zimbra.cs.ucla.edu X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: bug-gnulib@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Gnulib discussion list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paul Eggert Errors-To: bug-gnulib-bounces+normalperson=yhbt.net@gnu.org Sender: "bug-gnulib" * lib/stack.h (_GL_STACK_TYPE, _GL_STACK_PREFIX): Prefer idx_t to size_t for indexes, using idx_t-related allocators. --- ChangeLog | 1 + lib/stack.h | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 93039a69a..fc3c91d63 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,7 @@ * lib/readtokens.c (readtoken, readtokens): * lib/readutmp.c (read_utmp): * lib/savedir.c (streamsavedir): + * lib/stack.h (_GL_STACK_TYPE, _GL_STACK_PREFIX): Prefer idx_t to size_t for indexes, and use idx_t-related allocators. * lib/basename.c: Do not include xstrndup.h. (basename): Simplify by always using memcpy. diff --git a/lib/stack.h b/lib/stack.h index dfd57501f..9c3afe724 100644 --- a/lib/stack.h +++ b/lib/stack.h @@ -78,7 +78,7 @@ typedef struct { GL_STACK_ELEMENT *base; size_t size; - size_t allocated; + idx_t allocated; } _GL_STACK_TYPE; =20 /* Initialize a stack. */ @@ -119,8 +119,8 @@ GL_STACK_STORAGECLASS void _GL_STACK_PREFIX (push) (_GL_STACK_TYPE *stack, GL_STACK_ELEMENT item) { if (stack->size =3D=3D stack->allocated) - stack->base =3D x2nrealloc (stack->base, &stack->allocated, - sizeof (GL_STACK_ELEMENT)); + stack->base =3D xpalloc (stack->base, &stack->allocated, 1, -1, + sizeof *stack->base);; stack->base [stack->size++] =3D item; } =20 --=20 2.30.2