mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-03 10:21:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Kill off this 'val' variable, C89 hates it.

Browse Source
This commit is contained in:
Alcaro 2015-06-30 22:36:17 +02:00
parent 79ed8b2823
commit 3d85acdb85
1 changed files with 122 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
retroarch.c
View File

@ -499,26 +499,26 @@ enum rarch_content_type rarch_path_is_media_type(const char *path)
**/ **/
static void parse_input(int argc, char *argv[]) static void parse_input(int argc, char *argv[])
{ {
int val = 0;
const char *optstring = NULL; const char *optstring = NULL;
runloop_t *runloop = rarch_main_get_ptr(); runloop_t *runloop = rarch_main_get_ptr();
global_t *global = global_get_ptr(); global_t *global = global_get_ptr();
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
#define RA_LONG_OPT_ONLY 65536
const struct option opts[] = { const struct option opts[] = {
#ifdef HAVE_DYNAMIC #ifdef HAVE_DYNAMIC
{ "libretro", 1, NULL, 'L' }, { "libretro", 1, NULL, 'L' },
#endif #endif
{ "menu", 0, &val, RA_OPT_MENU }, { "menu", 0, NULL, RA_LONG_OPT_ONLY+RA_OPT_MENU },
{ "help", 0, NULL, 'h' }, { "help", 0, NULL, 'h' },
{ "save", 1, NULL, 's' }, { "save", 1, NULL, 's' },
{ "fullscreen", 0, NULL, 'f' }, { "fullscreen", 0, NULL, 'f' },
{ "record", 1, NULL, 'r' }, { "record", 1, NULL, 'r' },
{ "recordconfig", 1, &val, RA_OPT_RECORDCONFIG }, { "recordconfig", 1, NULL, RA_LONG_OPT_ONLY+RA_OPT_RECORDCONFIG },
{ "size", 1, &val, RA_OPT_SIZE }, { "size", 1, NULL, RA_LONG_OPT_ONLY+RA_OPT_SIZE },
{ "verbose", 0, NULL, 'v' }, { "verbose", 0, NULL, 'v' },
{ "config", 1, NULL, 'c' }, { "config", 1, NULL, 'c' },
{ "appendconfig", 1, &val, RA_OPT_APPENDCONFIG }, { "appendconfig", 1, NULL, RA_LONG_OPT_ONLY+RA_OPT_APPENDCONFIG },
{ "nodevice", 1, NULL, 'N' }, { "nodevice", 1, NULL, 'N' },
{ "dualanalog", 1, NULL, 'A' }, { "dualanalog", 1, NULL, 'A' },
{ "device", 1, NULL, 'd' }, { "device", 1, NULL, 'd' },
@ -530,25 +530,25 @@ static void parse_input(int argc, char *argv[])
{ "host", 0, NULL, 'H' }, { "host", 0, NULL, 'H' },
{ "connect", 1, NULL, 'C' }, { "connect", 1, NULL, 'C' },
{ "frames", 1, NULL, 'F' }, { "frames", 1, NULL, 'F' },
{ "port", 1, &val, RA_OPT_PORT }, { "port", 1, NULL, RA_LONG_OPT_ONLY+RA_OPT_PORT },
{ "spectate", 0, &val, RA_OPT_SPECTATE }, { "spectate", 0, NULL, RA_LONG_OPT_ONLY+RA_OPT_SPECTATE },
#endif #endif
{ "nick", 1, &val, RA_OPT_NICK }, { "nick", 1, NULL, RA_LONG_OPT_ONLY+RA_OPT_NICK },
#if defined(HAVE_NETWORK_CMD) && defined(HAVE_NETPLAY) #if defined(HAVE_NETWORK_CMD) && defined(HAVE_NETPLAY)
{ "command", 1, &val, RA_OPT_COMMAND }, { "command", 1, NULL, RA_LONG_OPT_ONLY+RA_OPT_COMMAND },
#endif #endif
{ "ups", 1, NULL, 'U' }, { "ups", 1, NULL, 'U' },
{ "bps", 1, &val, RA_OPT_BPS }, { "bps", 1, NULL, RA_LONG_OPT_ONLY+RA_OPT_BPS },
{ "ips", 1, &val, RA_OPT_IPS }, { "ips", 1, NULL, RA_LONG_OPT_ONLY+RA_OPT_IPS },
{ "no-patch", 0, &val, RA_OPT_NO_PATCH }, { "no-patch", 0, NULL, RA_LONG_OPT_ONLY+RA_OPT_NO_PATCH },
{ "detach", 0, NULL, 'D' }, { "detach", 0, NULL, 'D' },
{ "features", 0, &val, RA_OPT_FEATURES }, { "features", 0, NULL, RA_LONG_OPT_ONLY+RA_OPT_FEATURES },
{ "subsystem", 1, &val, RA_OPT_SUBSYSTEM }, { "subsystem", 1, NULL, RA_LONG_OPT_ONLY+RA_OPT_SUBSYSTEM },
{ "max-frames", 1, &val, RA_OPT_MAX_FRAMES }, { "max-frames", 1, NULL, RA_LONG_OPT_ONLY+RA_OPT_MAX_FRAMES },
{ "eof-exit", 0, &val, RA_OPT_EOF_EXIT }, { "eof-exit", 0, NULL, RA_LONG_OPT_ONLY+RA_OPT_EOF_EXIT },
{ "version", 0, &val, RA_OPT_VERSION }, { "version", 0, NULL, RA_LONG_OPT_ONLY+RA_OPT_VERSION },
#ifdef HAVE_FILE_LOGGER #ifdef HAVE_FILE_LOGGER
{ "log-file", 1, &val, RA_OPT_LOG_FILE }, { "log-file", 1, NULL, RA_LONG_OPT_ONLY+RA_OPT_LOG_FILE },
#endif #endif
{ NULL, 0, NULL, 0 } { NULL, 0, NULL, 0 }
}; };
@ -594,15 +594,12 @@ static void parse_input(int argc, char *argv[])
for (;;) for (;;)
{ {
int port; int port;
int c; int c = getopt_long(argc, argv, optstring, opts, NULL);
val = 0;
c = getopt_long(argc, argv, optstring, opts, NULL);
if (c == -1) if (c == -1)
break; break;
switch (c) if (c < RA_LONG_OPT_ONLY) switch (c)
{ {
case 'h': case 'h':
print_help(argv[0]); print_help(argv[0]);
@ -767,8 +764,15 @@ static void parse_input(int argc, char *argv[])
#endif #endif
break; break;
case 0: /* options without short variant */ case '?':
switch (val) print_help(argv[0]);
rarch_fail(1, "parse_input()");
default:
RARCH_ERR("Error parsing arguments.\n");
rarch_fail(1, "parse_input()");
}
else switch (c - RA_LONG_OPT_ONLY)
{ {
case RA_OPT_MENU: case RA_OPT_MENU:
global->core_type = CORE_TYPE_DUMMY; global->core_type = CORE_TYPE_DUMMY;
@ -866,15 +870,6 @@ static void parse_input(int argc, char *argv[])
global->log_file = fopen(optarg, "wb"); global->log_file = fopen(optarg, "wb");
break; break;
#endif #endif
default:
break;
}
break;
case '?':
print_help(argv[0]);
rarch_fail(1, "parse_input()");
default: default:
RARCH_ERR("Error parsing arguments.\n"); RARCH_ERR("Error parsing arguments.\n");
rarch_fail(1, "parse_input()"); rarch_fail(1, "parse_input()");