Index: trunk/doc-rnd/hacking/renames =================================================================== --- trunk/doc-rnd/hacking/renames (revision 4863) +++ trunk/doc-rnd/hacking/renames (revision 4864) @@ -257,3 +257,7 @@ EraseObject -> pcb_erase_obj LightenColor -> pcb_lighten_color Message -> pcb_message +OpenErrorpcb_messag -> pcb_open_error_message +PopenErrorpcb_message -> pcb_popen_error_message +OpendirErrorpcb_message -> pcb_opendir_error_message +ChdirErrorpcb_message -> ocb_chdir_error_message Index: trunk/src/error.c =================================================================== --- trunk/src/error.c (revision 4863) +++ trunk/src/error.c (revision 4864) @@ -99,7 +99,7 @@ /* --------------------------------------------------------------------------- * print standard 'popen error' */ -void PopenErrorpcb_message(const char *Filename) +void pcb_popen_error_message(const char *Filename) { char *utf8 = NULL; @@ -111,7 +111,7 @@ /* --------------------------------------------------------------------------- * print standard 'opendir' */ -void OpendirErrorpcb_message(const char *DirName) +void pcb_opendir_error_message(const char *DirName) { char *utf8 = NULL; @@ -123,7 +123,7 @@ /* --------------------------------------------------------------------------- * print standard 'chdir error' */ -void ChdirErrorpcb_message(const char *DirName) +void pcb_chdir_error_message(const char *DirName) { char *utf8 = NULL; Index: trunk/src/error.h =================================================================== --- trunk/src/error.h (revision 4863) +++ trunk/src/error.h (revision 4864) @@ -49,9 +49,9 @@ void pcb_message(enum pcb_message_level level, const char *Format, ...); void OpenErrorpcb_message(const char *); -void PopenErrorpcb_message(const char *); -void OpendirErrorpcb_message(const char *); -void ChdirErrorpcb_message(const char *); +void pcb_popen_error_message(const char *); +void pcb_opendir_error_message(const char *); +void pcb_chdir_error_message(const char *); void CatchSignal(int); void pcb_trace(const char *Format, ...); Index: trunk/src/plug_io.c =================================================================== --- trunk/src/plug_io.c (revision 4863) +++ trunk/src/plug_io.c (revision 4864) @@ -827,7 +827,7 @@ } printf("write to pipe \"%s\"\n", command.array); if ((fp = popen(command.array, "w")) == NULL) { - PopenErrorpcb_message(command.array); + pcb_popen_error_message(command.array); return (STATUS_ERROR); } Index: trunk/src_plugins/fp_fs/fp_fs.c =================================================================== --- trunk/src_plugins/fp_fs/fp_fs.c (revision 4863) +++ trunk/src_plugins/fp_fs/fp_fs.c (revision 4864) @@ -133,7 +133,7 @@ if (chdir(subdir)) { if (!subdir_may_not_exist) - ChdirErrorpcb_message(subdir); + pcb_chdir_error_message(subdir); return 0; } @@ -142,7 +142,7 @@ if (pcb_get_wd(new_subdir) == NULL) { pcb_message(PCB_MSG_DEFAULT, _("fp_fs_list(): Could not determine new working directory\n")); if (chdir(olddir)) - ChdirErrorpcb_message(olddir); + pcb_chdir_error_message(olddir); return 0; } @@ -153,9 +153,9 @@ /* First try opening the directory specified by path */ if ((subdirobj = opendir(new_subdir)) == NULL) { - OpendirErrorpcb_message(new_subdir); + pcb_opendir_error_message(new_subdir); if (chdir(olddir)) - ChdirErrorpcb_message(olddir); + pcb_chdir_error_message(olddir); return 0; } @@ -214,7 +214,7 @@ /* Done. Clean up, cd back into old dir, and return */ closedir(subdirobj); if (chdir(olddir)) - ChdirErrorpcb_message(olddir); + pcb_chdir_error_message(olddir); return n_footprints; } Index: trunk/src_plugins/import_netlist/import_netlist.c =================================================================== --- trunk/src_plugins/import_netlist/import_netlist.c (revision 4863) +++ trunk/src_plugins/import_netlist/import_netlist.c (revision 4864) @@ -81,7 +81,7 @@ /* open pipe to stdout of command */ if (*command == '\0' || (fp = popen(command, "r")) == NULL) { - PopenErrorpcb_message(command); + pcb_popen_error_message(command); free(command); return (1); } Index: trunk/src_plugins/io_pcb/parse_l.c =================================================================== --- trunk/src_plugins/io_pcb/parse_l.c (revision 4863) +++ trunk/src_plugins/io_pcb/parse_l.c (revision 4864) @@ -2401,7 +2401,7 @@ /* open pipe to stdout of command */ if (*command == '\0' || (pcb_in = popen(command, "r")) == NULL) { - PopenErrorpcb_message(command); + pcb_popen_error_message(command); free(command); return(1); } Index: trunk/src_plugins/io_pcb/parse_l.l =================================================================== --- trunk/src_plugins/io_pcb/parse_l.l (revision 4863) +++ trunk/src_plugins/io_pcb/parse_l.l (revision 4864) @@ -260,7 +260,7 @@ /* open pipe to stdout of command */ if (*command == '\0' || (yyin = popen(command, "r")) == NULL) { - PopenErrorpcb_message(command); + pcb_popen_error_message(command); free(command); return(1); } Index: trunk/src_plugins/lib_legacy_func/lib_legacy_func.c =================================================================== --- trunk/src_plugins/lib_legacy_func/lib_legacy_func.c (revision 4863) +++ trunk/src_plugins/lib_legacy_func/lib_legacy_func.c (revision 4864) @@ -77,7 +77,7 @@ } /* couldn't be expanded by the shell */ - PopenErrorpcb_message(command); + pcb_popen_error_message(command); free(command); gds_uninit(&answer); return NULL; Index: trunk/util/gsch2pcb-rnd/gsch2pcb.c =================================================================== --- trunk/util/gsch2pcb-rnd/gsch2pcb.c (revision 4863) +++ trunk/util/gsch2pcb-rnd/gsch2pcb.c (revision 4864) @@ -138,17 +138,17 @@ return 1; } -void ChdirErrorpcb_message(const char *DirName) +void pcb_chdir_error_message(const char *DirName) { fprintf(stderr, "gsch2pcb-rnd: warning: can't cd to %s\n", DirName); } -void OpendirErrorpcb_message(const char *DirName) +void pcb_opendir_error_message(const char *DirName) { fprintf(stderr, "gsch2pcb-rnd: warning: can't opendir %s\n", DirName); } -void PopenErrorpcb_message(const char *cmd) +void pcb_popen_error_message(const char *cmd) { fprintf(stderr, "gsch2pcb-rnd: warning: can't popen %s\n", cmd); }