Removed useless command-line option.

diff --git a/src/ca65/incpath.c b/src/ca65/incpath.c
index 88323dc5358b1cb34121119bcfbeb4269797a13b..2a8bb9c73c8d3fa22c878001dbda2f138737f528 100644 (file)
--- a/src/ca65/incpath.c
+++ b/src/ca65/incpath.c
@@ -55,15 +55,6 @@ SearchPath*     BinSearchPath;          /* Binary include path */
 
 
 
-void ForgetAllIncludePaths (void)
-/* Remove all include search paths. */
-{
-    ForgetSearchPath (IncSearchPath);
-    ForgetSearchPath (BinSearchPath);
-}
-
-
-
 void InitIncludePaths (void)
 /* Initialize the include path search list */
 {

diff --git a/src/ca65/incpath.h b/src/ca65/incpath.h
index 96992a69727c0e27989a05140443680d11001b7d..5ad6369cbdab5cccf511542c2ddf48d6a1f73398 100644 (file)
--- a/src/ca65/incpath.h
+++ b/src/ca65/incpath.h
@@ -60,9 +60,6 @@ extern SearchPath*      BinSearchPath;          /* Binary include path */
 
 
 
-void ForgetAllIncludePaths (void);
-/* Remove all include search paths. */
-
 void InitIncludePaths (void);
 /* Initialize the include path search list */
 

diff --git a/src/ca65/main.c b/src/ca65/main.c
index 6e9e1e49402d2b77006ded86980cb24eed6a9723..50844be69aa1d7d15fcb6b3d49dc721d137640c8 100644 (file)
--- a/src/ca65/main.c
+++ b/src/ca65/main.c
@@ -116,7 +116,6 @@ static void Usage (void)
             "  --debug\t\t\tDebug mode\n"
             "  --debug-info\t\t\tAdd debug info to object file\n"
             "  --feature name\t\tSet an emulation feature\n"
-            "  --forget-inc-paths\t\tForget include search paths\n"
             "  --help\t\t\tHelp (this text)\n"
             "  --ignore-case\t\t\tIgnore case of symbols\n"
             "  --include-dir dir\t\tSet an include directory search path\n"
@@ -438,15 +437,6 @@ static void OptFeature (const char* Opt attribute ((unused)), const char* Arg)
 
 
 
-static void OptForgetIncPaths (const char* Opt attribute ((unused)),
-                               const char* Arg attribute ((unused)))
-/* Forget all currently defined include paths */
-{
-    ForgetAllIncludePaths ();
-}
-
-
-
 static void OptHelp (const char* Opt attribute ((unused)),
                     const char* Arg attribute ((unused)))
 /* Print usage information and exit */
@@ -868,7 +858,6 @@ int main (int argc, char* argv [])
                { "--debug",            0,      OptDebug                },
        { "--debug-info",       0,      OptDebugInfo            },
        { "--feature",          1,      OptFeature              },
-               { "--forget-inc-paths", 0,      OptForgetIncPaths       },
        { "--help",             0,      OptHelp                 },
        { "--ignore-case",      0,      OptIgnoreCase           },
        { "--include-dir",      1,      OptIncludeDir           },

diff --git a/src/cc65/incpath.c b/src/cc65/incpath.c
index 5f26eec575e611e158ae46151775d9a1eb44b83d..2a9058ad06f2ce42468a06c262f47b9af8211fe5 100644 (file)
--- a/src/cc65/incpath.c
+++ b/src/cc65/incpath.c
@@ -55,15 +55,6 @@ SearchPath*     UsrIncSearchPath;       /* User include path */
 
 
 
-void ForgetAllIncludePaths (void)
-/* Remove all include search paths. */
-{
-    ForgetSearchPath (SysIncSearchPath);
-    ForgetSearchPath (UsrIncSearchPath);
-}
-
-
-
 void InitIncludePaths (void)
 /* Initialize the include path search list */
 {

diff --git a/src/cc65/incpath.h b/src/cc65/incpath.h
index 99096b8ae5c22b3fed85ebca8cb1cc3738ed5531..dc109674dc0c577fc54d34afe160b01ad5458677 100644 (file)
--- a/src/cc65/incpath.h
+++ b/src/cc65/incpath.h
@@ -60,9 +60,6 @@ extern SearchPath*      UsrIncSearchPath;       /* User include path */
 
 
 
-void ForgetAllIncludePaths (void);
-/* Remove all include search paths. */
-
 void InitIncludePaths (void);
 /* Initialize the include path search list */
 

diff --git a/src/cc65/main.c b/src/cc65/main.c
index d2996e1b5f9ffee25e991761b9dab90744add1a4..02f3787660bc5742aa43335f358ac3ca3a500f6d 100644 (file)
--- a/src/cc65/main.c
+++ b/src/cc65/main.c
@@ -118,7 +118,6 @@ static void Usage (void)
             "  --dep-target target\t\tUse this dependency target\n"
             "  --disable-opt name\t\tDisable an optimization step\n"
             "  --enable-opt name\t\tEnable an optimization step\n"
-            "  --forget-inc-paths\t\tForget include search paths\n"
             "  --help\t\t\tHelp (this text)\n"
             "  --include-dir dir\t\tSet an include directory search path\n"
             "  --list-opt-steps\t\tList all optimizer steps and exit\n"
@@ -537,15 +536,6 @@ static void OptEnableOpt (const char* Opt attribute ((unused)), const char* Arg)
 
 
 
-static void OptForgetIncPaths (const char* Opt attribute ((unused)),
-                               const char* Arg attribute ((unused)))
-/* Forget all currently defined include paths */
-{
-    ForgetAllIncludePaths ();
-}
-
-
-
 static void OptHelp (const char* Opt attribute ((unused)),
                     const char* Arg attribute ((unused)))
 /* Print usage information and exit */
@@ -792,7 +782,6 @@ int main (int argc, char* argv[])
         { "--dep-target",       1,      OptDepTarget            },
        { "--disable-opt",      1,      OptDisableOpt           },
        { "--enable-opt",       1,      OptEnableOpt            },
-               { "--forget-inc-paths", 0,      OptForgetIncPaths       },
        { "--help",             0,      OptHelp                 },
        { "--include-dir",      1,      OptIncludeDir           },
        { "--list-opt-steps",   0,      OptListOptSteps         },

diff --git a/src/cl65/main.c b/src/cl65/main.c
index 59c35d80af30cc4f8d47d6dda4b9d5fdd3159be9..4c3c40b1fec90e8e439066ada8a63601820017b3 100644 (file)
--- a/src/cl65/main.c
+++ b/src/cl65/main.c
@@ -6,7 +6,7 @@
 /*                                                                          */
 /*                                                                          */
 /*                                                                          */
-/* (C) 1999-2012, Ullrich von Bassewitz                                      */
+/* (C) 1999-2013, Ullrich von Bassewitz                                      */
 /*                Roemerstrasse 52                                           */
 /*                D-70794 Filderstadt                                        */
 /* EMail:         uz@cc65.org                                                */
@@ -732,7 +732,6 @@ static void Usage (void)
             "  --debug-info\t\t\tAdd debug info\n"
             "  --feature name\t\tSet an emulation feature\n"
             "  --force-import sym\t\tForce an import of symbol `sym'\n"
-            "  --forget-inc-paths\t\tForget include search paths (compiler)\n"
             "  --help\t\t\tHelp (this text)\n"
             "  --include-dir dir\t\tSet a compiler include directory path\n"
             "  --ld-args options\t\tPass options to the linker\n"
@@ -973,15 +972,6 @@ static void OptForceImport (const char* Opt attribute ((unused)), const char* Ar
 
 
 
-static void OptForgetIncPaths (const char* Opt attribute ((unused)),
-                               const char* Arg attribute ((unused)))
-/* Forget all currently defined include paths */
-{
-    CmdAddArg (&CC65, "--forget-inc-paths");
-}
-
-
-
 static void OptHelp (const char* Opt attribute ((unused)),
                     const char* Arg attribute ((unused)))
 /* Print help - cl65 */
@@ -1261,7 +1251,6 @@ int main (int argc, char* argv [])
        { "--debug-info",       0,      OptDebugInfo            },
        { "--feature",          1,      OptFeature              },
         { "--force-import",     1,      OptForceImport          },
-               { "--forget-inc-paths", 0,      OptForgetIncPaths       },
        { "--help",             0,      OptHelp                 },
        { "--include-dir",      1,      OptIncludeDir           },
         { "--ld-args",          1,      OptLdArgs               },

diff --git a/src/common/searchpath.c b/src/common/searchpath.c
index 484d4a0612d7324b8d13c306f1f44f452bc4fa32..bd3a1f60363ef975ec8c7a4af90113eb8a61ddc5 100644 (file)
--- a/src/common/searchpath.c
+++ b/src/common/searchpath.c
@@ -6,7 +6,7 @@
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 2000-2010, Ullrich von Bassewitz                                      */
+/* (C) 2000-2013, Ullrich von Bassewitz                                      */
 /*                Roemerstrasse 52                                           */
 /*                D-70794 Filderstadt                                        */
 /* EMail:         uz@cc65.org                                                */
@@ -237,18 +237,6 @@ void PopSearchPath (SearchPath* P)
 
 
 
-void ForgetSearchPath (SearchPath* P)
-/* Forget all search paths in the given list */
-{
-    unsigned I;
-    for (I = 0; I < CollCount (P); ++I) {
-        xfree (CollAt (P, I));
-    }
-    CollDeleteAll (P);
-}
-
-
-
 char* SearchFile (const SearchPath* P, const char* File)
 /* Search for a file in a list of directories. Return a pointer to a malloced
  * area that contains the complete path, if found, return 0 otherwise.

diff --git a/src/common/searchpath.h b/src/common/searchpath.h
index 8b7f23e3bcef91cf3357288566c6ce1228ed0885..fb5aa092fe9d6d54a2d8e4dd5f01685bc0bca10b 100644 (file)
--- a/src/common/searchpath.h
+++ b/src/common/searchpath.h
@@ -6,7 +6,7 @@
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 2000-2010, Ullrich von Bassewitz                                      */
+/* (C) 2000-2013, Ullrich von Bassewitz                                      */
 /*                Roemerstrasse 52                                           */
 /*                D-70794 Filderstadt                                        */
 /* EMail:         uz@cc65.org                                                */
@@ -94,9 +94,6 @@ int PushSearchPath (SearchPath* P, const char* NewPath);
 void PopSearchPath (SearchPath* P);
 /* Remove a search path from the head of an existing search path list */
 
-void ForgetSearchPath (SearchPath* P);
-/* Forget all search paths in the given list */
-
 char* SearchFile (const SearchPath* P, const char* File);
 /* Search for a file in a list of directories. Return a pointer to a malloced
  * area that contains the complete path, if found, return 0 otherwise.