[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pspp-cvs] pspp/src math/sort.c data/sys-file-writer.c dat... [simpler-p
|
From: |
Ben Pfaff |
|
Subject: |
[Pspp-cvs] pspp/src math/sort.c data/sys-file-writer.c dat... [simpler-proc] |
|
Date: |
Mon, 07 May 2007 05:19:16 +0000 |
CVSROOT: /cvsroot/pspp
Module name: pspp
Branch: simpler-proc
Changes by: Ben Pfaff <blp> 07/05/07 05:19:16
Modified files:
src/math : sort.c
src/data : sys-file-writer.c scratch-writer.c
por-file-writer.c casewriter.c
casewriter-translator.c automake.mk
Added files:
src/data : casewriter-provider.h
Removed files:
src/data : casewriter-private.h
Log message:
Rename casewriter-private.h as more accurate name
casewriter-provider.h.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/src/math/sort.c?cvsroot=pspp&only_with_tag=simpler-proc&r1=1.23.2.3&r2=1.23.2.4
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/sys-file-writer.c?cvsroot=pspp&only_with_tag=simpler-proc&r1=1.22.2.2&r2=1.22.2.3
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/scratch-writer.c?cvsroot=pspp&only_with_tag=simpler-proc&r1=1.4.2.2&r2=1.4.2.3
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/por-file-writer.c?cvsroot=pspp&only_with_tag=simpler-proc&r1=1.9.2.3&r2=1.9.2.4
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/casewriter.c?cvsroot=pspp&only_with_tag=simpler-proc&r1=1.1.2.6&r2=1.1.2.7
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/casewriter-translator.c?cvsroot=pspp&only_with_tag=simpler-proc&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/automake.mk?cvsroot=pspp&only_with_tag=simpler-proc&r1=1.15.2.5&r2=1.15.2.6
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/casewriter-provider.h?cvsroot=pspp&only_with_tag=simpler-proc&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/casewriter-private.h?cvsroot=pspp&only_with_tag=simpler-proc&r1=1.1.2.3&r2=0
Patches:
Index: math/sort.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/math/sort.c,v
retrieving revision 1.23.2.3
retrieving revision 1.23.2.4
diff -u -b -r1.23.2.3 -r1.23.2.4
--- math/sort.c 6 May 2007 22:48:27 -0000 1.23.2.3
+++ math/sort.c 7 May 2007 05:19:16 -0000 1.23.2.4
@@ -24,7 +24,7 @@
#include <data/case.h>
#include <data/casereader.h>
-#include <data/casewriter-private.h>
+#include <data/casewriter-provider.h>
#include <data/settings.h>
#include <libpspp/alloc.h>
#include <libpspp/array.h>
Index: data/sys-file-writer.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/data/sys-file-writer.c,v
retrieving revision 1.22.2.2
retrieving revision 1.22.2.3
diff -u -b -r1.22.2.2 -r1.22.2.3
--- data/sys-file-writer.c 4 May 2007 03:48:47 -0000 1.22.2.2
+++ data/sys-file-writer.c 7 May 2007 05:19:16 -0000 1.22.2.3
@@ -38,7 +38,7 @@
#include <libpspp/version.h>
#include <data/case.h>
-#include <data/casewriter-private.h>
+#include <data/casewriter-provider.h>
#include <data/casewriter.h>
#include <data/dictionary.h>
#include <data/file-handle-def.h>
Index: data/scratch-writer.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/data/scratch-writer.c,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -b -r1.4.2.2 -r1.4.2.3
--- data/scratch-writer.c 4 May 2007 03:48:47 -0000 1.4.2.2
+++ data/scratch-writer.c 7 May 2007 05:19:16 -0000 1.4.2.3
@@ -24,7 +24,7 @@
#include <data/case.h>
#include <data/casereader.h>
-#include <data/casewriter-private.h>
+#include <data/casewriter-provider.h>
#include <data/casewriter.h>
#include <data/dictionary.h>
#include <data/file-handle-def.h>
Index: data/por-file-writer.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/data/por-file-writer.c,v
retrieving revision 1.9.2.3
retrieving revision 1.9.2.4
diff -u -b -r1.9.2.3 -r1.9.2.4
--- data/por-file-writer.c 4 May 2007 03:48:47 -0000 1.9.2.3
+++ data/por-file-writer.c 7 May 2007 05:19:16 -0000 1.9.2.4
@@ -31,7 +31,7 @@
#include <unistd.h>
#include <data/case.h>
-#include <data/casewriter-private.h>
+#include <data/casewriter-provider.h>
#include <data/casewriter.h>
#include <data/dictionary.h>
#include <data/file-handle-def.h>
Index: data/casewriter.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/data/Attic/casewriter.c,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -b -r1.1.2.6 -r1.1.2.7
--- data/casewriter.c 7 May 2007 05:16:08 -0000 1.1.2.6
+++ data/casewriter.c 7 May 2007 05:19:16 -0000 1.1.2.7
@@ -19,7 +19,7 @@
#include <config.h>
#include <data/casewriter.h>
-#include <data/casewriter-private.h>
+#include <data/casewriter-provider.h>
#include <assert.h>
#include <stdlib.h>
Index: data/casewriter-translator.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/data/Attic/casewriter-translator.c,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- data/casewriter-translator.c 7 May 2007 04:38:39 -0000 1.1.2.1
+++ data/casewriter-translator.c 7 May 2007 05:19:16 -0000 1.1.2.2
@@ -19,7 +19,7 @@
#include <config.h>
#include <data/casewriter.h>
-#include <data/casewriter-private.h>
+#include <data/casewriter-provider.h>
#include <stdlib.h>
Index: data/automake.mk
===================================================================
RCS file: /cvsroot/pspp/pspp/src/data/automake.mk,v
retrieving revision 1.15.2.5
retrieving revision 1.15.2.6
diff -u -b -r1.15.2.5 -r1.15.2.6
--- data/automake.mk 7 May 2007 05:16:08 -0000 1.15.2.5
+++ data/automake.mk 7 May 2007 05:19:16 -0000 1.15.2.6
@@ -29,7 +29,7 @@
src/data/casewriter.c \
src/data/casewriter-translator.c \
src/data/casewriter.h \
- src/data/casewriter-private.h \
+ src/data/casewriter-provider.h \
src/data/category.c \
src/data/category.h \
src/data/cat-routines.h \
Index: data/casewriter-provider.h
===================================================================
RCS file: data/casewriter-provider.h
diff -N data/casewriter-provider.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ data/casewriter-provider.h 7 May 2007 05:19:16 -0000 1.1.2.1
@@ -0,0 +1,63 @@
+/* PSPP - computes sample statistics.
+ Copyright (C) 2006 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 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. */
+
+#ifndef DATA_CASEWRITER_PROVIDER_H
+#define DATA_CASEWRITER_PROVIDER_H 1
+
+#include <data/casewriter.h>
+
+struct casewriter_class
+ {
+ /* Mandatory.
+
+ Writes case C to WRITER. Destroys C before returning.
+
+ If an I/O error occurs, this function should call
+ casewriter_force_error on WRITER. Some I/O error
+ detection may be deferred to the "destroy" member function
+ (e.g. writes to disk need not be flushed by "write") . */
+ void (*write) (struct casewriter *writer, void *aux, struct ccase *c);
+
+ /* Mandatory.
+
+ Finalizes output and destroys WRITER.
+
+ If an I/O error is detected while finalizing output
+ (e.g. while flushing output to disk), this function should
+ call casewriter_force_error on WRITER. */
+ void (*destroy) (struct casewriter *writer, void *aux);
+
+ /* Optional: supply if practical and desired by clients.
+
+ Finalizes output to WRITER, destroys WRITER, and in its
+ place returns a casereader that can be used to read back
+ the data written to WRITER. WRITER will not be used again
+ after calling this function, even as an argument to
+ casewriter_destroy.
+
+ If an I/O error is detected while finalizing output
+ (e.g. while flushing output to disk), this function should
+ call casewriter_force_error on WRITER. The caller will
+ ensure that the error is propagated to the returned
+ casereader. */
+ struct casereader *(*convert_to_reader) (struct casewriter *, void *aux);
+ };
+
+struct casewriter *casewriter_create (const struct casewriter_class *, void *);
+
+#endif /* data/casewriter-provider.h */
Index: data/casewriter-private.h
===================================================================
RCS file: data/casewriter-private.h
diff -N data/casewriter-private.h
--- data/casewriter-private.h 7 May 2007 04:38:39 -0000 1.1.2.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,63 +0,0 @@
-/* PSPP - computes sample statistics.
- Copyright (C) 2006 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 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. */
-
-#ifndef DATA_CASEWRITER_PRIVATE_H
-#define DATA_CASEWRITER_PRIVATE_H 1
-
-#include <data/casewriter.h>
-
-struct casewriter_class
- {
- /* Mandatory.
-
- Writes case C to WRITER. Destroys C before returning.
-
- If an I/O error occurs, this function should call
- casewriter_force_error on WRITER. Some I/O error
- detection may be deferred to the "destroy" member function
- (e.g. writes to disk need not be flushed by "write") . */
- void (*write) (struct casewriter *writer, void *aux, struct ccase *c);
-
- /* Mandatory.
-
- Finalizes output and destroys WRITER.
-
- If an I/O error is detected while finalizing output
- (e.g. while flushing output to disk), this function should
- call casewriter_force_error on WRITER. */
- void (*destroy) (struct casewriter *writer, void *aux);
-
- /* Optional: supply if practical and desired by clients.
-
- Finalizes output to WRITER, destroys WRITER, and in its
- place returns a casereader that can be used to read back
- the data written to WRITER. WRITER will not be used again
- after calling this function, even as an argument to
- casewriter_destroy.
-
- If an I/O error is detected while finalizing output
- (e.g. while flushing output to disk), this function should
- call casewriter_force_error on WRITER. The caller will
- ensure that the error is propagated to the returned
- casereader. */
- struct casereader *(*convert_to_reader) (struct casewriter *, void *aux);
- };
-
-struct casewriter *casewriter_create (const struct casewriter_class *, void *);
-
-#endif /* data/casewriter-private.h */
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pspp-cvs] pspp/src math/sort.c data/sys-file-writer.c dat... [simpler-proc],
Ben Pfaff <=