avr/avrdude
2
0
Fork 0
mirror of https://github.com/mariusgreuel/avrdude.git synced 2025-12-16 18:44:17 +00:00
Code Issues Projects Releases Wiki Activity

Replace all occurences of exit() in potential library code

Browse Source 
by appropriate return values.


git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1301 81a1dc3b-b13d-400b-aceb-764788c761c2
This commit is contained in:
joerg_wunsch
2014-05-16 15:52:25 +00:00
parent a74dbff9a4
commit 8113ad8a87
26 changed files with 257 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
avr910.c
View File

@@ -89,7 +89,7 @@ static int avr910_recv(PROGRAMMER * pgm, char * buf, size_t len)
fprintf(stderr,
"%s: avr910_recv(): programmer is not responding\n",
progname);
exit(1);
return 1;
}
return 0;
}
@@ -101,7 +101,7 @@ static int avr910_drain(PROGRAMMER * pgm, int display)
}
static void avr910_vfy_cmd_sent(PROGRAMMER * pgm, char * errmsg)
static int avr910_vfy_cmd_sent(PROGRAMMER * pgm, char * errmsg)
{
char c;
@@ -109,8 +109,9 @@ static void avr910_vfy_cmd_sent(PROGRAMMER * pgm, char * errmsg)
if (c != '\r') {
fprintf(stderr, "%s: error: programmer did not respond to command: %s\n",
progname, errmsg);
exit(1);
return 1;
}
return 0;
}
@@ -120,7 +121,8 @@ static void avr910_vfy_cmd_sent(PROGRAMMER * pgm, char * errmsg)
static int avr910_chip_erase(PROGRAMMER * pgm, AVRPART * p)
{
avr910_send(pgm, "e", 1);
avr910_vfy_cmd_sent(pgm, "chip erase");
if (avr910_vfy_cmd_sent(pgm, "chip erase") < 0)
return -1;
/*
* avr910 firmware may not delay long enough
@@ -131,17 +133,17 @@ static int avr910_chip_erase(PROGRAMMER * pgm, AVRPART * p)
}
static void avr910_enter_prog_mode(PROGRAMMER * pgm)
static int avr910_enter_prog_mode(PROGRAMMER * pgm)
{
avr910_send(pgm, "P", 1);
avr910_vfy_cmd_sent(pgm, "enter prog mode");
return avr910_vfy_cmd_sent(pgm, "enter prog mode");
}
static void avr910_leave_prog_mode(PROGRAMMER * pgm)
static int avr910_leave_prog_mode(PROGRAMMER * pgm)
{
avr910_send(pgm, "L", 1);
avr910_vfy_cmd_sent(pgm, "leave prog mode");
return avr910_vfy_cmd_sent(pgm, "leave prog mode");
}
@@ -251,7 +253,7 @@ static int avr910_initialize(PROGRAMMER * pgm, AVRPART * p)
"%s: %s: selected device is not supported by programmer: %s\n",
progname, ovsigck? "warning": "error", p->id);
if (!ovsigck)
exit(1);
return -1;
}
/* If the user forced the selection, use the first device
type that is supported by the programmer. */