[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pspp-cvs] pspp/src data/case-map.c data/case.c data/categ...
|
From: |
Ben Pfaff |
|
Subject: |
[Pspp-cvs] pspp/src data/case-map.c data/case.c data/categ... |
|
Date: |
Fri, 12 Oct 2007 04:59:31 +0000 |
CVSROOT: /cvsroot/pspp
Module name: pspp
Changes by: Ben Pfaff <blp> 07/10/12 04:59:31
Modified files:
src/data : case-map.c case.c category.c dictionary.c
file-handle-def.c make-file.c por-file-reader.c
por-file-writer.c procedure.c sys-file-reader.c
sys-file-writer.c value-labels.c variable.c
src/language : prompt.c syntax-file.c syntax-string-source.c
src/language/control: do-if.c loop.c repeat.c temporary.c
src/language/data-io: data-list.c data-reader.c data-writer.c
file-handle.q get.c inpt-pgm.c list.q
print.c
src/language/dictionary: modify-variables.c rename-variables.c
split-file.c sys-file-info.c
value-labels.c variable-display.c
variable-label.c vector.c
src/language/expressions: evaluate.c optimize.c parse.c
src/language/lexer: lexer.c q2c.c variable-parser.c
src/language/stats: aggregate.c autorecode.c binomial.c
chisquare.c correlations.q descriptives.c
examine.q flip.c frequencies.q glm.q means.q
oneway.q regression.q sort-cases.c t-test.q
src/language/utilities: echo.c include.c set.q title.c
src/language/xforms: compute.c count.c recode.c sample.c
select-if.c
src/libpspp : ChangeLog array.c automake.mk getl.c hash.c
message.c msg-locator.c pool.c str.c
src/math : design-matrix.c factor-stats.c group.c
interaction.c levene.c moments.c sort.c
src/math/ts : innovations.c
src/output : ascii.c chart.c chart.h html.c output.c
postscript.c table.c
src/output/charts: plot-chart.c plot-chart.h
src/ui/gui : clipboard.c find-dialog.c
syntax-editor-source.c
src/ui/terminal: command-line.c
Removed files:
src/libpspp : alloc.c alloc.h
Log message:
xalloc.h-instead-of-alloc.h.patch from patch #6230.
Removes src/libpspp/alloc.[ch] and changes users to include "xalloc.h"
from gnulib instead.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/case-map.c?cvsroot=pspp&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/case.c?cvsroot=pspp&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/category.c?cvsroot=pspp&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/dictionary.c?cvsroot=pspp&r1=1.47&r2=1.48
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/file-handle-def.c?cvsroot=pspp&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/make-file.c?cvsroot=pspp&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/por-file-reader.c?cvsroot=pspp&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/por-file-writer.c?cvsroot=pspp&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/procedure.c?cvsroot=pspp&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/sys-file-reader.c?cvsroot=pspp&r1=1.47&r2=1.48
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/sys-file-writer.c?cvsroot=pspp&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/value-labels.c?cvsroot=pspp&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/variable.c?cvsroot=pspp&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/prompt.c?cvsroot=pspp&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/syntax-file.c?cvsroot=pspp&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/syntax-string-source.c?cvsroot=pspp&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/control/do-if.c?cvsroot=pspp&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/control/loop.c?cvsroot=pspp&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/control/repeat.c?cvsroot=pspp&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/control/temporary.c?cvsroot=pspp&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/data-io/data-list.c?cvsroot=pspp&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/data-io/data-reader.c?cvsroot=pspp&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/data-io/data-writer.c?cvsroot=pspp&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/data-io/file-handle.q?cvsroot=pspp&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/data-io/get.c?cvsroot=pspp&r1=1.42&r2=1.43
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/data-io/inpt-pgm.c?cvsroot=pspp&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/data-io/list.q?cvsroot=pspp&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/data-io/print.c?cvsroot=pspp&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/dictionary/modify-variables.c?cvsroot=pspp&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/dictionary/rename-variables.c?cvsroot=pspp&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/dictionary/split-file.c?cvsroot=pspp&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/dictionary/sys-file-info.c?cvsroot=pspp&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/dictionary/value-labels.c?cvsroot=pspp&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/dictionary/variable-display.c?cvsroot=pspp&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/dictionary/variable-label.c?cvsroot=pspp&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/dictionary/vector.c?cvsroot=pspp&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/expressions/evaluate.c?cvsroot=pspp&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/expressions/optimize.c?cvsroot=pspp&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/expressions/parse.c?cvsroot=pspp&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/lexer/lexer.c?cvsroot=pspp&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/lexer/q2c.c?cvsroot=pspp&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/lexer/variable-parser.c?cvsroot=pspp&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/stats/aggregate.c?cvsroot=pspp&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/stats/autorecode.c?cvsroot=pspp&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/stats/binomial.c?cvsroot=pspp&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/stats/chisquare.c?cvsroot=pspp&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/stats/correlations.q?cvsroot=pspp&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/stats/descriptives.c?cvsroot=pspp&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/stats/examine.q?cvsroot=pspp&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/stats/flip.c?cvsroot=pspp&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/stats/frequencies.q?cvsroot=pspp&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/stats/glm.q?cvsroot=pspp&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/stats/means.q?cvsroot=pspp&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/stats/oneway.q?cvsroot=pspp&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/stats/regression.q?cvsroot=pspp&r1=1.65&r2=1.66
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/stats/sort-cases.c?cvsroot=pspp&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/stats/t-test.q?cvsroot=pspp&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/utilities/echo.c?cvsroot=pspp&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/utilities/include.c?cvsroot=pspp&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/utilities/set.q?cvsroot=pspp&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/utilities/title.c?cvsroot=pspp&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/xforms/compute.c?cvsroot=pspp&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/xforms/count.c?cvsroot=pspp&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/xforms/recode.c?cvsroot=pspp&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/xforms/sample.c?cvsroot=pspp&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/xforms/select-if.c?cvsroot=pspp&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/pspp/src/libpspp/ChangeLog?cvsroot=pspp&r1=1.81&r2=1.82
http://cvs.savannah.gnu.org/viewcvs/pspp/src/libpspp/array.c?cvsroot=pspp&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/pspp/src/libpspp/automake.mk?cvsroot=pspp&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/pspp/src/libpspp/getl.c?cvsroot=pspp&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/pspp/src/libpspp/hash.c?cvsroot=pspp&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/pspp/src/libpspp/message.c?cvsroot=pspp&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/pspp/src/libpspp/msg-locator.c?cvsroot=pspp&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/pspp/src/libpspp/pool.c?cvsroot=pspp&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/pspp/src/libpspp/str.c?cvsroot=pspp&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/pspp/src/libpspp/alloc.c?cvsroot=pspp&r1=1.4&r2=0
http://cvs.savannah.gnu.org/viewcvs/pspp/src/libpspp/alloc.h?cvsroot=pspp&r1=1.5&r2=0
http://cvs.savannah.gnu.org/viewcvs/pspp/src/math/design-matrix.c?cvsroot=pspp&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/pspp/src/math/factor-stats.c?cvsroot=pspp&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/pspp/src/math/group.c?cvsroot=pspp&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/pspp/src/math/interaction.c?cvsroot=pspp&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/pspp/src/math/levene.c?cvsroot=pspp&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/pspp/src/math/moments.c?cvsroot=pspp&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/pspp/src/math/sort.c?cvsroot=pspp&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/pspp/src/math/ts/innovations.c?cvsroot=pspp&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/pspp/src/output/ascii.c?cvsroot=pspp&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/pspp/src/output/chart.c?cvsroot=pspp&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/pspp/src/output/chart.h?cvsroot=pspp&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/pspp/src/output/html.c?cvsroot=pspp&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/pspp/src/output/output.c?cvsroot=pspp&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/pspp/src/output/postscript.c?cvsroot=pspp&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/pspp/src/output/table.c?cvsroot=pspp&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/pspp/src/output/charts/plot-chart.c?cvsroot=pspp&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/pspp/src/output/charts/plot-chart.h?cvsroot=pspp&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/clipboard.c?cvsroot=pspp&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/find-dialog.c?cvsroot=pspp&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/syntax-editor-source.c?cvsroot=pspp&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/terminal/command-line.c?cvsroot=pspp&r1=1.17&r2=1.18
Patches:
Index: data/case-map.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/data/case-map.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- data/case-map.c 13 Aug 2007 04:23:29 -0000 1.1
+++ data/case-map.c 12 Oct 2007 04:59:26 -0000 1.2
@@ -19,13 +19,15 @@
#include <data/case-map.h>
#include <stdio.h>
+#include <stdlib.h>
#include <data/dictionary.h>
#include <data/variable.h>
#include <data/case.h>
-#include <libpspp/alloc.h>
#include <libpspp/assertion.h>
+#include "xalloc.h"
+
/* A case map. */
struct case_map
{
Index: data/case.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/data/case.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- data/case.c 7 Jul 2007 06:14:07 -0000 1.14
+++ data/case.c 12 Oct 2007 04:59:26 -0000 1.15
@@ -24,10 +24,10 @@
#include <data/value.h>
#include <data/variable.h>
-#include <libpspp/alloc.h>
#include <libpspp/str.h>
#include "minmax.h"
+#include "xalloc.h"
/* Reference-counted case implementation. */
struct case_data
Index: data/category.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/data/category.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- data/category.c 7 Jul 2007 06:14:08 -0000 1.12
+++ data/category.c 12 Oct 2007 04:59:26 -0000 1.13
@@ -34,12 +34,13 @@
#include <stdlib.h>
#include <string.h>
-#include <libpspp/alloc.h>
#include <libpspp/message.h>
#include "category.h"
#include "value.h"
#include "variable.h"
+#include "xalloc.h"
+
#define CAT_VALUE_NOT_FOUND -2
#define N_INITIAL_CATEGORIES 1
Index: data/dictionary.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/data/dictionary.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- data/dictionary.c 14 Sep 2007 13:45:03 -0000 1.47
+++ data/dictionary.c 12 Oct 2007 04:59:26 -0000 1.48
@@ -28,7 +28,6 @@
#include "vardict.h"
#include "variable.h"
#include "vector.h"
-#include <libpspp/alloc.h>
#include <libpspp/array.h>
#include <libpspp/compiler.h>
#include <libpspp/hash.h>
@@ -38,6 +37,7 @@
#include <libpspp/str.h>
#include "minmax.h"
+#include "xalloc.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
Index: data/file-handle-def.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/data/file-handle-def.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- data/file-handle-def.c 12 Oct 2007 04:49:26 -0000 1.11
+++ data/file-handle-def.c 12 Oct 2007 04:59:26 -0000 1.12
@@ -23,7 +23,6 @@
#include <stdlib.h>
#include <string.h>
-#include <libpspp/alloc.h>
#include <libpspp/compiler.h>
#include <libpspp/message.h>
#include <libpspp/str.h>
@@ -31,6 +30,8 @@
#include <data/variable.h>
#include <data/scratch-handle.h>
+#include "xalloc.h"
+
#include "gettext.h"
#define _(msgid) gettext (msgid)
Index: data/make-file.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/data/make-file.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- data/make-file.c 7 Jul 2007 06:14:09 -0000 1.11
+++ data/make-file.c 12 Oct 2007 04:59:26 -0000 1.12
@@ -23,7 +23,8 @@
#include "file-name.h"
#include "make-file.h"
#include <libpspp/message.h>
-#include <libpspp/alloc.h>
+
+#include "xalloc.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
Index: data/por-file-reader.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/data/por-file-reader.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- data/por-file-reader.c 12 Oct 2007 04:49:26 -0000 1.23
+++ data/por-file-reader.c 12 Oct 2007 04:59:26 -0000 1.24
@@ -35,7 +35,6 @@
#include <data/missing-values.h>
#include <data/value-labels.h>
#include <data/variable.h>
-#include <libpspp/alloc.h>
#include <libpspp/compiler.h>
#include <libpspp/hash.h>
#include <libpspp/message.h>
@@ -43,6 +42,8 @@
#include <libpspp/pool.h>
#include <libpspp/str.h>
+#include "xalloc.h"
+
#include "gettext.h"
#define _(msgid) gettext (msgid)
Index: data/por-file-writer.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/data/por-file-writer.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- data/por-file-writer.c 12 Oct 2007 04:49:26 -0000 1.19
+++ data/por-file-writer.c 12 Oct 2007 04:59:26 -0000 1.20
@@ -38,13 +38,14 @@
#include <data/value-labels.h>
#include <data/variable.h>
-#include <libpspp/alloc.h>
#include <libpspp/hash.h>
#include <libpspp/message.h>
#include <libpspp/misc.h>
#include <libpspp/str.h>
#include <libpspp/version.h>
+#include "xalloc.h"
+
#include "gettext.h"
#define _(msgid) gettext (msgid)
Index: data/procedure.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/data/procedure.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- data/procedure.c 19 Sep 2007 06:21:19 -0000 1.37
+++ data/procedure.c 12 Oct 2007 04:59:26 -0000 1.38
@@ -32,12 +32,12 @@
#include <data/procedure.h>
#include <data/transformations.h>
#include <data/variable.h>
-#include <libpspp/alloc.h>
#include <libpspp/deque.h>
#include <libpspp/misc.h>
#include <libpspp/str.h>
#include <libpspp/taint.h>
+#include "xalloc.h"
struct dataset {
/* Cases are read from source,
Index: data/sys-file-reader.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/data/sys-file-reader.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- data/sys-file-reader.c 12 Oct 2007 04:49:26 -0000 1.47
+++ data/sys-file-reader.c 12 Oct 2007 04:59:26 -0000 1.48
@@ -25,7 +25,6 @@
#include <setjmp.h>
#include <stdlib.h>
-#include <libpspp/alloc.h>
#include <libpspp/assertion.h>
#include <libpspp/message.h>
#include <libpspp/compiler.h>
@@ -51,6 +50,7 @@
#include "inttostr.h"
#include "minmax.h"
#include "unlocked-io.h"
+#include "xalloc.h"
#include "xsize.h"
#include "gettext.h"
Index: data/sys-file-writer.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/data/sys-file-writer.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- data/sys-file-writer.c 12 Oct 2007 04:49:26 -0000 1.33
+++ data/sys-file-writer.c 12 Oct 2007 04:59:26 -0000 1.34
@@ -26,7 +26,6 @@
#include <sys/stat.h>
#include <time.h>
-#include <libpspp/alloc.h>
#include <libpspp/float-format.h>
#include <libpspp/integer-format.h>
#include <libpspp/message.h>
@@ -49,6 +48,7 @@
#include "minmax.h"
#include "unlocked-io.h"
+#include "xalloc.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
Index: data/value-labels.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/data/value-labels.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- data/value-labels.c 7 Jul 2007 06:14:10 -0000 1.17
+++ data/value-labels.c 12 Oct 2007 04:59:26 -0000 1.18
@@ -24,12 +24,13 @@
#include <data/format.h>
#include <data/value.h>
#include <data/variable.h>
-#include <libpspp/alloc.h>
#include <libpspp/compiler.h>
#include <libpspp/hash.h>
#include <libpspp/message.h>
#include <libpspp/str.h>
+#include "xalloc.h"
+
static hsh_compare_func compare_int_val_lab;
static hsh_hash_func hash_int_val_lab;
static hsh_free_func free_int_val_lab;
Index: data/variable.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/data/variable.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- data/variable.c 27 Aug 2007 07:02:35 -0000 1.31
+++ data/variable.c 12 Oct 2007 04:59:26 -0000 1.32
@@ -29,13 +29,14 @@
#include "vardict.h"
#include <libpspp/misc.h>
-#include <libpspp/alloc.h>
#include <libpspp/assertion.h>
#include <libpspp/compiler.h>
#include <libpspp/hash.h>
#include <libpspp/message.h>
#include <libpspp/str.h>
+#include "xalloc.h"
+
#include "gettext.h"
#define _(msgid) gettext (msgid)
Index: language/prompt.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/prompt.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- language/prompt.c 7 Jul 2007 06:14:11 -0000 1.4
+++ language/prompt.c 12 Oct 2007 04:59:26 -0000 1.5
@@ -27,7 +27,6 @@
#include <data/variable.h>
#include <language/command.h>
#include <language/lexer/lexer.h>
-#include <libpspp/alloc.h>
#include <libpspp/assertion.h>
#include <libpspp/message.h>
#include <libpspp/message.h>
@@ -36,6 +35,8 @@
#include <libpspp/version.h>
#include <output/table.h>
+#include "xalloc.h"
+
/* Current prompts in each style. */
static char *prompts[PROMPT_CNT];
Index: language/syntax-file.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/syntax-file.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- language/syntax-file.c 5 Sep 2007 06:23:02 -0000 1.6
+++ language/syntax-file.c 12 Oct 2007 04:59:26 -0000 1.7
@@ -27,7 +27,6 @@
#include <data/variable.h>
#include <language/command.h>
#include <language/lexer/lexer.h>
-#include <libpspp/alloc.h>
#include <libpspp/assertion.h>
#include <libpspp/message.h>
#include <libpspp/message.h>
@@ -40,6 +39,8 @@
#include "prompt.h"
+#include "xalloc.h"
+
#include "gettext.h"
#define _(msgid) gettext (msgid)
Index: language/syntax-string-source.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/syntax-string-source.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- language/syntax-string-source.c 5 Sep 2007 06:23:02 -0000 1.6
+++ language/syntax-string-source.c 12 Oct 2007 04:59:26 -0000 1.7
@@ -18,7 +18,6 @@
#include <config.h>
#include <libpspp/getl.h>
-#include <libpspp/alloc.h>
#include <libpspp/compiler.h>
#include <libpspp/str.h>
@@ -26,6 +25,8 @@
#include "syntax-string-source.h"
+#include "xalloc.h"
+
struct syntax_string_source
{
struct getl_interface parent;
Index: language/control/do-if.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/control/do-if.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- language/control/do-if.c 23 Sep 2007 16:47:27 -0000 1.16
+++ language/control/do-if.c 12 Oct 2007 04:59:26 -0000 1.17
@@ -26,12 +26,12 @@
#include <language/command.h>
#include <language/expressions/public.h>
#include <language/lexer/lexer.h>
-#include <libpspp/alloc.h>
#include <libpspp/compiler.h>
#include <libpspp/message.h>
-#include <libpspp/message.h>
#include <libpspp/str.h>
+#include "xalloc.h"
+
#include "gettext.h"
#define _(msgid) gettext (msgid)
Index: language/control/loop.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/control/loop.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- language/control/loop.c 7 Jul 2007 06:14:12 -0000 1.16
+++ language/control/loop.c 12 Oct 2007 04:59:26 -0000 1.17
@@ -26,13 +26,14 @@
#include <language/command.h>
#include <language/expressions/public.h>
#include <language/lexer/lexer.h>
-#include <libpspp/alloc.h>
#include <libpspp/compiler.h>
#include <libpspp/message.h>
#include <libpspp/misc.h>
#include <libpspp/pool.h>
#include <libpspp/str.h>
+#include "xalloc.h"
+
#include "gettext.h"
#define _(msgid) gettext (msgid)
Index: language/control/repeat.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/control/repeat.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- language/control/repeat.c 5 Sep 2007 06:23:03 -0000 1.26
+++ language/control/repeat.c 12 Oct 2007 04:59:26 -0000 1.27
@@ -29,7 +29,6 @@
#include <language/command.h>
#include <language/lexer/lexer.h>
#include <language/lexer/variable-parser.h>
-#include <libpspp/alloc.h>
#include <libpspp/ll.h>
#include <libpspp/message.h>
#include <libpspp/misc.h>
@@ -38,6 +37,7 @@
#include <data/variable.h>
#include "intprops.h"
+#include "xalloc.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
Index: language/control/temporary.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/control/temporary.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- language/control/temporary.c 7 Jul 2007 06:14:12 -0000 1.9
+++ language/control/temporary.c 12 Oct 2007 04:59:26 -0000 1.10
@@ -27,12 +27,12 @@
#include <data/variable.h>
#include <language/command.h>
#include <language/lexer/lexer.h>
-#include <libpspp/alloc.h>
#include <libpspp/hash.h>
#include <libpspp/message.h>
-#include <libpspp/message.h>
#include <libpspp/str.h>
+#include "xalloc.h"
+
#include "gettext.h"
#define _(msgid) gettext (msgid)
Index: language/data-io/data-list.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/data-io/data-list.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- language/data-io/data-list.c 23 Sep 2007 16:49:38 -0000 1.36
+++ language/data-io/data-list.c 12 Oct 2007 04:59:27 -0000 1.37
@@ -39,7 +39,6 @@
#include <language/lexer/format-parser.h>
#include <language/lexer/lexer.h>
#include <language/lexer/variable-parser.h>
-#include <libpspp/alloc.h>
#include <libpspp/assertion.h>
#include <libpspp/compiler.h>
#include <libpspp/ll.h>
@@ -51,6 +50,7 @@
#include "size_max.h"
#include "xsize.h"
+#include "xalloc.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
Index: language/data-io/data-reader.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/data-io/data-reader.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- language/data-io/data-reader.c 5 Sep 2007 06:23:03 -0000 1.24
+++ language/data-io/data-reader.c 12 Oct 2007 04:59:27 -0000 1.25
@@ -31,13 +31,13 @@
#include <language/data-io/file-handle.h>
#include <language/lexer/lexer.h>
#include <language/prompt.h>
-#include <libpspp/alloc.h>
#include <libpspp/assertion.h>
#include <libpspp/message.h>
#include <libpspp/str.h>
#include "minmax.h"
#include "size_max.h"
+#include "xalloc.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
Index: language/data-io/data-writer.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/data-io/data-writer.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- language/data-io/data-writer.c 7 Jul 2007 06:14:12 -0000 1.10
+++ language/data-io/data-writer.c 12 Oct 2007 04:59:27 -0000 1.11
@@ -24,12 +24,12 @@
#include <data/file-name.h>
#include <language/data-io/file-handle.h>
-#include <libpspp/alloc.h>
#include <libpspp/assertion.h>
#include <libpspp/message.h>
#include <libpspp/str.h>
#include "minmax.h"
+#include "xalloc.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
Index: language/data-io/file-handle.q
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/data-io/file-handle.q,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- language/data-io/file-handle.q 12 Oct 2007 04:49:26 -0000 1.16
+++ language/data-io/file-handle.q 12 Oct 2007 04:59:27 -0000 1.17
@@ -19,7 +19,6 @@
#include <libpspp/message.h>
#include <errno.h>
#include <stdlib.h>
-#include <libpspp/alloc.h>
#include <data/file-name.h>
#include <language/command.h>
#include <language/lexer/lexer.h>
@@ -29,6 +28,8 @@
#include <data/variable.h>
#include <data/file-handle-def.h>
+#include "xalloc.h"
+
#include "gettext.h"
#define _(msgid) gettext (msgid)
Index: language/data-io/get.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/data-io/get.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- language/data-io/get.c 12 Sep 2007 13:43:50 -0000 1.42
+++ language/data-io/get.c 12 Oct 2007 04:59:27 -0000 1.43
@@ -37,7 +37,6 @@
#include <language/data-io/file-handle.h>
#include <language/lexer/lexer.h>
#include <language/lexer/variable-parser.h>
-#include <libpspp/alloc.h>
#include <libpspp/assertion.h>
#include <libpspp/compiler.h>
#include <libpspp/hash.h>
@@ -46,6 +45,8 @@
#include <libpspp/str.h>
#include <libpspp/taint.h>
+#include "xalloc.h"
+
#include "gettext.h"
#define _(msgid) gettext (msgid)
Index: language/data-io/inpt-pgm.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/data-io/inpt-pgm.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- language/data-io/inpt-pgm.c 7 Jul 2007 06:14:12 -0000 1.28
+++ language/data-io/inpt-pgm.c 12 Oct 2007 04:59:27 -0000 1.29
@@ -33,7 +33,6 @@
#include <language/data-io/file-handle.h>
#include <language/expressions/public.h>
#include <language/lexer/lexer.h>
-#include <libpspp/alloc.h>
#include <libpspp/assertion.h>
#include <libpspp/compiler.h>
#include <libpspp/message.h>
@@ -41,6 +40,8 @@
#include <libpspp/misc.h>
#include <libpspp/str.h>
+#include "xalloc.h"
+
#include "gettext.h"
#define _(msgid) gettext (msgid)
Index: language/data-io/list.q
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/data-io/list.q,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- language/data-io/list.q 12 Oct 2007 04:54:46 -0000 1.30
+++ language/data-io/list.q 12 Oct 2007 04:59:27 -0000 1.31
@@ -33,7 +33,6 @@
#include <language/command.h>
#include <language/dictionary/split-file.h>
#include <language/lexer/lexer.h>
-#include <libpspp/alloc.h>
#include <libpspp/compiler.h>
#include <libpspp/message.h>
#include <libpspp/message.h>
@@ -44,6 +43,7 @@
#include <output/table.h>
#include "minmax.h"
+#include "xalloc.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
Index: language/data-io/print.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/data-io/print.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- language/data-io/print.c 7 Jul 2007 06:14:13 -0000 1.27
+++ language/data-io/print.c 12 Oct 2007 04:59:27 -0000 1.28
@@ -30,7 +30,6 @@
#include <language/lexer/format-parser.h>
#include <language/lexer/lexer.h>
#include <language/lexer/variable-parser.h>
-#include <libpspp/alloc.h>
#include <libpspp/assertion.h>
#include <libpspp/compiler.h>
#include <libpspp/ll.h>
@@ -40,6 +39,8 @@
#include <output/manager.h>
#include <output/table.h>
+#include "xalloc.h"
+
#include "gettext.h"
#define _(msgid) gettext (msgid)
Index: language/dictionary/modify-variables.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/dictionary/modify-variables.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- language/dictionary/modify-variables.c 22 Sep 2007 08:19:09 -0000
1.21
+++ language/dictionary/modify-variables.c 12 Oct 2007 04:59:27 -0000
1.22
@@ -24,17 +24,17 @@
#include <language/command.h>
#include <language/lexer/lexer.h>
#include <language/lexer/variable-parser.h>
-#include <libpspp/alloc.h>
#include <libpspp/assertion.h>
#include <libpspp/array.h>
#include <libpspp/bit-vector.h>
#include <libpspp/compiler.h>
#include <libpspp/hash.h>
#include <libpspp/message.h>
-#include <libpspp/message.h>
#include <libpspp/misc.h>
#include <libpspp/str.h>
+#include "xalloc.h"
+
#include "gettext.h"
#define _(msgid) gettext (msgid)
Index: language/dictionary/rename-variables.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/dictionary/rename-variables.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- language/dictionary/rename-variables.c 7 Jul 2007 06:14:13 -0000
1.12
+++ language/dictionary/rename-variables.c 12 Oct 2007 04:59:27 -0000
1.13
@@ -24,11 +24,12 @@
#include <language/command.h>
#include <language/lexer/lexer.h>
#include <language/lexer/variable-parser.h>
-#include <libpspp/alloc.h>
#include <libpspp/hash.h>
#include <libpspp/message.h>
#include <libpspp/str.h>
+#include "xalloc.h"
+
#include "gettext.h"
#define _(msgid) gettext (msgid)
Index: language/dictionary/split-file.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/dictionary/split-file.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- language/dictionary/split-file.c 7 Jul 2007 06:14:13 -0000 1.17
+++ language/dictionary/split-file.c 12 Oct 2007 04:59:27 -0000 1.18
@@ -29,12 +29,13 @@
#include <language/dictionary/split-file.h>
#include <language/lexer/lexer.h>
#include <language/lexer/variable-parser.h>
-#include <libpspp/alloc.h>
#include <libpspp/message.h>
#include <libpspp/str.h>
#include <output/manager.h>
#include <output/table.h>
+#include "xalloc.h"
+
#include "gettext.h"
#define _(msgid) gettext (msgid)
Index: language/dictionary/sys-file-info.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/dictionary/sys-file-info.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- language/dictionary/sys-file-info.c 12 Oct 2007 04:49:26 -0000 1.31
+++ language/dictionary/sys-file-info.c 12 Oct 2007 04:59:27 -0000 1.32
@@ -33,7 +33,6 @@
#include <language/data-io/file-handle.h>
#include <language/lexer/lexer.h>
#include <language/lexer/variable-parser.h>
-#include <libpspp/alloc.h>
#include <libpspp/array.h>
#include <libpspp/hash.h>
#include <libpspp/message.h>
@@ -44,6 +43,7 @@
#include <output/table.h>
#include "minmax.h"
+#include "xalloc.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
Index: language/dictionary/value-labels.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/dictionary/value-labels.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- language/dictionary/value-labels.c 7 Jul 2007 06:14:13 -0000 1.18
+++ language/dictionary/value-labels.c 12 Oct 2007 04:59:27 -0000 1.19
@@ -25,11 +25,12 @@
#include <language/command.h>
#include <language/lexer/lexer.h>
#include <language/lexer/variable-parser.h>
-#include <libpspp/alloc.h>
#include <libpspp/hash.h>
#include <libpspp/message.h>
#include <libpspp/str.h>
+#include "xalloc.h"
+
#include "gettext.h"
#define _(msgid) gettext (msgid)
Index: language/dictionary/variable-display.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/dictionary/variable-display.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- language/dictionary/variable-display.c 7 Jul 2007 06:14:13 -0000
1.14
+++ language/dictionary/variable-display.c 12 Oct 2007 04:59:27 -0000
1.15
@@ -24,10 +24,11 @@
#include <language/command.h>
#include <language/lexer/lexer.h>
#include <language/lexer/variable-parser.h>
-#include <libpspp/alloc.h>
#include <libpspp/message.h>
#include <libpspp/str.h>
+#include "xalloc.h"
+
/* Set variables' alignment
This is the alignment for GUI display only.
It affects nothing but GUIs
Index: language/dictionary/variable-label.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/dictionary/variable-label.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- language/dictionary/variable-label.c 7 Jul 2007 06:14:13 -0000
1.15
+++ language/dictionary/variable-label.c 12 Oct 2007 04:59:27 -0000
1.16
@@ -24,10 +24,11 @@
#include <language/command.h>
#include <language/lexer/lexer.h>
#include <language/lexer/variable-parser.h>
-#include <libpspp/alloc.h>
#include <libpspp/message.h>
#include <libpspp/str.h>
+#include "xalloc.h"
+
#include "gettext.h"
#define _(msgid) gettext (msgid)
Index: language/dictionary/vector.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/dictionary/vector.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- language/dictionary/vector.c 27 Aug 2007 05:05:54 -0000 1.16
+++ language/dictionary/vector.c 12 Oct 2007 04:59:27 -0000 1.17
@@ -26,7 +26,6 @@
#include <language/lexer/format-parser.h>
#include <language/lexer/lexer.h>
#include <language/lexer/variable-parser.h>
-#include <libpspp/alloc.h>
#include <libpspp/assertion.h>
#include <libpspp/message.h>
#include <libpspp/misc.h>
@@ -34,6 +33,7 @@
#include <libpspp/str.h>
#include "intprops.h"
+#include "xalloc.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
Index: language/expressions/evaluate.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/expressions/evaluate.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- language/expressions/evaluate.c 19 Sep 2007 06:21:20 -0000 1.23
+++ language/expressions/evaluate.c 12 Oct 2007 04:59:27 -0000 1.24
@@ -18,13 +18,14 @@
#include "private.h"
#include <ctype.h>
-#include <libpspp/alloc.h>
#include <libpspp/assertion.h>
#include <libpspp/message.h>
#include "helpers.h"
#include "evaluate.h"
#include <libpspp/pool.h>
+#include "xalloc.h"
+
static void
expr_evaluate (struct expression *e, const struct ccase *c, int case_idx,
void *result)
Index: language/expressions/optimize.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/expressions/optimize.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- language/expressions/optimize.c 7 Jul 2007 06:14:14 -0000 1.9
+++ language/expressions/optimize.c 12 Oct 2007 04:59:27 -0000 1.10
@@ -20,7 +20,6 @@
#include <ctype.h>
#include <errno.h>
#include <stdlib.h>
-#include <libpspp/alloc.h>
#include <libpspp/assertion.h>
#include <data/calendar.h>
#include <data/data-in.h>
@@ -33,6 +32,8 @@
#include <libpspp/str.h>
#include <data/variable.h>
+#include "xalloc.h"
+
static union any_node *evaluate_tree (struct composite_node *,
struct expression *);
static union any_node *optimize_tree (union any_node *, struct expression *);
Index: language/expressions/parse.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/expressions/parse.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- language/expressions/parse.c 7 Jul 2007 06:14:14 -0000 1.28
+++ language/expressions/parse.c 12 Oct 2007 04:59:27 -0000 1.29
@@ -31,7 +31,6 @@
#include <language/lexer/format-parser.h>
#include <language/lexer/lexer.h>
#include <language/lexer/variable-parser.h>
-#include <libpspp/alloc.h>
#include <libpspp/array.h>
#include <libpspp/assertion.h>
#include <libpspp/message.h>
@@ -39,6 +38,8 @@
#include <libpspp/pool.h>
#include <libpspp/str.h>
+#include "xalloc.h"
+
/* Declarations. */
/* Recursive descent parser in order of increasing precedence. */
Index: language/lexer/lexer.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/lexer/lexer.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- language/lexer/lexer.c 12 Oct 2007 04:49:26 -0000 1.27
+++ language/lexer/lexer.c 12 Oct 2007 04:59:27 -0000 1.28
@@ -23,7 +23,6 @@
#include <math.h>
#include <stdarg.h>
#include <stdlib.h>
-#include <libpspp/alloc.h>
#include <libpspp/assertion.h>
#include <language/command.h>
#include <libpspp/message.h>
@@ -33,6 +32,7 @@
#include <output/journal.h>
#include "size_max.h"
+#include "xalloc.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
Index: language/lexer/q2c.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/lexer/q2c.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- language/lexer/q2c.c 12 Oct 2007 04:49:26 -0000 1.26
+++ language/lexer/q2c.c 12 Oct 2007 04:59:28 -0000 1.27
@@ -2073,7 +2073,6 @@
indent = 0;
dump (0, "#include <stdlib.h>");
- dump (0, "#include <libpspp/alloc.h>");
dump (0, "#include <libpspp/assertion.h>");
dump (0, "#include <libpspp/message.h>");
dump (0, "#include <language/lexer/lexer.h>");
@@ -2084,6 +2083,9 @@
dump (0, "#include <data/variable.h>");
dump (0, nullstr);
+ dump (0, "#include \"xalloc.h\"");
+ dump (0, nullstr);
+
dump (0, "#include \"gettext.h\"");
dump (0, "#define _(msgid) gettext (msgid)");
dump (0, nullstr);
Index: language/lexer/variable-parser.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/lexer/variable-parser.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- language/lexer/variable-parser.c 22 Sep 2007 08:19:10 -0000 1.19
+++ language/lexer/variable-parser.c 12 Oct 2007 04:59:28 -0000 1.20
@@ -26,7 +26,6 @@
#include <data/dictionary.h>
#include <data/procedure.h>
#include <data/variable.h>
-#include <libpspp/alloc.h>
#include <libpspp/assertion.h>
#include <libpspp/bit-vector.h>
#include <libpspp/hash.h>
@@ -35,6 +34,8 @@
#include <libpspp/pool.h>
#include <libpspp/str.h>
+#include "xalloc.h"
+
#include "gettext.h"
#define _(msgid) gettext (msgid)
Index: language/stats/aggregate.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/stats/aggregate.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- language/stats/aggregate.c 20 Sep 2007 04:48:14 -0000 1.36
+++ language/stats/aggregate.c 12 Oct 2007 04:59:28 -0000 1.37
@@ -36,7 +36,6 @@
#include <language/lexer/lexer.h>
#include <language/lexer/variable-parser.h>
#include <language/stats/sort-criteria.h>
-#include <libpspp/alloc.h>
#include <libpspp/assertion.h>
#include <libpspp/message.h>
#include <libpspp/misc.h>
@@ -46,6 +45,7 @@
#include <math/sort.h>
#include "minmax.h"
+#include "xalloc.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
Index: language/stats/autorecode.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/stats/autorecode.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- language/stats/autorecode.c 7 Jul 2007 06:14:16 -0000 1.22
+++ language/stats/autorecode.c 12 Oct 2007 04:59:28 -0000 1.23
@@ -26,14 +26,14 @@
#include <language/command.h>
#include <language/lexer/lexer.h>
#include <language/lexer/variable-parser.h>
-#include <libpspp/alloc.h>
#include <libpspp/compiler.h>
#include <libpspp/hash.h>
#include <libpspp/message.h>
-#include <libpspp/message.h>
#include <libpspp/pool.h>
#include <libpspp/str.h>
+#include "xalloc.h"
+
#include "gettext.h"
#define _(msgid) gettext (msgid)
Index: language/stats/binomial.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/stats/binomial.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- language/stats/binomial.c 7 Jul 2007 06:14:16 -0000 1.5
+++ language/stats/binomial.c 12 Oct 2007 04:59:28 -0000 1.6
@@ -17,7 +17,6 @@
#include <config.h>
#include <libpspp/compiler.h>
#include <output/table.h>
-#include <libpspp/alloc.h>
#include <data/case.h>
#include <data/casereader.h>
@@ -33,6 +32,8 @@
#include "binomial.h"
#include "freq.h"
+#include "xalloc.h"
+
#include "gettext.h"
#define _(msgid) gettext (msgid)
Index: language/stats/chisquare.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/stats/chisquare.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- language/stats/chisquare.c 28 Aug 2007 01:00:04 -0000 1.7
+++ language/stats/chisquare.c 12 Oct 2007 04:59:28 -0000 1.8
@@ -29,7 +29,6 @@
#include <data/variable.h>
#include <language/stats/freq.h>
#include <language/stats/npar.h>
-#include <libpspp/alloc.h>
#include <libpspp/assertion.h>
#include <libpspp/compiler.h>
#include <libpspp/hash.h>
@@ -39,6 +38,8 @@
#include <gsl/gsl_cdf.h>
+#include "xalloc.h"
+
#include "gettext.h"
#define _(msgid) gettext (msgid)
Index: language/stats/correlations.q
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/stats/correlations.q,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- language/stats/correlations.q 7 Jul 2007 06:14:16 -0000 1.18
+++ language/stats/correlations.q 12 Oct 2007 04:59:28 -0000 1.19
@@ -26,9 +26,10 @@
#include <language/data-io/file-handle.h>
#include <language/lexer/lexer.h>
#include <language/lexer/variable-parser.h>
-#include <libpspp/alloc.h>
#include <libpspp/compiler.h>
+#include "xalloc.h"
+
/* (headers) */
struct cor_set
Index: language/stats/descriptives.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/stats/descriptives.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- language/stats/descriptives.c 12 Oct 2007 04:49:27 -0000 1.28
+++ language/stats/descriptives.c 12 Oct 2007 04:59:28 -0000 1.29
@@ -30,7 +30,6 @@
#include <language/dictionary/split-file.h>
#include <language/lexer/lexer.h>
#include <language/lexer/variable-parser.h>
-#include <libpspp/alloc.h>
#include <libpspp/array.h>
#include <libpspp/compiler.h>
#include <libpspp/message.h>
@@ -39,6 +38,8 @@
#include <output/manager.h>
#include <output/table.h>
+#include "xalloc.h"
+
#include "gettext.h"
#define _(msgid) gettext (msgid)
#define N_(msgid) msgid
Index: language/stats/examine.q
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/stats/examine.q,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- language/stats/examine.q 12 Oct 2007 04:49:27 -0000 1.29
+++ language/stats/examine.q 12 Oct 2007 04:59:28 -0000 1.30
@@ -32,7 +32,6 @@
#include <language/command.h>
#include <language/dictionary/split-file.h>
#include <language/lexer/lexer.h>
-#include <libpspp/alloc.h>
#include <libpspp/compiler.h>
#include <libpspp/hash.h>
#include <libpspp/message.h>
@@ -47,6 +46,7 @@
#include <output/table.h>
#include "minmax.h"
+#include "xalloc.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
Index: language/stats/flip.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/stats/flip.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- language/stats/flip.c 12 Oct 2007 04:49:27 -0000 1.29
+++ language/stats/flip.c 12 Oct 2007 04:59:28 -0000 1.30
@@ -33,7 +33,6 @@
#include <language/command.h>
#include <language/lexer/lexer.h>
#include <language/lexer/variable-parser.h>
-#include <libpspp/alloc.h>
#include <libpspp/array.h>
#include <libpspp/assertion.h>
#include <libpspp/message.h>
@@ -43,6 +42,7 @@
#include "intprops.h"
#include "minmax.h"
+#include "xalloc.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
Index: language/stats/frequencies.q
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/stats/frequencies.q,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- language/stats/frequencies.q 12 Oct 2007 04:49:27 -0000 1.36
+++ language/stats/frequencies.q 12 Oct 2007 04:59:28 -0000 1.37
@@ -38,7 +38,6 @@
#include <language/command.h>
#include <language/dictionary/split-file.h>
#include <language/lexer/lexer.h>
-#include <libpspp/alloc.h>
#include <libpspp/array.h>
#include <libpspp/bit-vector.h>
#include <libpspp/compiler.h>
@@ -59,6 +58,7 @@
#include "freq.h"
#include "minmax.h"
+#include "xalloc.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
Index: language/stats/glm.q
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/stats/glm.q,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- language/stats/glm.q 20 Sep 2007 04:48:14 -0000 1.3
+++ language/stats/glm.q 12 Oct 2007 04:59:28 -0000 1.4
@@ -36,7 +36,6 @@
#include <language/dictionary/split-file.h>
#include <language/data-io/file-handle.h>
#include <language/lexer/lexer.h>
-#include <libpspp/alloc.h>
#include <libpspp/compiler.h>
#include <libpspp/message.h>
#include <math/design-matrix.h>
@@ -45,6 +44,7 @@
#include <math/moments.h>
#include <output/table.h>
+#include "xalloc.h"
#include "gettext.h"
#define GLM_LARGE_DATA 1000
Index: language/stats/means.q
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/stats/means.q,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- language/stats/means.q 12 Oct 2007 04:49:27 -0000 1.16
+++ language/stats/means.q 12 Oct 2007 04:59:28 -0000 1.17
@@ -24,10 +24,11 @@
#include <data/variable.h>
#include <language/command.h>
#include <language/lexer/lexer.h>
-#include <libpspp/alloc.h>
#include <libpspp/hash.h>
#include <libpspp/message.h>
+#include "xalloc.h"
+
#include "gettext.h"
#define _(msgid) gettext (msgid)
Index: language/stats/oneway.q
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/stats/oneway.q,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- language/stats/oneway.q 12 Oct 2007 04:49:27 -0000 1.27
+++ language/stats/oneway.q 12 Oct 2007 04:59:28 -0000 1.28
@@ -31,7 +31,6 @@
#include <language/command.h>
#include <language/dictionary/split-file.h>
#include <language/lexer/lexer.h>
-#include <libpspp/alloc.h>
#include <libpspp/compiler.h>
#include <libpspp/hash.h>
#include <libpspp/message.h>
@@ -45,6 +44,8 @@
#include <output/table.h>
#include "sort-criteria.h"
+#include "xalloc.h"
+
#include "gettext.h"
#define _(msgid) gettext (msgid)
Index: language/stats/regression.q
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/stats/regression.q,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -b -r1.65 -r1.66
--- language/stats/regression.q 22 Sep 2007 01:04:38 -0000 1.65
+++ language/stats/regression.q 12 Oct 2007 04:59:28 -0000 1.66
@@ -37,7 +37,6 @@
#include <language/dictionary/split-file.h>
#include <language/data-io/file-handle.h>
#include <language/lexer/lexer.h>
-#include <libpspp/alloc.h>
#include <libpspp/compiler.h>
#include <libpspp/message.h>
#include <libpspp/taint.h>
@@ -47,6 +46,8 @@
#include <math/moments.h>
#include <output/table.h>
+#include "xalloc.h"
+
#include "gettext.h"
#define _(msgid) gettext (msgid)
Index: language/stats/sort-cases.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/stats/sort-cases.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- language/stats/sort-cases.c 7 Jul 2007 06:14:17 -0000 1.11
+++ language/stats/sort-cases.c 12 Oct 2007 04:59:28 -0000 1.12
@@ -26,12 +26,13 @@
#include <data/variable.h>
#include <language/command.h>
#include <language/lexer/lexer.h>
-#include <libpspp/alloc.h>
#include <libpspp/message.h>
#include <data/case-ordering.h>
#include <math/sort.h>
#include <sys/types.h>
+#include "xalloc.h"
+
#include "gettext.h"
#define _(msgid) gettext (msgid)
Index: language/stats/t-test.q
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/stats/t-test.q,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- language/stats/t-test.q 12 Oct 2007 04:49:27 -0000 1.29
+++ language/stats/t-test.q 12 Oct 2007 04:59:28 -0000 1.30
@@ -31,7 +31,6 @@
#include <language/command.h>
#include <language/dictionary/split-file.h>
#include <language/lexer/lexer.h>
-#include <libpspp/alloc.h>
#include <libpspp/assertion.h>
#include <libpspp/compiler.h>
#include <libpspp/hash.h>
@@ -45,6 +44,7 @@
#include <output/table.h>
#include "size_max.h"
+#include "xalloc.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
Index: language/utilities/echo.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/utilities/echo.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- language/utilities/echo.c 7 Jul 2007 06:14:18 -0000 1.8
+++ language/utilities/echo.c 12 Oct 2007 04:59:28 -0000 1.9
@@ -16,13 +16,14 @@
#include <config.h>
#include <libpspp/message.h>
-#include <libpspp/alloc.h>
#include <libpspp/str.h>
#include <language/lexer/lexer.h>
#include <language/command.h>
#include <output/table.h>
#include <output/manager.h>
+#include "xalloc.h"
+
/* Echos a string to the output stream */
int
cmd_echo (struct lexer *lexer, struct dataset *ds UNUSED)
Index: language/utilities/include.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/utilities/include.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- language/utilities/include.c 5 Sep 2007 06:23:03 -0000 1.13
+++ language/utilities/include.c 12 Oct 2007 04:59:28 -0000 1.14
@@ -17,7 +17,6 @@
#include <config.h>
#include <ctype.h>
#include <stdlib.h>
-#include <libpspp/alloc.h>
#include <language/command.h>
#include <libpspp/message.h>
#include <libpspp/getl.h>
@@ -25,9 +24,10 @@
#include <language/lexer/lexer.h>
#include <libpspp/str.h>
#include <data/file-name.h>
-#include <dirname.h>
-#include <canonicalize.h>
+#include "dirname.h"
+#include "canonicalize.h"
+#include "xalloc.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
Index: language/utilities/set.q
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/utilities/set.q,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- language/utilities/set.q 12 Oct 2007 04:49:27 -0000 1.30
+++ language/utilities/set.q 12 Oct 2007 04:59:28 -0000 1.31
@@ -33,7 +33,6 @@
#include <language/lexer/format-parser.h>
#include <language/lexer/lexer.h>
#include <language/prompt.h>
-#include <libpspp/alloc.h>
#include <libpspp/compiler.h>
#include <libpspp/copyleft.h>
#include <libpspp/float-format.h>
@@ -52,6 +51,8 @@
#endif /* !HAVE_TERMCAP_H */
#endif /* !HAVE_LIBTERMCAP */
+#include "xalloc.h"
+
#include "gettext.h"
#define _(msgid) gettext (msgid)
Index: language/utilities/title.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/utilities/title.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- language/utilities/title.c 28 Aug 2007 01:00:04 -0000 1.14
+++ language/utilities/title.c 12 Oct 2007 04:59:28 -0000 1.15
@@ -24,12 +24,13 @@
#include <data/variable.h>
#include <language/command.h>
#include <language/lexer/lexer.h>
-#include <libpspp/alloc.h>
#include <libpspp/message.h>
#include <libpspp/start-date.h>
#include <libpspp/version.h>
#include <output/output.h>
+#include "xalloc.h"
+
#include "gettext.h"
#define _(msgid) gettext (msgid)
Index: language/xforms/compute.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/xforms/compute.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- language/xforms/compute.c 7 Jul 2007 06:14:19 -0000 1.16
+++ language/xforms/compute.c 12 Oct 2007 04:59:29 -0000 1.17
@@ -16,6 +16,7 @@
#include <config.h>
+#include <stdint.h>
#include <stdlib.h>
#include <data/case.h>
@@ -27,12 +28,12 @@
#include <language/command.h>
#include <language/expressions/public.h>
#include <language/lexer/lexer.h>
-#include <libpspp/alloc.h>
-#include <libpspp/message.h>
#include <libpspp/message.h>
#include <libpspp/misc.h>
#include <libpspp/str.h>
+#include "xalloc.h"
+
#include "gettext.h"
#define _(msgid) gettext (msgid)
Index: language/xforms/count.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/xforms/count.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- language/xforms/count.c 7 Jul 2007 06:14:19 -0000 1.18
+++ language/xforms/count.c 12 Oct 2007 04:59:29 -0000 1.19
@@ -27,13 +27,14 @@
#include <language/lexer/lexer.h>
#include <language/lexer/range-parser.h>
#include <language/lexer/variable-parser.h>
-#include <libpspp/alloc.h>
#include <libpspp/compiler.h>
#include <libpspp/message.h>
#include <libpspp/message.h>
#include <libpspp/pool.h>
#include <libpspp/str.h>
+#include "xalloc.h"
+
#include "gettext.h"
#define _(msgid) gettext (msgid)
Index: language/xforms/recode.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/xforms/recode.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- language/xforms/recode.c 12 Oct 2007 04:49:27 -0000 1.26
+++ language/xforms/recode.c 12 Oct 2007 04:59:29 -0000 1.27
@@ -30,14 +30,14 @@
#include <language/lexer/lexer.h>
#include <language/lexer/variable-parser.h>
#include <language/lexer/range-parser.h>
-#include <libpspp/alloc.h>
#include <libpspp/assertion.h>
#include <libpspp/compiler.h>
#include <libpspp/message.h>
-#include <libpspp/message.h>
#include <libpspp/pool.h>
#include <libpspp/str.h>
+#include "xalloc.h"
+
#include "gettext.h"
#define _(msgid) gettext (msgid)
Index: language/xforms/sample.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/xforms/sample.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- language/xforms/sample.c 7 Jul 2007 06:14:19 -0000 1.13
+++ language/xforms/sample.c 12 Oct 2007 04:59:29 -0000 1.14
@@ -25,12 +25,13 @@
#include <data/variable.h>
#include <language/command.h>
#include <language/lexer/lexer.h>
-#include <libpspp/alloc.h>
#include <libpspp/compiler.h>
#include <libpspp/message.h>
#include <libpspp/str.h>
#include <math/random.h>
+#include "xalloc.h"
+
#include "gettext.h"
#define _(msgid) gettext (msgid)
Index: language/xforms/select-if.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/xforms/select-if.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- language/xforms/select-if.c 7 Jul 2007 06:14:19 -0000 1.16
+++ language/xforms/select-if.c 12 Oct 2007 04:59:29 -0000 1.17
@@ -26,10 +26,11 @@
#include <language/expressions/public.h>
#include <language/lexer/lexer.h>
#include <language/lexer/variable-parser.h>
-#include <libpspp/alloc.h>
#include <libpspp/message.h>
#include <libpspp/str.h>
+#include "xalloc.h"
+
#include "gettext.h"
#define _(msgid) gettext (msgid)
Index: libpspp/ChangeLog
===================================================================
RCS file: /cvsroot/pspp/pspp/src/libpspp/ChangeLog,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -b -r1.81 -r1.82
--- libpspp/ChangeLog 12 Oct 2007 04:54:46 -0000 1.81
+++ libpspp/ChangeLog 12 Oct 2007 04:59:29 -0000 1.82
@@ -1,5 +1,12 @@
2007-10-11 Ben Pfaff <address@hidden>
+ * xalloc.h: Removed. Changed all users to include "xalloc.h" from
+ gnulib instead.
+
+ * xalloc.c: Removed.
+
+2007-10-11 Ben Pfaff <address@hidden>
+
* alloc.h (local_alloc): Removed. Changed all users to use
xmalloca instead.
(local_free): Removed. Changed all users to use freea instead.
Index: libpspp/array.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/libpspp/array.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- libpspp/array.c 7 Jul 2007 06:14:19 -0000 1.15
+++ libpspp/array.c 12 Oct 2007 04:59:29 -0000 1.16
@@ -88,11 +88,9 @@
#include <limits.h>
#include <stdlib.h>
#include <string.h>
-#include "alloc.h"
#include <libpspp/assertion.h>
-#include "message.h"
-
+#include "xalloc.h"
#include "minmax.h"
/* Finds an element in ARRAY, which contains COUNT elements of
Index: libpspp/automake.mk
===================================================================
RCS file: /cvsroot/pspp/pspp/src/libpspp/automake.mk,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- libpspp/automake.mk 12 Oct 2007 04:49:27 -0000 1.31
+++ libpspp/automake.mk 12 Oct 2007 04:59:29 -0000 1.32
@@ -6,8 +6,6 @@
src_libpspp_libpspp_a_SOURCES = \
src/libpspp/abt.c \
src/libpspp/abt.h \
- src/libpspp/alloc.c \
- src/libpspp/alloc.h \
src/libpspp/array.c \
src/libpspp/array.h \
src/libpspp/assertion.h \
Index: libpspp/getl.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/libpspp/getl.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- libpspp/getl.c 5 Sep 2007 06:23:03 -0000 1.11
+++ libpspp/getl.c 12 Oct 2007 04:59:29 -0000 1.12
@@ -22,7 +22,8 @@
#include <libpspp/str.h>
#include <libpspp/ll.h>
#include <libpspp/version.h>
-#include <libpspp/alloc.h>
+
+#include "xalloc.h"
struct getl_source
{
Index: libpspp/hash.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/libpspp/hash.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- libpspp/hash.c 7 Jul 2007 06:14:20 -0000 1.12
+++ libpspp/hash.c 12 Oct 2007 04:59:29 -0000 1.13
@@ -24,12 +24,12 @@
#include <stdbool.h>
#include <stdlib.h>
#include "array.h"
-#include "alloc.h"
#include "compiler.h"
#include "misc.h"
#include "str.h"
#include "pool.h"
+#include "xalloc.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
Index: libpspp/message.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/libpspp/message.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- libpspp/message.c 7 Jul 2007 06:14:21 -0000 1.11
+++ libpspp/message.c 12 Oct 2007 04:59:29 -0000 1.12
@@ -26,10 +26,10 @@
#include <string.h>
#include <unistd.h>
-#include <libpspp/alloc.h>
#include <libpspp/version.h>
#include "progname.h"
+#include "xalloc.h"
#include "xvasprintf.h"
/* Current command name as set by msg_set_command_name(). */
Index: libpspp/msg-locator.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/libpspp/msg-locator.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- libpspp/msg-locator.c 7 Jul 2007 06:14:21 -0000 1.4
+++ libpspp/msg-locator.c 12 Oct 2007 04:59:29 -0000 1.5
@@ -16,12 +16,13 @@
#include <config.h>
#include <stdlib.h>
-#include <libpspp/alloc.h>
#include "msg-locator.h"
#include <libpspp/message.h>
#include <libpspp/assertion.h>
#include "getl.h"
+#include "xalloc.h"
+
/* File locator stack. */
static const struct msg_locator **file_loc;
Index: libpspp/pool.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/libpspp/pool.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- libpspp/pool.c 7 Jul 2007 06:14:21 -0000 1.11
+++ libpspp/pool.c 12 Oct 2007 04:59:29 -0000 1.12
@@ -17,12 +17,13 @@
#include <config.h>
#include "pool.h"
#include <stdlib.h>
-#include "alloc.h"
#include <libpspp/assertion.h>
#include "message.h"
-#include "size_max.h"
#include "str.h"
+#include "size_max.h"
+#include "xalloc.h"
+
/* Fast, low-overhead memory block suballocator. */
struct pool
{
Index: libpspp/str.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/libpspp/str.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- libpspp/str.c 7 Jul 2007 06:14:22 -0000 1.22
+++ libpspp/str.c 12 Oct 2007 04:59:29 -0000 1.23
@@ -22,12 +22,12 @@
#include <limits.h>
#include <stdlib.h>
-#include <libpspp/alloc.h>
#include <libpspp/message.h>
#include <libpspp/pool.h>
#include "minmax.h"
#include "size_max.h"
+#include "xalloc.h"
#include "xsize.h"
/* Reverses the order of NBYTES bytes at address P, thus converting
Index: math/design-matrix.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/math/design-matrix.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- math/design-matrix.c 7 Jul 2007 06:14:22 -0000 1.9
+++ math/design-matrix.c 12 Oct 2007 04:59:29 -0000 1.10
@@ -26,7 +26,6 @@
#include <stdlib.h>
#include <string.h>
-#include <libpspp/alloc.h>
#include <libpspp/message.h>
#include <data/variable.h>
#include <data/category.h>
@@ -36,6 +35,8 @@
#include <gsl/gsl_vector.h>
#include <gsl/gsl_matrix.h>
+#include "xalloc.h"
+
#define DM_COLUMN_NOT_FOUND -1
#define DM_INDEX_NOT_FOUND -3
Index: math/factor-stats.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/math/factor-stats.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- math/factor-stats.c 7 Jul 2007 06:14:22 -0000 1.6
+++ math/factor-stats.c 12 Oct 2007 04:59:29 -0000 1.7
@@ -19,7 +19,6 @@
#include <data/value.h>
#include <libpspp/hash.h>
#include <libpspp/array.h>
-#include <libpspp/alloc.h>
#include "moments.h"
#include "percentiles.h"
@@ -29,6 +28,7 @@
#include <assert.h>
#include "histogram.h"
+#include "xalloc.h"
void
metrics_precalc(struct metrics *m)
Index: math/group.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/math/group.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- math/group.c 7 Jul 2007 06:14:23 -0000 1.8
+++ math/group.c 12 Oct 2007 04:59:29 -0000 1.9
@@ -16,7 +16,6 @@
#include <config.h>
#include <stdlib.h>
-#include <libpspp/alloc.h>
#include <libpspp/compiler.h>
#include <libpspp/hash.h>
#include "group.h"
@@ -25,6 +24,7 @@
#include <data/variable.h>
#include <libpspp/misc.h>
+#include "xalloc.h"
/* Return -1 if the id of a is less than b; +1 if greater than and
0 if equal */
Index: math/interaction.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/math/interaction.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- math/interaction.c 4 Oct 2007 02:41:53 -0000 1.5
+++ math/interaction.c 12 Oct 2007 04:59:30 -0000 1.6
@@ -28,13 +28,14 @@
#include <config.h>
#include <assert.h>
-#include <libpspp/alloc.h>
#include <gsl/gsl_math.h>
#include <gsl/gsl_vector.h>
#include <data/category.h>
#include <data/variable.h>
#include "interaction.h"
+#include "xalloc.h"
+
/*
Convert a list of values to a binary vector. The order of VALS must
correspond to the order of V.
Index: math/levene.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/math/levene.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- math/levene.c 7 Jul 2007 06:14:23 -0000 1.13
+++ math/levene.c 12 Oct 2007 04:59:30 -0000 1.14
@@ -25,13 +25,14 @@
#include <libpspp/str.h>
#include <data/variable.h>
#include <data/procedure.h>
-#include <libpspp/alloc.h>
#include <libpspp/misc.h>
#include "group.h"
#include <math.h>
#include <stdlib.h>
+#include "xalloc.h"
+
/* This module calculates the Levene statistic for variables.
Index: math/moments.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/math/moments.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- math/moments.c 7 Jul 2007 06:14:23 -0000 1.7
+++ math/moments.c 12 Oct 2007 04:59:30 -0000 1.8
@@ -19,10 +19,11 @@
#include <assert.h>
#include <math.h>
#include <stdlib.h>
-#include <libpspp/alloc.h>
#include <libpspp/misc.h>
#include <data/value.h>
+#include "xalloc.h"
+
#include "gettext.h"
#define _(msgid) gettext (msgid)
Index: math/sort.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/math/sort.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- math/sort.c 13 Aug 2007 00:41:35 -0000 1.27
+++ math/sort.c 12 Oct 2007 04:59:30 -0000 1.28
@@ -26,11 +26,12 @@
#include <data/casewriter.h>
#include <data/casewriter-provider.h>
#include <data/settings.h>
-#include <libpspp/alloc.h>
#include <libpspp/array.h>
#include <libpspp/assertion.h>
#include <math/merge.h>
+#include "xalloc.h"
+
#include "gettext.h"
#define _(msgid) gettext (msgid)
Index: math/ts/innovations.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/math/ts/innovations.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- math/ts/innovations.c 7 Jul 2007 06:14:24 -0000 1.19
+++ math/ts/innovations.c 12 Oct 2007 04:59:30 -0000 1.20
@@ -30,11 +30,12 @@
#include <gsl/gsl_vector.h>
#include <gsl/gsl_math.h>
#include <stdlib.h>
-#include <libpspp/alloc.h>
#include <libpspp/compiler.h>
#include <math/coefficient.h>
#include <math/ts/innovations.h>
+#include "xalloc.h"
+
static void
get_mean (const gsl_matrix *data,
struct innovations_estimate **est)
Index: output/ascii.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/output/ascii.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- output/ascii.c 26 Sep 2007 04:24:07 -0000 1.20
+++ output/ascii.c 12 Oct 2007 04:59:30 -0000 1.21
@@ -24,7 +24,6 @@
#include <data/file-name.h>
#include <data/settings.h>
-#include <libpspp/alloc.h>
#include <libpspp/assertion.h>
#include <libpspp/compiler.h>
#include <libpspp/pool.h>
@@ -35,6 +34,7 @@
#include "error.h"
#include "minmax.h"
#include "output.h"
+#include "xalloc.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
Index: output/chart.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/output/chart.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- output/chart.c 21 Sep 2007 14:12:57 -0000 1.7
+++ output/chart.c 12 Oct 2007 04:59:30 -0000 1.8
@@ -29,12 +29,12 @@
#include <plot.h>
-#include <libpspp/alloc.h>
#include <libpspp/str.h>
#include <output/manager.h>
#include <output/output.h>
#include "error.h"
+#include "xalloc.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
Index: output/chart.h
===================================================================
RCS file: /cvsroot/pspp/pspp/src/output/chart.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- output/chart.h 15 Aug 2007 01:47:18 -0000 1.8
+++ output/chart.h 12 Oct 2007 04:59:30 -0000 1.9
@@ -25,10 +25,11 @@
#include <math/chart-geometry.h>
#include <libpspp/str.h>
-#include <libpspp/alloc.h>
#include "manager.h"
#include "output.h"
+#include "xalloc.h"
+
#ifndef CHART_H
#define CHART_H
Index: output/html.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/output/html.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- output/html.c 21 Sep 2007 14:12:57 -0000 1.25
+++ output/html.c 12 Oct 2007 04:59:30 -0000 1.26
@@ -24,7 +24,6 @@
#include <time.h>
#include <unistd.h>
-#include <libpspp/alloc.h>
#include <libpspp/assertion.h>
#include <libpspp/compiler.h>
#include <data/file-name.h>
@@ -34,6 +33,8 @@
#include "table.h"
#include <libpspp/version.h>
+#include "xalloc.h"
+
#include "gettext.h"
#define _(msgid) gettext (msgid)
Index: output/output.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/output/output.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- output/output.c 23 Sep 2007 05:59:02 -0000 1.27
+++ output/output.c 12 Oct 2007 04:59:30 -0000 1.28
@@ -25,7 +25,6 @@
#include <data/file-name.h>
#include <data/settings.h>
-#include <libpspp/alloc.h>
#include <libpspp/misc.h>
#include <libpspp/str.h>
#include <output/htmlP.h>
@@ -33,6 +32,7 @@
#include "error.h"
#include "intprops.h"
+#include "xalloc.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
Index: output/postscript.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/output/postscript.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- output/postscript.c 23 Sep 2007 05:59:02 -0000 1.31
+++ output/postscript.c 12 Oct 2007 04:59:30 -0000 1.32
@@ -23,7 +23,6 @@
#include <time.h>
#include <unistd.h>
-#include <libpspp/alloc.h>
#include <libpspp/assertion.h>
#include <libpspp/bit-vector.h>
#include <libpspp/compiler.h>
@@ -38,11 +37,13 @@
#include "afm.h"
#include "chart.h"
#include "error.h"
-#include "intprops.h"
#include "manager.h"
-#include "minmax.h"
#include "output.h"
+
+#include "intprops.h"
+#include "minmax.h"
#include "size_max.h"
+#include "xalloc.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
Index: output/table.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/output/table.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- output/table.c 12 Oct 2007 04:49:28 -0000 1.23
+++ output/table.c 12 Oct 2007 04:59:30 -0000 1.24
@@ -29,13 +29,13 @@
#include <data/data-out.h>
#include <data/format.h>
#include <data/value.h>
-#include <libpspp/alloc.h>
#include <libpspp/assertion.h>
#include <libpspp/compiler.h>
#include <libpspp/misc.h>
#include <libpspp/pool.h>
#include "minmax.h"
+#include "xalloc.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
Index: output/charts/plot-chart.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/output/charts/plot-chart.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- output/charts/plot-chart.c 7 Jul 2007 06:14:26 -0000 1.8
+++ output/charts/plot-chart.c 12 Oct 2007 04:59:30 -0000 1.9
@@ -32,11 +32,11 @@
#include <libpspp/str.h>
-#include <libpspp/alloc.h>
#include <libpspp/assertion.h>
#include <output/manager.h>
#include <output/output.h>
+#include "xalloc.h"
const char *const data_colour[] = {
"brown",
Index: output/charts/plot-chart.h
===================================================================
RCS file: /cvsroot/pspp/pspp/src/output/charts/plot-chart.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- output/charts/plot-chart.h 7 Jul 2007 06:14:26 -0000 1.7
+++ output/charts/plot-chart.h 12 Oct 2007 04:59:30 -0000 1.8
@@ -28,10 +28,10 @@
#include <output/chart.h>
#include <libpspp/str.h>
-#include <libpspp/alloc.h>
#include <output/manager.h>
#include <output/output.h>
+#include "xalloc.h"
#ifndef PLOT_CHART_H
#define PLOT_CHART_H
Index: ui/gui/clipboard.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/ui/gui/clipboard.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- ui/gui/clipboard.c 18 Aug 2007 02:52:36 -0000 1.3
+++ ui/gui/clipboard.c 12 Oct 2007 04:59:30 -0000 1.4
@@ -22,7 +22,6 @@
#include "psppire-data-store.h"
#include <data/casereader.h>
#include <data/case-map.h>
-#include <libpspp/alloc.h>
#include <data/casewriter.h>
#include <data/format.h>
#include <data/data-out.h>
@@ -30,6 +29,7 @@
#include <stdlib.h>
#include "data-editor.h"
+#include "xalloc.h"
/* A casereader and dictionary holding the data currently in the clip */
static struct casereader *clip_datasheet = NULL;
Index: ui/gui/find-dialog.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/ui/gui/find-dialog.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- ui/gui/find-dialog.c 15 Sep 2007 00:52:59 -0000 1.2
+++ ui/gui/find-dialog.c 12 Oct 2007 04:59:30 -0000 1.3
@@ -30,18 +30,17 @@
#include <data/datasheet.h>
#include <data/data-in.h>
#include "psppire-data-store.h"
-#include <libpspp/alloc.h>
#include <ctype.h>
#include <sys/types.h>
#include <regex.h>
#include <libpspp/message.h>
-
-
#include <gtk/gtk.h>
#include <glade/glade.h>
#include <stdlib.h>
+#include "xalloc.h"
+
#include <gettext.h>
#define _(msgid) gettext (msgid)
#define N_(msgid) msgid
Index: ui/gui/syntax-editor-source.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/ui/gui/syntax-editor-source.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- ui/gui/syntax-editor-source.c 5 Sep 2007 06:23:03 -0000 1.9
+++ ui/gui/syntax-editor-source.c 12 Oct 2007 04:59:30 -0000 1.10
@@ -18,7 +18,6 @@
#include <config.h>
#include <libpspp/getl.h>
-#include <libpspp/alloc.h>
#include <libpspp/compiler.h>
#include <libpspp/str.h>
@@ -29,6 +28,8 @@
#include "syntax-editor-source.h"
#include "syntax-editor.h"
+#include "xalloc.h"
+
struct syntax_editor_source
{
struct getl_interface parent;
Index: ui/terminal/command-line.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/ui/terminal/command-line.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- ui/terminal/command-line.c 25 Sep 2007 04:26:25 -0000 1.17
+++ ui/terminal/command-line.c 12 Oct 2007 04:59:31 -0000 1.18
@@ -23,7 +23,6 @@
#include <errno.h>
#include <getopt.h>
#include <stdlib.h>
-#include <libpspp/alloc.h>
#include <libpspp/assertion.h>
#include <libpspp/copyleft.h>
#include <libpspp/message.h>
@@ -38,6 +37,8 @@
#include <libpspp/verbose-msg.h>
#include "read-line.h"
+#include "xalloc.h"
+
#include "gettext.h"
#define _(msgid) gettext (msgid)
#define N_(msgid) msgid
Index: libpspp/alloc.c
===================================================================
RCS file: libpspp/alloc.c
diff -N libpspp/alloc.c
--- libpspp/alloc.c 7 Jul 2007 06:14:19 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,29 +0,0 @@
-/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000 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 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.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>. */
-
-#include <config.h>
-#include "alloc.h"
-#include <stdlib.h>
-
-/* Allocates and returns N elements of S bytes each.
- N must be nonnegative, S must be positive.
- Returns a null pointer if the memory cannot be obtained,
- including the case where N * S overflows the range of size_t. */
-void *
-nmalloc (size_t n, size_t s)
-{
- return !xalloc_oversized (n, s) ? malloc (n * s) : NULL;
-}
Index: libpspp/alloc.h
===================================================================
RCS file: libpspp/alloc.h
diff -N libpspp/alloc.h
--- libpspp/alloc.h 12 Oct 2007 04:54:46 -0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,27 +0,0 @@
-/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000 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 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.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>. */
-
-#if !alloc_h
-#define alloc_h 1
-
-#include <stddef.h>
-
-/* malloc() wrapper functions. */
-#include "xalloc.h"
-
-void *nmalloc (size_t n, size_t s);
-
-#endif /* alloc.h */
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pspp-cvs] pspp/src data/case-map.c data/case.c data/categ...,
Ben Pfaff <=