Merge pull request #57 from ksherlock/option_return

remove warning about parse_cli_options not returning a value.
This commit is contained in:
Dagen Brock 2019-01-30 11:13:14 -06:00 committed by GitHub
commit 2cde38ba3c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 5 deletions

View File

@ -115,10 +115,9 @@ int parse_int(const char *str1, int min, int max)
tmp = strtol(str1, 0, 0);
if (tmp > max) { tmp = max; }
if (tmp < min) { tmp = min; }
printf ( "TMP %d\n", tmp);
return tmp;
}
int parse_cli_options(int argc, char **argv) {
void parse_cli_options(int argc, char **argv) {
int i;
int tmp1;
int skip_amt;

View File

@ -1,7 +1,7 @@
#ifdef __cplusplus
extern "C" {
#endif
int parse_cli_options(int argc, char **argv);
void parse_cli_options(int argc, char **argv);
#ifdef __cplusplus
}
#endif

View File

@ -885,7 +885,6 @@ void banner() {
int gsplusmain(int argc, char **argv) {
int diff;
int skip_amt;
int tmp1;
int i;
char *final_arg = 0;
@ -896,7 +895,7 @@ int gsplusmain(int argc, char **argv) {
// OG Restoring globals
sim65816_initglobals();
moremem_init();
tmp1 = parse_cli_options(argc, argv);
parse_cli_options(argc, argv);