X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flibpspp%2Farray.c;h=f82bce913012bb3f7e30cb816713428021e4faa6;hb=99f4295b50bc02b7024deeb59324a3332b560fbd;hp=e4d269373e8310dd5763fcaca4c638161e2f340a;hpb=43b1296aafe7582e7dbe6c2b6a8b478d7d9b0fcf;p=pspp
diff --git a/src/libpspp/array.c b/src/libpspp/array.c
index e4d269373e..f82bce9130 100644
--- a/src/libpspp/array.c
+++ b/src/libpspp/array.c
@@ -1,5 +1,5 @@
/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2010 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
@@ -84,15 +84,15 @@
. */
#include
+
#include "array.h"
+
#include
#include
#include
-#include "alloc.h"
#include
-#include "message.h"
-
+#include "xalloc.h"
#include "minmax.h"
/* Finds an element in ARRAY, which contains COUNT elements of
@@ -372,7 +372,7 @@ insert_range (void *array_, size_t count, size_t size,
/* Makes room for a new element at IDX in ARRAY, which initially
consists of COUNT elements of SIZE bytes each, by shifting
elements IDX...COUNT (exclusive) to the right by one
- positions. */
+ position. */
void
insert_element (void *array, size_t count, size_t size,
size_t idx)
@@ -640,7 +640,7 @@ typedef struct
void
sort (void *array, size_t count, size_t size,
- algo_compare_func *compare, const void *aux)
+ algo_compare_func *compare, const void *aux)
{
char *const first = array;
const size_t max_thresh = MAX_THRESH * size;