[Pspp-cvs] pspp/src/data storage-stream.h storage-stream.c

[Ben Pfaff]

CVSROOT:        /cvsroot/pspp
Module name:    pspp
Branch:         
Changes by:     Ben Pfaff <address@hidden>      06/05/02 22:52:33

Modified files:
        src/data       : storage-stream.h storage-stream.c 

Log message:
        Continue reforming procedure execution.  In this phase, add some new,
        needed functionality to storage-stream.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/data/storage-stream.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/data/storage-stream.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: pspp/src/data/storage-stream.c
diff -u pspp/src/data/storage-stream.c:1.1 pspp/src/data/storage-stream.c:1.2
--- pspp/src/data/storage-stream.c:1.1  Thu Apr 27 02:42:01 2006
+++ pspp/src/data/storage-stream.c      Tue May  2 22:52:33 2006
@@ -160,6 +160,21 @@
   return info->casefile;
 }
 
+/* Destroys SOURCE and returns the casefile that it
+   encapsulated. */
+struct casefile *
+storage_source_decapsulate (struct case_source *source) 
+{
+  struct storage_stream_info *info = source->aux;
+  struct casefile *casefile;
+
+  assert (source->class == &storage_source_class);
+  casefile = info->casefile;
+  info->casefile = NULL;
+  destroy_storage_stream_info (info);
+  return casefile;
+}
+
 struct case_source *
 storage_source_create (struct casefile *cf)
 {
Index: pspp/src/data/storage-stream.h
diff -u pspp/src/data/storage-stream.h:1.1 pspp/src/data/storage-stream.h:1.2
--- pspp/src/data/storage-stream.h:1.1  Thu Apr 27 02:42:01 2006
+++ pspp/src/data/storage-stream.h      Tue May  2 22:52:33 2006
@@ -27,6 +27,7 @@
 extern const struct case_source_class storage_source_class;
 
 struct casefile *storage_source_get_casefile (struct case_source *);
+struct casefile *storage_source_decapsulate (struct case_source *);
 struct case_source *storage_source_create (struct casefile *);
 
 #endif /* storage-stream.h */