* file-name.c (fn_search_path): Remove prefix arg that was unused

	by any caller.  Updated all callers.

diff --git a/src/data/ChangeLog b/src/data/ChangeLog
index 4f72a217e864169d464c9129f3708e1f6957e135..5bb14cd1870bf1258e7159197ba7deb823ce66a8 100644 (file)
--- a/src/data/ChangeLog
+++ b/src/data/ChangeLog
@@ -1,3 +1,8 @@
+Sat Dec  9 20:08:25 2006  Ben Pfaff  <blp@gnu.org>
+
+       * 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  <blp@gnu.org>
 
        * format.c (fmt_dollar_template): Use user's decimal point

diff --git a/src/data/file-name.c b/src/data/file-name.c
index 97d75e48175b49a9d35d5f9195b8cc3e0743a8ca..d8ad1b8e402ac535432aa26f78d5f1e71466110e 100644 (file)
--- a/src/data/file-name.c
+++ b/src/data/file-name.c
@@ -175,13 +175,9 @@ fn_tilde_expand (const char *input)
    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 @@ fn_search_path (const char *base_name, const char *path_, const char *prefix)
 
       /* 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, '/');

diff --git a/src/data/file-name.h b/src/data/file-name.h
index 333aa5a7ebc5f7846bc37b01c62bb7650c006f31..51fca9ef4dc1f8ca95cea957402398f3d9311a56 100644 (file)
--- a/src/data/file-name.h
+++ b/src/data/file-name.h
@@ -34,8 +34,7 @@ void fn_interp_vars (struct substring src,
                      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);

diff --git a/src/language/utilities/include.c b/src/language/utilities/include.c
index 9f666747db6b99fe129ac24e7680beab3693eab1..7bb2e55733aad4f29fb21da08dcefdc3f510a82d 100644 (file)
--- a/src/language/utilities/include.c
+++ b/src/language/utilities/include.c
@@ -54,7 +54,7 @@ cmd_include (struct lexer *lexer, struct dataset *ds UNUSED)
   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) 
     {

diff --git a/src/output/output.c b/src/output/output.c
index 91df8f022eb84cef6033963079dcadad3d326d3f..2754ec73701e124088b97810cb6f2c723508ce52 100644 (file)
--- a/src/output/output.c
+++ b/src/output/output.c
@@ -278,9 +278,8 @@ outp_read_devices (void)
   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);
 
   if (init_fn == NULL)
@@ -1011,9 +1010,8 @@ outp_get_paper_size (char *size, int *h, int *v)
   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);
 
   if (pprsz_fn == NULL)

diff --git a/src/output/postscript.c b/src/output/postscript.c
index 614fb5055bc3104a70d9e289536bac1980be0197..68f4ddacbe8a9467c30088b8a736c7e724894db1 100644 (file)
--- a/src/output/postscript.c
+++ b/src/output/postscript.c
@@ -434,7 +434,7 @@ find_ps_file (const char *name)
   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;
     }

diff --git a/src/ui/terminal/command-line.c b/src/ui/terminal/command-line.c
index ec7a9b22509132b5373916fd9dc53f5ad9a88c40..3c427cf68fa4622351219a86733e003a76fdfe3d 100644 (file)
--- a/src/ui/terminal/command-line.c
+++ b/src/ui/terminal/command-line.c
@@ -193,7 +193,7 @@ parse_command_line (int argc, char **argv, struct source_stream *ss)
 
   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));