[lmi-commits] [lmi] master ab481ed 4/7: Consolidate and renumber octal options

[Greg Chicares]

branch: master
commit ab481edbe98eb987b584e0a9dfa88030441fb4c1
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Consolidate and renumber octal options
    
    Use 077 for the "fraudulent" pseudo-option that forbids abbreviation of
    hidden long options, as it is unique.
---
 main_cli.cpp |  8 ++++----
 skeleton.cpp | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/main_cli.cpp b/main_cli.cpp
index c9feadf..3d8aff3 100644
--- a/main_cli.cpp
+++ b/main_cli.cpp
@@ -162,9 +162,10 @@ void process_command_line(int argc, char* argv[])
     static Option long_options[] =
       {
         {"ash_nazg"     ,NO_ARG   ,0 ,001 ,0 ,"ash nazg durbatulûk"},
-        {"ash_naz"      ,NO_ARG   ,0 ,003 ,0 ,"fraud"},
+        {"ash_naz"      ,NO_ARG   ,0 ,077 ,0 ,"fraud"},
         {"mellon"       ,NO_ARG   ,0 ,002 ,0 ,"pedo mellon a minno"},
-        {"mello"        ,NO_ARG   ,0 ,003 ,0 ,"fraud"},
+        {"mello"        ,NO_ARG   ,0 ,077 ,0 ,"fraud"},
+        {"prospicience" ,REQD_ARG ,0 ,003 ,0 ,"validation date"},
         {"pyx"          ,REQD_ARG ,0 ,'x' ,0 ,"for docimasy"},
         {"help"         ,NO_ARG   ,0 ,'h' ,0 ,"display this help and exit"},
         {"license"      ,NO_ARG   ,0 ,'l' ,0 ,"display license and exit"},
@@ -175,7 +176,6 @@ void process_command_line(int argc, char* argv[])
         {"file"         ,REQD_ARG ,0 ,'f' ,0 ,"input file to run"},
         {"data_path"    ,REQD_ARG ,0 ,'d' ,0 ,"path to data files"},
         {"print_db"     ,NO_ARG   ,0 ,'p' ,0 ,"print product databases and 
exit"},
-        {"prospicience" ,REQD_ARG ,0 ,004 ,0 ,"validation date"},
         {0              ,NO_ARG   ,0 ,0   ,0 ,""}
       };
 
@@ -233,7 +233,7 @@ void process_command_line(int argc, char* argv[])
                 }
                 break;
 
-            case 004:
+            case 003:
                 {
                 std::istringstream iss(getopt_long.optarg);
                 int ymd_as_int;
diff --git a/skeleton.cpp b/skeleton.cpp
index 4483c4d..f6b760d 100644
--- a/skeleton.cpp
+++ b/skeleton.cpp
@@ -1194,19 +1194,19 @@ bool Skeleton::ProcessCommandLine()
     static Option long_options[] =
       {
         {"ash_nazg"     ,NO_ARG   ,0 ,001 ,0 ,"ash nazg durbatulûk"},
-        {"ash_naz"      ,NO_ARG   ,0 ,003 ,0 ,"fraud"},
-        {"help"         ,NO_ARG   ,0 ,'h' ,0 ,"display this help and exit"},
+        {"ash_naz"      ,NO_ARG   ,0 ,077 ,0 ,"fraud"},
         {"mellon"       ,NO_ARG   ,0 ,002 ,0 ,"pedo mellon a minno"},
-        {"mello"        ,NO_ARG   ,0 ,003 ,0 ,"fraud"},
+        {"mello"        ,NO_ARG   ,0 ,077 ,0 ,"fraud"},
+        {"prospicience" ,REQD_ARG ,0 ,003 ,0 ,"validation date"},
+        {"help"         ,NO_ARG   ,0 ,'h' ,0 ,"display this help and exit"},
         {"pyx"          ,REQD_ARG ,0 ,'x' ,0 ,"for docimasy"},
         {"file"         ,REQD_ARG ,0 ,'f' ,0 ,"input file to run"},
         {"data_path"    ,REQD_ARG ,0 ,'d' ,0 ,"path to data files"},
         {"print_db"     ,NO_ARG   ,0 ,'p' ,0 ,"print product databases"},
-        {"prospicience" ,REQD_ARG ,0 ,004 ,0 ,"validation date"},
         {0              ,NO_ARG   ,0 ,0   ,0 ,""}
       };
 
-    bool show_help        = false;
+    bool show_help = false;
 
     std::vector<std::string> input_files;
 
@@ -1237,7 +1237,7 @@ bool Skeleton::ProcessCommandLine()
                 }
                 break;
 
-            case 004:
+            case 003:
                 {
                 std::istringstream iss(getopt_long.optarg);
                 int ymd_as_int;