[Pspp-cvs] pspp/src data/ChangeLog data/file-name.c data/f...

[Ben Pfaff]

CVSROOT:        /cvsroot/pspp
Module name:    pspp
Changes by:     Ben Pfaff <blp> 06/12/10 04:08:47

Modified files:
        src/data       : ChangeLog file-name.c file-name.h 
        src/language/utilities: include.c 
        src/output     : output.c postscript.c 
        src/ui/terminal: command-line.c 

Log message:
                * file-name.c (fn_search_path): Remove prefix arg that was 
unused
                by any caller.  Updated all callers.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/ChangeLog?cvsroot=pspp&r1=1.85&r2=1.86
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/file-name.c?cvsroot=pspp&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/file-name.h?cvsroot=pspp&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/utilities/include.c?cvsroot=pspp&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/pspp/src/output/output.c?cvsroot=pspp&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/pspp/src/output/postscript.c?cvsroot=pspp&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/terminal/command-line.c?cvsroot=pspp&r1=1.9&r2=1.10

Patches:
Index: data/ChangeLog
===================================================================
RCS file: /cvsroot/pspp/pspp/src/data/ChangeLog,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -b -r1.85 -r1.86
--- data/ChangeLog      10 Dec 2006 04:04:38 -0000      1.85
+++ data/ChangeLog      10 Dec 2006 04:08:47 -0000      1.86
@@ -1,3 +1,8 @@
+Sat Dec  9 20:08:25 2006  Ben Pfaff  <address@hidden>
+
+       * file-name.c (fn_search_path): Remove prefix arg that was unused
+       by any caller.  Updated all callers.
+
 Sat Dec  9 20:04:22 2006  Ben Pfaff  <address@hidden>
 
        * format.c (fmt_dollar_template): Use user's decimal point

Index: data/file-name.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/data/file-name.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- data/file-name.c    14 Nov 2006 11:47:17 -0000      1.7
+++ data/file-name.c    10 Dec 2006 04:08:47 -0000      1.8
@@ -175,13 +175,9 @@
    given by PATH, which is tilde- and environment-interpolated.
    Directories in PATH are delimited by ':'.  Returns the
    malloc'd full name of the first file found, or NULL if none is
-   found.
-
-   If PREFIX is non-NULL, then it is prefixed to each file name;
-   i.e., it looks like PREFIX/PATH_COMPONENT/NAME.  This is not
-   done with absolute directories in the path. */
+   found. */
 char *
-fn_search_path (const char *base_name, const char *path_, const char *prefix)
+fn_search_path (const char *base_name, const char *path_)
 {
   struct string path;
   struct substring dir_;
@@ -212,11 +208,6 @@
 
       /* Construct file name. */
       ds_clear (&file);
-      if (prefix != NULL && !fn_is_absolute (ds_cstr (&dir)))
-       {
-         ds_put_cstr (&file, prefix);
-         ds_put_char (&file, '/');
-       }
       ds_put_cstr (&file, ds_cstr (&dir));
       if (!ds_is_empty (&file) && ds_last (&file) != '/')
        ds_put_char (&file, '/');

Index: data/file-name.h
===================================================================
RCS file: /cvsroot/pspp/pspp/src/data/file-name.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- data/file-name.h    14 Oct 2006 00:25:20 -0000      1.5
+++ data/file-name.h    10 Dec 2006 04:08:47 -0000      1.6
@@ -34,8 +34,7 @@
                      const char *(*getenv) (const char *),
                      struct string *dst);
 char *fn_tilde_expand (const char *fn);
-char *fn_search_path (const char *base_name, const char *path,
-                     const char *prefix);
+char *fn_search_path (const char *base_name, const char *path);
 char *fn_normalize (const char *fn);
 char *fn_dir_name (const char *fn);
 char *fn_extension (const char *fn);

Index: language/utilities/include.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/utilities/include.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- language/utilities/include.c        5 Dec 2006 11:27:42 -0000       1.8
+++ language/utilities/include.c        10 Dec 2006 04:08:47 -0000      1.9
@@ -54,7 +54,7 @@
   target_fn = ds_cstr (lex_tokstr (lexer));
 
   ss = lex_get_source_stream (lexer);
-  found_fn = fn_search_path (target_fn, getl_include_path ( ss ), NULL);
+  found_fn = fn_search_path (target_fn, getl_include_path ( ss ));
 
   if (found_fn != NULL) 
     {

Index: output/output.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/output/output.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- output/output.c     22 Oct 2006 11:07:52 -0000      1.17
+++ output/output.c     10 Dec 2006 04:08:47 -0000      1.18
@@ -278,8 +278,7 @@
   init_fn = fn_search_path (fn_getenv_default ("STAT_OUTPUT_INIT_FILE",
                                               "devices"),
                            fn_getenv_default ("STAT_OUTPUT_INIT_PATH",
-                                              config_path),
-                           NULL);
+                                              config_path));
 
   ds_init_empty (&line);
 
@@ -1011,8 +1010,7 @@
   pprsz_fn = fn_search_path (fn_getenv_default ("STAT_OUTPUT_PAPERSIZE_FILE",
                                                "papersize"),
                             fn_getenv_default ("STAT_OUTPUT_INIT_PATH",
-                                               config_path),
-                            NULL);
+                                               config_path));
 
   ds_init_empty (&line);
 

Index: output/postscript.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/output/postscript.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- output/postscript.c 22 Oct 2006 11:07:52 -0000      1.21
+++ output/postscript.c 10 Dec 2006 04:08:47 -0000      1.22
@@ -434,7 +434,7 @@
   else
     {
       char *base_name = xasprintf ("psfonts/%s", name);
-      char *file_name = fn_search_path (base_name, config_path, NULL);
+      char *file_name = fn_search_path (base_name, config_path);
       free (base_name);
       return file_name;
     }

Index: ui/terminal/command-line.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/ui/terminal/command-line.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- ui/terminal/command-line.c  5 Dec 2006 11:27:42 -0000       1.9
+++ ui/terminal/command-line.c  10 Dec 2006 04:08:47 -0000      1.10
@@ -193,7 +193,7 @@
 
   if (process_statrc)
     {
-      char *pspprc_fn = fn_search_path ("rc", config_path, NULL);
+      char *pspprc_fn = fn_search_path ("rc", config_path);
       if (pspprc_fn != NULL) 
         {
          getl_append_source (ss, create_syntax_file_source (pspprc_fn));