From: John Darrington <john@darrington.wattle.id.au>
Date: Tue, 27 Oct 2015 20:23:06 +0000 (+0100)
Subject: Remove unused functions fn_dir_name fn_getenv and fn_getenv_default
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=03e8924e2a6b5e6c9dc345ebacc0ea5a9abb4bef;p=pspp

Remove unused functions fn_dir_name fn_getenv and fn_getenv_default
---

diff --git a/src/data/file-name.c b/src/data/file-name.c
index ac3378e300..b5cc43deaa 100644
--- a/src/data/file-name.c
+++ b/src/data/file-name.c
@@ -82,14 +82,6 @@ fn_search_path (const char *base_name, char **path)
   return NULL;
 }
 
-/* Returns the directory part of FILE_NAME, as a malloc()'d
-   string. */
-char *
-fn_dir_name (const char *file_name)
-{
-  return dir_name (file_name);
-}
-
 /* Returns the extension part of FILE_NAME as a malloc()'d string.
    If FILE_NAME does not have an extension, returns an empty
    string. */
@@ -122,28 +114,7 @@ fn_exists (const char *name)
 
   return ! S_ISDIR (temp.st_mode);
 }
-
-/* Environment variables. */
-
-/* Simulates $VER and $ARCH environment variables. */
-const char *
-fn_getenv (const char *s)
-{
-  if (!strcmp (s, "VER"))
-    return fn_getenv_default ("STAT_VER", bare_version);
-  else if (!strcmp (s, "ARCH"))
-    return fn_getenv_default ("STAT_ARCH", host_system);
-  else
-    return getenv (s);
-}
 
-/* Returns getenv(KEY) if that's non-NULL; else returns DEF. */
-const char *
-fn_getenv_default (const char *key, const char *def)
-{
-  const char *value = getenv (key);
-  return value ? value : def;
-}
 
 /* Basic file handling. */
 
diff --git a/src/data/file-name.h b/src/data/file-name.h
index 4ce24e8f24..5f848174e3 100644
--- a/src/data/file-name.h
+++ b/src/data/file-name.h
@@ -21,18 +21,12 @@
 #include <stdbool.h>
 #include <sys/types.h>
 
-struct string_set;
-
 char *fn_search_path (const char *base_name, char **path);
-char *fn_dir_name (const char *fn);
 char *fn_extension (const char *fn);
 
 bool fn_is_absolute (const char *fn);
 bool fn_exists (const char *fn);
 
-const char *fn_getenv (const char *variable);
-const char *fn_getenv_default (const char *variable, const char *def);
-
 FILE *fn_open (const char *fn, const char *mode);
 int fn_close (const char *fn, FILE *file);