* fileio.c (fileio): Don't exit(1) if something goes wrong; return

-1 instead.  Don't refer to obsolete option -f to specify the file
format.



git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1216 81a1dc3b-b13d-400b-aceb-764788c761c2
This commit is contained in:
joerg_wunsch 2013-09-11 09:21:37 +00:00
parent 97a55c36e2
commit f3e332ceba
2 changed files with 9 additions and 3 deletions

View File

@ -1,3 +1,9 @@
2013-09-11 Joerg Wunsch <j.gnu@uriah.heep.sax.de>
* fileio.c (fileio): Don't exit(1) if something goes wrong; return
-1 instead. Don't refer to obsolete option -f to specify the file
format.
2013-09-10 Joerg Wunsch <j.gnu@uriah.heep.sax.de> 2013-09-10 Joerg Wunsch <j.gnu@uriah.heep.sax.de>
Submitted by Matthias Trute: Submitted by Matthias Trute:

View File

@ -1542,9 +1542,9 @@ int fileio(int op, char * filename, FILEFMT format,
if (using_stdio) { if (using_stdio) {
fprintf(stderr, fprintf(stderr,
"%s: can't auto detect file format when using stdin/out.\n" "%s: can't auto detect file format when using stdin/out.\n"
" Please specify a file format using the -f option and try again.\n", "%s Please specify a file format and try again.\n",
progname); progname, progbuf);
exit(1); return -1;
} }
format = fmt_autodetect(fname); format = fmt_autodetect(fname);