changeset 351:d54112385845

Reorder option indices.
author Matti Hamalainen <ccr@tnsp.org>
date Mon, 20 Jan 2020 17:13:32 +0200
parents c2ebcb0f0d62
children 4978ff445572
files sidinfo.c
diffstat 1 files changed, 25 insertions(+), 25 deletions(-) [+]
line wrap: on
line diff
--- a/sidinfo.c	Sun Jan 19 06:40:40 2020 +0200
+++ b/sidinfo.c	Mon Jan 20 17:13:32 2020 +0200
@@ -124,17 +124,17 @@
     {  1,   0, "license"  , NULL     , "Print out this program's license agreement", OPT_NONE },
     {  2, 'v', "verbose"  , NULL     , "Be more verbose", OPT_NONE },
 
-    {  3, 'p', "parsable" , NULL     , "Output in script-parsable format", OPT_NONE },
-    {  4, 'x', "hex"      , NULL     , "Use hexadecimal values", OPT_NONE },
-    {  5, 'n', "noprefix" , NULL     , "Output without field name prefix", OPT_NONE },
-    {  6, 'l', "line"     , "sep"    , "Output in one line format, -l <field sep str>", OPT_ARGREQ },
-    {  7, 'e', "escape"   , "chars"  , "Escape these characters in fields (see note)", OPT_ARGREQ },
-    {  8, 'f', "fields"   , "fields" , "Show only specified field(s)", OPT_ARGREQ },
-    {  9, 'F', "format"   , "fmt"    , "Use given format string (see below)", OPT_ARGREQ },
-    { 10, 'H', "hvsc"     , "path"   , "Specify path to HVSC root directory", OPT_ARGREQ },
-    { 11, 'S', "sldb"     , "file"   , "Specify Songlengths.(txt|md5) file", OPT_ARGREQ },
-    { 12, 'T', "stildb"   , "file"   , "Specify STIL.txt file", OPT_ARGREQ },
-    { 13, 'R', "recurse"  , NULL     , "Recurse into sub-directories", OPT_NONE },
+    { 10, 'p', "parsable" , NULL     , "Output in script-parsable format", OPT_NONE },
+    { 12, 'x', "hex"      , NULL     , "Use hexadecimal values", OPT_NONE },
+    { 14, 'n', "noprefix" , NULL     , "Output without field name prefix", OPT_NONE },
+    { 16, 'l', "line"     , "sep"    , "Output in one line format, -l <field sep str>", OPT_ARGREQ },
+    { 18, 'e', "escape"   , "chars"  , "Escape these characters in fields (see note)", OPT_ARGREQ },
+    { 20, 'f', "fields"   , "fields" , "Show only specified field(s)", OPT_ARGREQ },
+    { 22, 'F', "format"   , "fmt"    , "Use given format string (see below)", OPT_ARGREQ },
+    { 24, 'R', "recurse"  , NULL     , "Recurse into sub-directories", OPT_NONE },
+    { 30, 'H', "hvsc"     , "path"   , "Specify path to HVSC root directory", OPT_ARGREQ },
+    { 32, 'S', "sldb"     , "file"   , "Specify Songlengths.(txt|md5) file", OPT_ARGREQ },
+    { 34, 'T', "stildb"   , "file"   , "Specify STIL.txt file", OPT_ARGREQ },
 };
 
 static const int optListN = sizeof(optList) / sizeof(optList[0]);
@@ -654,53 +654,53 @@
         th_verbosity++;
         break;
 
-    case 3:
+    case 10:
         optParsable = TRUE;
         break;
 
-    case 4:
+    case 12:
         optHexadecimal = TRUE;
         break;
 
-    case 5:
+    case 14:
         optFieldNamePrefix = FALSE;
         break;
 
-    case 6:
+    case 16:
         optOneLineFieldSep = optArg;
         break;
 
-    case 7:
+    case 18:
         optEscapeChars = optArg;
         break;
 
-    case 8:
+    case 20:
         if (!argParsePSFields(&optFormat, optArg))
             return FALSE;
         break;
 
-    case 9:
+    case 22:
         optFieldOutput = FALSE;
         if (!argParsePSFormatStr(&optFormat, optArg))
             return FALSE;
         break;
 
-    case 10:
+    case 24:
+        optRecurseDirs = TRUE;
+        break;
+
+    case 30:
         th_pstr_cpy(&setHVSCPath, optArg);
         break;
 
-    case 11:
+    case 32:
         th_pstr_cpy(&setSLDBPath, optArg);
         break;
 
-    case 12:
+    case 34:
         th_pstr_cpy(&setSTILDBPath, optArg);
         break;
 
-    case 13:
-        optRecurseDirs = TRUE;
-        break;
-
     default:
         THERR("Unknown option '%s'.\n", currArg);
         return FALSE;