-/* PSPP - computes sample statistics.
- Copyright (C) 2007 Free Software Foundation, Inc.
+/* PSPP - a program for statistical analysis.
+ Copyright (C) 2007, 2011 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 the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
+ 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
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include <config.h>
-#include <libpspp/deque.h>
+#include "libpspp/deque.h"
+
#include <string.h>
-#include "minmax.h"
-#include "xalloc.h"
+#include "gl/minmax.h"
+#include "gl/xalloc.h"
/* Initializes DEQUE as an empty deque with an initial capacity
of zero. */
size_t new_capacity = MAX (4, old_capacity * 2);
char *old_data = old_data_;
char *new_data = xnmalloc (new_capacity, elem_size);
- size_t idx, copy_cnt;
- for (idx = deque->back; idx != deque->front; idx += copy_cnt)
+ size_t idx, n_copy;
+ for (idx = deque->back; idx != deque->front; idx += n_copy)
{
size_t can_copy = old_capacity - (idx & (old_capacity - 1));
size_t want_copy = deque->front - idx;
- copy_cnt = MIN (can_copy, want_copy);
+ n_copy = MIN (can_copy, want_copy);
memcpy (new_data + (idx & (new_capacity - 1)) * elem_size,
old_data + (idx & (old_capacity - 1)) * elem_size,
- copy_cnt * elem_size);
+ n_copy * elem_size);
}
deque->capacity = new_capacity;
free (old_data);