yeti/p1load
yeti/p1load
1
0
Fork 0
Code Pull Requests Packages Projects Releases Activity

Simplify the error handling for missing actions.

Browse Source
This commit is contained in:
David Betz 2015-02-21 09:48:31 -05:00
parent dc830434bf
commit c5cc730fb8
1 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
p1load.c
View File

@ -168,27 +168,26 @@ int main(int argc, char *argv[])
} }
} }
if (file || terminalMode) { /* complain about nothing to do */
switch (InitPort(&state, PORT_PREFIX, port, baudRate, verbose, actualPort)) { if (!file && !terminalMode) {
case CHECK_PORT_OK: printf("error: must specify either a file to load or -t\n");
printf("Found propeller version %d on %s\n", state.version, actualPort); return 1;
break;
case CHECK_PORT_OPEN_FAILED:
printf("error: opening serial port '%s'\n", port);
perror("Error is ");
return 1;
case CHECK_PORT_NO_PROPELLER:
if (port)
printf("error: no propeller chip on port '%s'\n", port);
else
printf("error: can't find a port with a propeller chip\n");
return 1;
}
} }
/* complain about nothing to do */ /* open the serial port */
else { switch (InitPort(&state, PORT_PREFIX, port, baudRate, verbose, actualPort)) {
printf("error: must specify either a file to load or -t\n"); case CHECK_PORT_OK:
printf("Found propeller version %d on %s\n", state.version, actualPort);
break;
case CHECK_PORT_OPEN_FAILED:
printf("error: opening serial port '%s'\n", port);
perror("Error is ");
return 1;
case CHECK_PORT_NO_PROPELLER:
if (port)
printf("error: no propeller chip on port '%s'\n", port);
else
printf("error: can't find a port with a propeller chip\n");
return 1; return 1;
} }