[Pspp-cvs] pspp/src libpspp/ChangeLog libpspp/getl.c libps...

[John Darrington]

CVSROOT:        /sources/pspp
Module name:    pspp
Changes by:     John Darrington <jmd>   06/12/07 11:34:17

Modified files:
        src/libpspp    : ChangeLog getl.c getl.h 
        src/ui/gui     : psppire.c 
        src/ui/terminal: main.c 

Log message:
        Removed mutual dependency between libpspp and data

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/src/libpspp/ChangeLog?cvsroot=pspp&r1=1.42&r2=1.43
http://cvs.savannah.gnu.org/viewcvs/pspp/src/libpspp/getl.c?cvsroot=pspp&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/pspp/src/libpspp/getl.h?cvsroot=pspp&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/psppire.c?cvsroot=pspp&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/terminal/main.c?cvsroot=pspp&r1=1.24&r2=1.25

Patches:
Index: libpspp/ChangeLog
===================================================================
RCS file: /sources/pspp/pspp/src/libpspp/ChangeLog,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- libpspp/ChangeLog   3 Dec 2006 22:16:46 -0000       1.42
+++ libpspp/ChangeLog   7 Dec 2006 11:34:17 -0000       1.43
@@ -1,3 +1,8 @@
+Thu Dec  7 20:33:23 WST 2006 John Darrington <address@hidden>
+
+       * getl.c getl.h : Changed signature of create function to take a 
+       string indicating the initial include path.
+
 Sun Dec  3 11:36:10 2006  Ben Pfaff  <address@hidden>
 
        * str.h (SS_LITERAL_INITIALIZER): Cast the string literal to "char

Index: libpspp/getl.c
===================================================================
RCS file: /sources/pspp/pspp/src/libpspp/getl.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- libpspp/getl.c      5 Dec 2006 11:27:42 -0000       1.4
+++ libpspp/getl.c      7 Dec 2006 11:34:17 -0000       1.5
@@ -18,7 +18,6 @@
    02110-1301, USA. */
 
 #include <stdlib.h>
-
 #include <config.h>
 
 #include "getl.h"
@@ -28,8 +27,6 @@
 #include <libpspp/version.h>
 #include <libpspp/alloc.h>
 
-#include <data/file-name.h>
-
 struct getl_source
   {
     struct getl_source *included_from; /* File that this is nested inside. */
@@ -62,12 +59,16 @@
 
 /* Initialize getl. */
 struct source_stream *
-create_source_stream (void)
+create_source_stream (const char *initial_include_path)
 {
   struct source_stream *ss = xzalloc (sizeof (*ss));
   ll_init (&ss->sources);
+#if 0
   ds_init_cstr (&ss->the_include_path,
                 fn_getenv_default ("STAT_INCLUDE_PATH", include_path));
+#endif
+  ds_init_cstr (&ss->the_include_path, initial_include_path);
+
   return ss;
 }
 

Index: libpspp/getl.h
===================================================================
RCS file: /sources/pspp/pspp/src/libpspp/getl.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- libpspp/getl.h      5 Dec 2006 11:27:42 -0000       1.3
+++ libpspp/getl.h      7 Dec 2006 11:34:17 -0000       1.4
@@ -73,7 +73,7 @@
 
 struct source_stream;
 
-struct source_stream * create_source_stream (void);
+struct source_stream * create_source_stream (const char *);
 void destroy_source_stream (struct source_stream *);
 
 void getl_clear_include_path (struct source_stream *);

Index: ui/gui/psppire.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/psppire.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- ui/gui/psppire.c    5 Dec 2006 11:27:42 -0000       1.21
+++ ui/gui/psppire.c    7 Dec 2006 11:34:17 -0000       1.22
@@ -27,6 +27,7 @@
 #include <libpspp/copyleft.h>
 #include <data/format.h>
 #include <data/settings.h>
+#include <data/file-name.h>
 #include <libpspp/getl.h>
 
 #include <getopt.h>
@@ -118,7 +119,10 @@
 
   fmt_init();
   settings_init();
-  the_source_stream = create_source_stream ();
+  the_source_stream = create_source_stream (
+                         fn_getenv_default ("STAT_INCLUDE_PATH", include_path)
+                         );
+
   message_dialog_init (the_source_stream);
 
   the_dictionary = psppire_dict_new();

Index: ui/terminal/main.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/terminal/main.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- ui/terminal/main.c  5 Dec 2006 11:27:42 -0000       1.24
+++ ui/terminal/main.c  7 Dec 2006 11:34:17 -0000       1.25
@@ -97,7 +97,10 @@
   outp_init ();
   fn_init ();
   fh_init ();
-  the_source_stream = create_source_stream ();
+  the_source_stream =
+    create_source_stream (
+                         fn_getenv_default ("STAT_INCLUDE_PATH", include_path)
+                         );
   prompt_init ();
   readln_initialize ();
   settings_init ();