Commit c01284fb073d7f6113ec5ca70115fd410d153775
2012-08-20T11:58:05
Remove short options -r and -R to allow them to be reused and remove readme entries for deprecated options.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42
diff --git a/README b/README
index ad68c67..11caccc 100644
--- a/README
+++ b/README
@@ -160,8 +160,6 @@ Options for both config file and command line:
--quiet|-q Disable logging output, display status and errors
--real-quiet Disable all output
--remove-disabled Remove disabled devices entirely, as if they didn't exist
---retries|-r <arg> Number of times to retry before giving up, if JSON-RPC call fails (-1 means never) (default: -1)
---retry-pause|-R <arg> Number of seconds to pause, between retries (default: 5)
--rotate <arg> Change multipool strategy from failover to regularly rotate at N minutes (default: 0)
--round-robin Change multipool strategy from failover to round robin on failure
--scan-time|-s <arg> Upper bound on time spent scanning current work, in seconds (default: 60)
diff --git a/cgminer.c b/cgminer.c
index aa2fb42..9582dd9 100644
--- a/cgminer.c
+++ b/cgminer.c
@@ -956,10 +956,10 @@ static struct opt_table opt_config_table[] = {
OPT_WITHOUT_ARG("--remove-disabled",
opt_set_bool, &opt_removedisabled,
"Remove disabled devices entirely, as if they didn't exist"),
- OPT_WITH_ARG("--retries|-r",
+ OPT_WITH_ARG("--retries",
set_null, NULL, NULL,
opt_hidden),
- OPT_WITH_ARG("--retry-pause|-R",
+ OPT_WITH_ARG("--retry-pause",
set_null, NULL, NULL,
opt_hidden),
OPT_WITH_ARG("--rotate",
diff --git a/example.conf b/example.conf
index 05578e1..ae3366e 100644
--- a/example.conf
+++ b/example.conf
@@ -33,7 +33,6 @@
"gpu-threads" : "2",
"log" : "5",
"queue" : "1",
-"retry-pause" : "5",
"scan-time" : "60",
"temp-hysteresis" : "3",