Index: trunk/src/misc.c =================================================================== --- trunk/src/misc.c (revision 4604) +++ trunk/src/misc.c (revision 4605) @@ -37,23 +37,6 @@ #include #include -#include "board.h" -#include "box.h" -#include "crosshair.h" -#include "data.h" -#include "plug_io.h" -#include "error.h" -#include "misc.h" -#include "move.h" -#include "polygon.h" -#include "rtree.h" -#include "rotate.h" -#include "rubberband.h" -#include "set.h" -#include "undo.h" -#include "compat_misc.h" -#include "obj_all.h" - /* --------------------------------------------------------------------------- * creates a filename from a template * %f is replaced by the filename @@ -60,7 +43,7 @@ * %p by the searchpath */ #warning TODO: kill this in favor of pcb_strdup_subst -char *EvaluateFilename(const char *Template, const char *Path, const char *Filename, const char *Parameter) +char *EvaluateFilename(const char *Template, const char *Path, const char *Filename) { gds_t command; const char *p; @@ -70,7 +53,6 @@ printf("\tTemplate: \033[33m%s\033[0m\n", Template); printf("\tPath: \033[33m%s\033[0m\n", Path); printf("\tFilename: \033[33m%s\033[0m\n", Filename); - printf("\tParameter: \033[33m%s\033[0m\n", Parameter); } gds_init(&command); @@ -79,9 +61,6 @@ /* copy character or add string to command */ if (*p == '%' && (*(p + 1) == 'f' || *(p + 1) == 'p' || *(p + 1) == 'a')) switch (*(++p)) { - case 'a': - gds_append_str(&command, Parameter); - break; case 'f': gds_append_str(&command, Filename); break; Index: trunk/src/misc.h =================================================================== --- trunk/src/misc.h (revision 4604) +++ trunk/src/misc.h (revision 4605) @@ -32,6 +32,6 @@ #include #include "config.h" -char *EvaluateFilename(const char *, const char *, const char *, const char *); +char *EvaluateFilename(const char *, const char *, const char *); #endif /* PCB_MISC_H */ Index: trunk/src_plugins/import_netlist/import_netlist.c =================================================================== --- trunk/src_plugins/import_netlist/import_netlist.c (revision 4604) +++ trunk/src_plugins/import_netlist/import_netlist.c (revision 4605) @@ -73,7 +73,7 @@ } else { used_popen = 1; - command = EvaluateFilename(conf_core.rc.rat_command, conf_core.rc.rat_path, filename, NULL); + command = EvaluateFilename(conf_core.rc.rat_command, conf_core.rc.rat_path, filename); /* open pipe to stdout of command */ if (*command == '\0' || (fp = popen(command, "r")) == NULL) { Index: trunk/src_plugins/io_pcb/parse_l.c =================================================================== --- trunk/src_plugins/io_pcb/parse_l.c (revision 4604) +++ trunk/src_plugins/io_pcb/parse_l.c (revision 4605) @@ -2394,7 +2394,7 @@ { used_popen = 1; - command = EvaluateFilename(Executable, Path, Filename, NULL); + command = EvaluateFilename(Executable, Path, Filename); /* open pipe to stdout of command */ if (*command == '\0' || (pcb_in = popen(command, "r")) == NULL) Index: trunk/src_plugins/io_pcb/parse_l.l =================================================================== --- trunk/src_plugins/io_pcb/parse_l.l (revision 4604) +++ trunk/src_plugins/io_pcb/parse_l.l (revision 4605) @@ -253,7 +253,7 @@ { used_popen = 1; - command = EvaluateFilename(Executable, Path, Filename, NULL); + command = EvaluateFilename(Executable, Path, Filename); /* open pipe to stdout of command */ if (*command == '\0' || (yyin = popen(command, "r")) == NULL)