6502/cc65
1
0
Fork 0
mirror of https://github.com/cc65/cc65.git synced 2025-01-27 09:33:42 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6 from greg-king5/forget-path

Browse Source 
Removed useless command-line option.
This commit is contained in:
Oliver Schmidt 2013-05-07 08:11:39 -07:00
commit 6bd6663121
9 changed files with 3 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/ca65/incpath.c
View File

@ -55,15 +55,6 @@ SearchPath* BinSearchPath; /* Binary include path */
void ForgetAllIncludePaths (void)
/* Remove all include search paths. */
{
ForgetSearchPath (IncSearchPath);
ForgetSearchPath (BinSearchPath);
}
void InitIncludePaths (void) void InitIncludePaths (void)
/* Initialize the include path search list */ /* Initialize the include path search list */
{ {

3
src/ca65/incpath.h
View File

@ -60,9 +60,6 @@ extern SearchPath* BinSearchPath; /* Binary include path */
void ForgetAllIncludePaths (void);
/* Remove all include search paths. */
void InitIncludePaths (void); void InitIncludePaths (void);
/* Initialize the include path search list */ /* Initialize the include path search list */

11
src/ca65/main.c
View File

@ -116,7 +116,6 @@ static void Usage (void)
" --debug\t\t\tDebug mode\n" " --debug\t\t\tDebug mode\n"
" --debug-info\t\t\tAdd debug info to object file\n" " --debug-info\t\t\tAdd debug info to object file\n"
" --feature name\t\tSet an emulation feature\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" " --help\t\t\tHelp (this text)\n"
" --ignore-case\t\t\tIgnore case of symbols\n" " --ignore-case\t\t\tIgnore case of symbols\n"
" --include-dir dir\t\tSet an include directory search path\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)), static void OptHelp (const char* Opt attribute ((unused)),
const char* Arg attribute ((unused))) const char* Arg attribute ((unused)))
/* Print usage information and exit */ /* Print usage information and exit */
@ -868,7 +858,6 @@ int main (int argc, char* argv [])
{ "--debug", 0, OptDebug }, { "--debug", 0, OptDebug },
{ "--debug-info", 0, OptDebugInfo }, { "--debug-info", 0, OptDebugInfo },
{ "--feature", 1, OptFeature }, { "--feature", 1, OptFeature },
{ "--forget-inc-paths", 0, OptForgetIncPaths },
{ "--help", 0, OptHelp }, { "--help", 0, OptHelp },
{ "--ignore-case", 0, OptIgnoreCase }, { "--ignore-case", 0, OptIgnoreCase },
{ "--include-dir", 1, OptIncludeDir }, { "--include-dir", 1, OptIncludeDir },

9
src/cc65/incpath.c
View File

@ -55,15 +55,6 @@ SearchPath* UsrIncSearchPath; /* User include path */
void ForgetAllIncludePaths (void)
/* Remove all include search paths. */
{
ForgetSearchPath (SysIncSearchPath);
ForgetSearchPath (UsrIncSearchPath);
}
void InitIncludePaths (void) void InitIncludePaths (void)
/* Initialize the include path search list */ /* Initialize the include path search list */
{ {

3
src/cc65/incpath.h
View File

@ -60,9 +60,6 @@ extern SearchPath* UsrIncSearchPath; /* User include path */
void ForgetAllIncludePaths (void);
/* Remove all include search paths. */
void InitIncludePaths (void); void InitIncludePaths (void);
/* Initialize the include path search list */ /* Initialize the include path search list */

11
src/cc65/main.c
View File

@ -118,7 +118,6 @@ static void Usage (void)
" --dep-target target\t\tUse this dependency target\n" " --dep-target target\t\tUse this dependency target\n"
" --disable-opt name\t\tDisable an optimization step\n" " --disable-opt name\t\tDisable an optimization step\n"
" --enable-opt name\t\tEnable 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" " --help\t\t\tHelp (this text)\n"
" --include-dir dir\t\tSet an include directory search path\n" " --include-dir dir\t\tSet an include directory search path\n"
" --list-opt-steps\t\tList all optimizer steps and exit\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)), static void OptHelp (const char* Opt attribute ((unused)),
const char* Arg attribute ((unused))) const char* Arg attribute ((unused)))
/* Print usage information and exit */ /* Print usage information and exit */
@ -792,7 +782,6 @@ int main (int argc, char* argv[])
{ "--dep-target", 1, OptDepTarget }, { "--dep-target", 1, OptDepTarget },
{ "--disable-opt", 1, OptDisableOpt }, { "--disable-opt", 1, OptDisableOpt },
{ "--enable-opt", 1, OptEnableOpt }, { "--enable-opt", 1, OptEnableOpt },
{ "--forget-inc-paths", 0, OptForgetIncPaths },
{ "--help", 0, OptHelp }, { "--help", 0, OptHelp },
{ "--include-dir", 1, OptIncludeDir }, { "--include-dir", 1, OptIncludeDir },
{ "--list-opt-steps", 0, OptListOptSteps }, { "--list-opt-steps", 0, OptListOptSteps },

13
src/cl65/main.c
View File

@ -6,7 +6,7 @@
/* */ /* */
/* */ /* */
/* */ /* */
/* (C) 1999-2012, Ullrich von Bassewitz */ /* (C) 1999-2013, Ullrich von Bassewitz */
/* Roemerstrasse 52 */ /* Roemerstrasse 52 */
/* D-70794 Filderstadt */ /* D-70794 Filderstadt */
/* EMail: uz@cc65.org */ /* EMail: uz@cc65.org */
@ -732,7 +732,6 @@ static void Usage (void)
" --debug-info\t\t\tAdd debug info\n" " --debug-info\t\t\tAdd debug info\n"
" --feature name\t\tSet an emulation feature\n" " --feature name\t\tSet an emulation feature\n"
" --force-import sym\t\tForce an import of symbol `sym'\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" " --help\t\t\tHelp (this text)\n"
" --include-dir dir\t\tSet a compiler include directory path\n" " --include-dir dir\t\tSet a compiler include directory path\n"
" --ld-args options\t\tPass options to the linker\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)), static void OptHelp (const char* Opt attribute ((unused)),
const char* Arg attribute ((unused))) const char* Arg attribute ((unused)))
/* Print help - cl65 */ /* Print help - cl65 */
@ -1261,7 +1251,6 @@ int main (int argc, char* argv [])
{ "--debug-info", 0, OptDebugInfo }, { "--debug-info", 0, OptDebugInfo },
{ "--feature", 1, OptFeature }, { "--feature", 1, OptFeature },
{ "--force-import", 1, OptForceImport }, { "--force-import", 1, OptForceImport },
{ "--forget-inc-paths", 0, OptForgetIncPaths },
{ "--help", 0, OptHelp }, { "--help", 0, OptHelp },
{ "--include-dir", 1, OptIncludeDir }, { "--include-dir", 1, OptIncludeDir },
{ "--ld-args", 1, OptLdArgs }, { "--ld-args", 1, OptLdArgs },

14
src/common/searchpath.c
View File

@ -6,7 +6,7 @@
/* */ /* */
/* */ /* */
/* */ /* */
/* (C) 2000-2010, Ullrich von Bassewitz */ /* (C) 2000-2013, Ullrich von Bassewitz */
/* Roemerstrasse 52 */ /* Roemerstrasse 52 */
/* D-70794 Filderstadt */ /* D-70794 Filderstadt */
/* EMail: uz@cc65.org */ /* 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) char* SearchFile (const SearchPath* P, const char* File)
/* Search for a file in a list of directories. Return a pointer to a malloced /* 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. * area that contains the complete path, if found, return 0 otherwise.

5
src/common/searchpath.h
View File

@ -6,7 +6,7 @@
/* */ /* */
/* */ /* */
/* */ /* */
/* (C) 2000-2010, Ullrich von Bassewitz */ /* (C) 2000-2013, Ullrich von Bassewitz */
/* Roemerstrasse 52 */ /* Roemerstrasse 52 */
/* D-70794 Filderstadt */ /* D-70794 Filderstadt */
/* EMail: uz@cc65.org */ /* EMail: uz@cc65.org */
@ -94,9 +94,6 @@ int PushSearchPath (SearchPath* P, const char* NewPath);
void PopSearchPath (SearchPath* P); void PopSearchPath (SearchPath* P);
/* Remove a search path from the head of an existing search path list */ /* 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); char* SearchFile (const SearchPath* P, const char* File);
/* Search for a file in a list of directories. Return a pointer to a malloced /* 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. * area that contains the complete path, if found, return 0 otherwise.