From 372e6ac1d632f64131738c5d5cf0f1cda11c02ca Mon Sep 17 00:00:00 2001 From: Greg King Date: Tue, 7 May 2013 00:54:44 -0400 Subject: [PATCH] Removed useless command-line option. --- src/ca65/incpath.c | 9 --------- src/ca65/incpath.h | 3 --- src/ca65/main.c | 11 ----------- src/cc65/incpath.c | 9 --------- src/cc65/incpath.h | 3 --- src/cc65/main.c | 11 ----------- src/cl65/main.c | 13 +------------ src/common/searchpath.c | 14 +------------- src/common/searchpath.h | 5 +---- 9 files changed, 3 insertions(+), 75 deletions(-) diff --git a/src/ca65/incpath.c b/src/ca65/incpath.c index 88323dc53..2a8bb9c73 100644 --- 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 96992a697..5ad6369cb 100644 --- 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 6e9e1e494..50844be69 100644 --- 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 5f26eec57..2a9058ad0 100644 --- 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 99096b8ae..dc109674d 100644 --- 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 d2996e1b5..02f378766 100644 --- 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 59c35d80a..4c3c40b1f 100644 --- 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 484d4a061..bd3a1f603 100644 --- 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 8b7f23e3b..fb5aa092f 100644 --- 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. -- 2.39.5