CC-tea/coreutils
1
0
Fork 0
mirror of git://git.sv.gnu.org/coreutils.git synced 2026-04-21 11:16:16 +02:00
Code Issues Projects Releases Wiki Activity

sort: use more-consistent style with const

Browse Source 
* src/sort.c (proctab_hasher, proctab_comparator, stream_open, xfopen):
(open_temp, zaptemp, struct_month_cmp, begfield, limfield):
(find_unit_order, human_numcompare, numcompare, general_numcompare):
(count_tabs, keycompare, compare, compare_nodes, lock_node):
(unlock_node, queue_destroy, queue_init, queue_insert, queue_pop):
(write_unique, mergelines_node, check_insert, update_parent):
(merge_loop, sortlines, struct thread_args, set_ordering):
Prefer the style "T const" to "const T".
* gl/lib/heap.h (struct heap, heap_alloc): Likewise.
* gl/lib/heap.c (heap_default_compare, heapify_down, heapify_up):
(heap_alloc): Likewise.
This commit is contained in:
Paul R. Eggert
2010-07-25 19:24:33 -07:00
committed by Paul Eggert
parent 01ca128807
commit 48faad3748
3 changed files with 60 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
gl/lib/heap.c
View File

@@ -24,17 +24,17 @@
#include "stdlib--.h"
#include "xalloc.h"
static int heap_default_compare (const void *, const void *);
static int heap_default_compare (void const *, void const *);
static size_t heapify_down (void **, size_t, size_t,
int (*)(const void *, const void *));
int (*) (void const *, void const *));
static void heapify_up (void **, size_t,
int (*)(const void *, const void *));
int (*) (void const *, void const *));
/* Allocate memory for the heap. */
struct heap *
heap_alloc (int (*compare)(const void *, const void *), size_t n_reserve)
heap_alloc (int (*compare) (void const *, void const *), size_t n_reserve)
{
struct heap *heap = xmalloc (sizeof *heap);
@@ -53,7 +53,7 @@ heap_alloc (int (*compare)(const void *, const void *), size_t n_reserve)
static int
heap_default_compare (const void *a, const void *b)
heap_default_compare (void const *a, void const *b)
{
return 0;
}
@@ -100,7 +100,7 @@ heap_remove_top (struct heap *heap)
static size_t
heapify_down (void **array, size_t count, size_t initial,
int (*compare)(const void *, const void *))
int (*compare) (void const *, void const *))
{
void *element = array[initial];
@@ -127,7 +127,7 @@ heapify_down (void **array, size_t count, size_t initial,
static void
heapify_up (void **array, size_t count,
int (*compare)(const void *, const void *))
int (*compare) (void const *, void const *))
{
size_t k = count;
void *new_element = array[k];

4
gl/lib/heap.h
View File

@@ -25,10 +25,10 @@ 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)(const void *, const void *);
int (*compare) (void const *, void const *);
};
struct heap *heap_alloc (int (*)(const void *, const void *), size_t);
struct heap *heap_alloc (int (*) (void const *, void const *), size_t);
void heap_free (struct heap *);
int heap_insert (struct heap *heap, void *item);
void *heap_remove_top (struct heap *heap);