From unknown Mon Jun 23 07:53:16 2025 X-Loop: help-debbugs@gnu.org Subject: bug#6730: [PATCH] sort: make struct heap private Resent-From: Paul Eggert Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-To: owner@debbugs.gnu.org Resent-CC: bug-coreutils@gnu.org Resent-Date: Mon, 26 Jul 2010 04:23:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 6730 X-GNU-PR-Package: coreutils X-GNU-PR-Keywords: patch To: 6730@debbugs.gnu.org X-Debbugs-Original-To: Bug Coreutils Received: via spool by submit@debbugs.gnu.org id=B.128011814425734 (code B ref -1); Mon, 26 Jul 2010 04:23:02 +0000 Received: (at submit) by debbugs.gnu.org; 26 Jul 2010 04:22:24 +0000 Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OdFCo-0006h1-Mi for submit@debbugs.gnu.org; Mon, 26 Jul 2010 00:22:23 -0400 Received: from mx10.gnu.org ([199.232.76.166]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OdFCn-0006gt-6x for submit@debbugs.gnu.org; Mon, 26 Jul 2010 00:22:21 -0400 Received: from lists.gnu.org ([199.232.76.165]:48302) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1OdFCq-00064O-QT for submit@debbugs.gnu.org; Mon, 26 Jul 2010 00:22:24 -0400 Received: from [140.186.70.92] (port=50140 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OdFCo-0002wD-I5 for bug-coreutils@gnu.org; Mon, 26 Jul 2010 00:22:23 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_RP_MATCHES_RCVD autolearn=unavailable version=3.3.1 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OdFCm-0005W6-H4 for bug-coreutils@gnu.org; Mon, 26 Jul 2010 00:22:21 -0400 Received: from kiwi.cs.ucla.edu ([131.179.128.19]:38860) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OdFCm-0005Vo-7R for bug-coreutils@gnu.org; Mon, 26 Jul 2010 00:22:20 -0400 Received: from [131.179.64.200] (Penguin.CS.UCLA.EDU [131.179.64.200]) by kiwi.cs.ucla.edu (8.13.8+Sun/8.13.8/UCLACS-6.0) with ESMTP id o6Q4MGYd027398 for ; Sun, 25 Jul 2010 21:22:18 -0700 (PDT) Message-ID: <4C4D0D78.4060001@cs.ucla.edu> Date: Sun, 25 Jul 2010 21:22:16 -0700 From: Paul Eggert Organization: UCLA Computer Science Department User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.1.10) Gecko/20100527 Thunderbird/3.0.5 MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-detected-operating-system: by eggs.gnu.org: Solaris 10 (beta) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Spam-Score: -5.1 (-----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -5.1 (-----) >From d36d5c8029fd24a3f8e1e443007ba9a1c8f243e6 Mon Sep 17 00:00:00 2001 From: Paul R. Eggert Date: Sun, 25 Jul 2010 21:18:14 -0700 Subject: [PATCH] sort: make struct heap private * gl/lib/heap.c (struct heap): Move this here... * gl/lib/heap.h (struct heap): ... from here, as outside code no longer needs to access any of these members. --- gl/lib/heap.c | 7 +++++++ gl/lib/heap.h | 8 -------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/gl/lib/heap.c b/gl/lib/heap.c index baf9a27..80ea70e 100644 --- a/gl/lib/heap.c +++ b/gl/lib/heap.c @@ -30,6 +30,13 @@ static size_t heapify_down (void **, size_t, size_t, static void heapify_up (void **, size_t, int (*) (void const *, void const *)); +struct heap +{ + void **array; /* array[0] is not used */ + size_t capacity; /* Array size */ + size_t count; /* Used as index to last element. Also is num of items. */ + int (*compare) (void const *, void const *); +}; /* Allocate memory for the heap. */ diff --git a/gl/lib/heap.h b/gl/lib/heap.h index b61adf6..cbfeb04 100644 --- a/gl/lib/heap.h +++ b/gl/lib/heap.h @@ -20,14 +20,6 @@ #include -struct heap -{ - void **array; /* array[0] is not used */ - size_t capacity; /* Array size */ - size_t count; /* Used as index to last element. Also is num of items. */ - int (*compare) (void const *, void const *); -}; - struct heap *heap_alloc (int (*) (void const *, void const *), size_t); void heap_free (struct heap *); int heap_insert (struct heap *heap, void *item); -- 1.7.1 From unknown Mon Jun 23 07:53:16 2025 X-Loop: help-debbugs@gnu.org Subject: bug#6730: [PATCH] sort: make struct heap private Resent-From: =?UTF-8?Q?P=C3=A1draig?= Brady Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-To: owner@debbugs.gnu.org Resent-CC: bug-coreutils@gnu.org Resent-Date: Mon, 26 Jul 2010 09:56:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 6730 X-GNU-PR-Package: coreutils X-GNU-PR-Keywords: patch To: Paul Eggert Cc: 6730@debbugs.gnu.org Received: via spool by 6730-submit@debbugs.gnu.org id=B6730.12801381062441 (code B ref 6730); Mon, 26 Jul 2010 09:56:02 +0000 Received: (at 6730) by debbugs.gnu.org; 26 Jul 2010 09:55:06 +0000 Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OdKOn-0000dK-Pg for submit@debbugs.gnu.org; Mon, 26 Jul 2010 05:55:06 -0400 Received: from mail1.slb.deg.dub.stisp.net ([84.203.253.98]) by debbugs.gnu.org with smtp (Exim 4.69) (envelope-from ) id 1OdKOm-0000ch-22 for 6730@debbugs.gnu.org; Mon, 26 Jul 2010 05:55:04 -0400 Received: (qmail 15722 invoked from network); 26 Jul 2010 09:55:08 -0000 Received: from unknown (HELO ?192.168.2.25?) (84.203.137.218) by mail1.slb.deg.dub.stisp.net with SMTP; 26 Jul 2010 09:55:08 -0000 Message-ID: <4C4D5B4C.5080607@draigBrady.com> Date: Mon, 26 Jul 2010 10:54:20 +0100 From: =?UTF-8?Q?P=C3=A1draig?= Brady User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.1.8) Gecko/20100227 Thunderbird/3.0.3 MIME-Version: 1.0 References: <4C4D0D78.4060001@cs.ucla.edu> In-Reply-To: <4C4D0D78.4060001@cs.ucla.edu> X-Enigmail-Version: 1.0.1 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.7 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -2.7 (--) > Subject: [PATCH] sort: make struct heap private > > * gl/lib/heap.c (struct heap): Move this here... > * gl/lib/heap.h (struct heap): ... from here, as outside code no > longer needs to access any of these members. good. closing... thanks, Pádraig. From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 26 05:59:19 2010 Received: (at control) by debbugs.gnu.org; 26 Jul 2010 09:59:20 +0000 Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OdKSt-0000fI-CC for submit@debbugs.gnu.org; Mon, 26 Jul 2010 05:59:19 -0400 Received: from mail1.slb.deg.dub.stisp.net ([84.203.253.98]) by debbugs.gnu.org with smtp (Exim 4.69) (envelope-from ) id 1OdKSr-0000fB-PS for control@debbugs.gnu.org; Mon, 26 Jul 2010 05:59:18 -0400 Received: (qmail 16455 invoked from network); 26 Jul 2010 09:59:21 -0000 Received: from unknown (HELO ?192.168.2.25?) (84.203.137.218) by mail1.slb.deg.dub.stisp.net with SMTP; 26 Jul 2010 09:59:21 -0000 Message-ID: <4C4D5C49.8070102@draigBrady.com> Date: Mon, 26 Jul 2010 10:58:33 +0100 From: =?UTF-8?B?UMOhZHJhaWcgQnJhZHk=?= User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.1.8) Gecko/20100227 Thunderbird/3.0.3 MIME-Version: 1.0 To: control@debbugs.gnu.org X-Enigmail-Version: 1.0.1 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Spam-Score: -1.8 (-) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -1.8 (-) tags 6730 notabug close 6730