summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSolomon Peachy <pizza@shaftnet.org>2015-08-25 22:47:26 -0400
committerSolomon Peachy <pizza@shaftnet.org>2015-08-25 22:47:26 -0400
commit3f8beb62b81f5dd284b6a507a7d9e272b0dd9a51 (patch)
tree4aa9769631f2d286cd9c961fb8794b28dd9c3f9c
parent3d770a632a681f9afa42e2ff800adc63b0f58c32 (diff)
downloadselphy_print-3f8beb62b81f5dd284b6a507a7d9e272b0dd9a51.tar.gz
selphy_print-3f8beb62b81f5dd284b6a507a7d9e272b0dd9a51.tar.bz2
selphy_print-3f8beb62b81f5dd284b6a507a7d9e272b0dd9a51.zip
all: Get rid of a little more getopt detritus.
-rw-r--r--backend_canonselphy.c5
-rw-r--r--backend_citizencw01.c3
-rw-r--r--backend_dnpds40.c5
-rw-r--r--backend_kodak1400.c3
-rw-r--r--backend_kodak605.c3
-rw-r--r--backend_kodak6800.c5
-rw-r--r--backend_mitsu70x.c5
-rw-r--r--backend_mitsu9550.c5
-rw-r--r--backend_shinkos1245.c3
-rw-r--r--backend_shinkos2145.c3
-rw-r--r--backend_shinkos6145.c3
-rw-r--r--backend_shinkos6245.c3
-rw-r--r--backend_sonyupdr150.c3
13 files changed, 5 insertions, 44 deletions
diff --git a/backend_canonselphy.c b/backend_canonselphy.c
index 94aedc5..b8f9358 100644
--- a/backend_canonselphy.c
+++ b/backend_canonselphy.c
@@ -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
diff --git a/backend_citizencw01.c b/backend_citizencw01.c
index 89cca8f..737609e 100644
--- a/backend_citizencw01.c
+++ b/backend_citizencw01.c
@@ -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
diff --git a/backend_dnpds40.c b/backend_dnpds40.c
index 6b04daa..83f400a 100644
--- a/backend_dnpds40.c
+++ b/backend_dnpds40.c
@@ -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;
diff --git a/backend_kodak1400.c b/backend_kodak1400.c
index 6df75a1..8a88154 100644
--- a/backend_kodak1400.c
+++ b/backend_kodak1400.c
@@ -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
diff --git a/backend_kodak605.c b/backend_kodak605.c
index cf30f86..da3205a 100644
--- a/backend_kodak605.c
+++ b/backend_kodak605.c
@@ -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
diff --git a/backend_kodak6800.c b/backend_kodak6800.c
index edb69a2..68712aa 100644
--- a/backend_kodak6800.c
+++ b/backend_kodak6800.c
@@ -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;
diff --git a/backend_mitsu70x.c b/backend_mitsu70x.c
index b70b19b..a6bfa5d 100644
--- a/backend_mitsu70x.c
+++ b/backend_mitsu70x.c
@@ -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;
diff --git a/backend_mitsu9550.c b/backend_mitsu9550.c
index 135bb55..708eb57 100644
--- a/backend_mitsu9550.c
+++ b/backend_mitsu9550.c
@@ -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;
diff --git a/backend_shinkos1245.c b/backend_shinkos1245.c
index df9d108..2debdfd 100644
--- a/backend_shinkos1245.c
+++ b/backend_shinkos1245.c
@@ -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
diff --git a/backend_shinkos2145.c b/backend_shinkos2145.c
index ca2ca89..4be706b 100644
--- a/backend_shinkos2145.c
+++ b/backend_shinkos2145.c
@@ -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
diff --git a/backend_shinkos6145.c b/backend_shinkos6145.c
index 066c3ab..3453888 100644
--- a/backend_shinkos6145.c
+++ b/backend_shinkos6145.c
@@ -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
diff --git a/backend_shinkos6245.c b/backend_shinkos6245.c
index f3acb3d..14d3a9a 100644
--- a/backend_shinkos6245.c
+++ b/backend_shinkos6245.c
@@ -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
diff --git a/backend_sonyupdr150.c b/backend_sonyupdr150.c
index 8463fd8..be0befc 100644
--- a/backend_sonyupdr150.c
+++ b/backend_sonyupdr150.c
@@ -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