all: Get rid of a little more getopt detritus.

This commit is contained in:
Solomon Peachy 2015-08-25 22:47:26 -04:00
parent 381e38365f
commit 5dda0018d2
13 changed files with 5 additions and 44 deletions

View File

@ -960,10 +960,7 @@ static int canonselphy_cmdline_arg(void *vctx, int argc, char **argv)
if (!ctx)
return -1;
/* Reset arg parsing */
optind = 1;
opterr = 0;
while ((i = getopt(argc, argv, GETOPT_LIST_GLOBAL)) >= 0) {
switch(i) {
GETOPT_PROCESS_GLOBAL

View File

@ -826,9 +826,6 @@ static int cw01_cmdline_arg(void *vctx, int argc, char **argv)
if (!ctx)
return -1;
/* Reset arg parsing */
optind = 1;
opterr = 0;
while ((i = getopt(argc, argv, GETOPT_LIST_GLOBAL "inN:s")) >= 0) {
switch(i) {
GETOPT_PROCESS_GLOBAL

View File

@ -1575,12 +1575,9 @@ static int dnpds40_cmdline_arg(void *vctx, int argc, char **argv)
if (!ctx)
return -1;
/* Reset arg parsing */
optind = 1;
opterr = 0;
while ((i = getopt(argc, argv, GETOPT_LIST_GLOBAL "iInN:p:sK:k:")) >= 0) {
switch(i) {
GETOPT_PROCESS_GLOBAL
GETOPT_PROCESS_GLOBAL
case 'i':
j = dnpds40_get_info(ctx);
break;

View File

@ -264,9 +264,6 @@ int kodak1400_cmdline_arg(void *vctx, int argc, char **argv)
if (!ctx)
return -1;
/* Reset arg parsing */
optind = 1;
opterr = 0;
while ((i = getopt(argc, argv, GETOPT_LIST_GLOBAL "C:")) >= 0) {
switch(i) {
GETOPT_PROCESS_GLOBAL

View File

@ -567,9 +567,6 @@ static int kodak605_cmdline_arg(void *vctx, int argc, char **argv)
if (!ctx)
return -1;
/* Reset arg parsing */
optind = 1;
opterr = 0;
while ((i = getopt(argc, argv, GETOPT_LIST_GLOBAL "C:ms")) >= 0) {
switch(i) {
GETOPT_PROCESS_GLOBAL

View File

@ -896,12 +896,9 @@ static int kodak6800_cmdline_arg(void *vctx, int argc, char **argv)
if (!ctx)
return -1;
/* Reset arg parsing */
optind = 1;
opterr = 0;
while ((i = getopt(argc, argv, GETOPT_LIST_GLOBAL "C:c:msX:")) >= 0) {
switch(i) {
GETOPT_PROCESS_GLOBAL
GETOPT_PROCESS_GLOBAL
case 'c':
j = kodak6800_get_tonecurve(ctx, optarg);
break;

View File

@ -571,12 +571,9 @@ static int mitsu70x_cmdline_arg(void *vctx, int argc, char **argv)
if (!ctx)
return -1;
/* Reset arg parsing */
optind = 1;
opterr = 0;
while ((i = getopt(argc, argv, GETOPT_LIST_GLOBAL "s")) >= 0) {
switch(i) {
GETOPT_PROCESS_GLOBAL
GETOPT_PROCESS_GLOBAL
case 's':
j = mitsu70x_query_status(ctx);
break;

View File

@ -740,12 +740,9 @@ static int mitsu9550_cmdline_arg(void *vctx, int argc, char **argv)
if (!ctx)
return -1;
/* Reset arg parsing */
optind = 1;
opterr = 0;
while ((i = getopt(argc, argv, GETOPT_LIST_GLOBAL "ms")) >= 0) {
switch(i) {
GETOPT_PROCESS_GLOBAL
GETOPT_PROCESS_GLOBAL
case 'm':
j = mitsu9550_query_media(ctx);
break;

View File

@ -1168,9 +1168,6 @@ int shinkos1245_cmdline_arg(void *vctx, int argc, char **argv)
if (!ctx)
return -1;
/* Reset arg parsing */
optind = 1;
opterr = 0;
while ((i = getopt(argc, argv, GETOPT_LIST_GLOBAL "c:C:l:L:FmsuU:X:")) >= 0) {
switch(i) {
GETOPT_PROCESS_GLOBAL

View File

@ -1296,9 +1296,6 @@ int shinkos2145_cmdline_arg(void *vctx, int argc, char **argv)
if (!ctx)
return -1;
/* Reset arg parsing */
optind = 1;
opterr = 0;
while ((i = getopt(argc, argv, GETOPT_LIST_GLOBAL "b:c:C:eFil:L:mr:R:suU:X:")) >= 0) {
switch(i) {
GETOPT_PROCESS_GLOBAL

View File

@ -1460,9 +1460,6 @@ int shinkos6145_cmdline_arg(void *vctx, int argc, char **argv)
if (!ctx)
return -1;
/* Reset arg parsing */
optind = 1;
opterr = 0;
while ((i = getopt(argc, argv, GETOPT_LIST_GLOBAL "c:C:eFik:l:L:mr:R:sX:")) >= 0) {
switch(i) {
GETOPT_PROCESS_GLOBAL

View File

@ -1379,9 +1379,6 @@ int shinkos6245_cmdline_arg(void *vctx, int argc, char **argv)
if (!ctx)
return -1;
/* Reset arg parsing */
optind = 1;
opterr = 0;
while ((i = getopt(argc, argv, GETOPT_LIST_GLOBAL "c:C:eFik:l:L:mr:R:sX:")) >= 0) {
switch(i) {
GETOPT_PROCESS_GLOBAL

View File

@ -263,9 +263,6 @@ static int updr150_cmdline_arg(void *vctx, int argc, char **argv)
if (!ctx)
return -1;
/* Reset arg parsing */
optind = 1;
opterr = 0;
while ((i = getopt(argc, argv, GETOPT_LIST_GLOBAL)) >= 0) {
switch(i) {
GETOPT_PROCESS_GLOBAL