lmi-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[lmi-commits] [lmi] master ea1a8e0 1/7: Represent null pointer as 'nullp


From: Greg Chicares
Subject: [lmi-commits] [lmi] master ea1a8e0 1/7: Represent null pointer as 'nullptr' rather than '0'
Date: Sun, 7 Jun 2020 18:03:28 -0400 (EDT)

branch: master
commit ea1a8e09464a4da7fee6ad100efda53c4df4270e
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>

    Represent null pointer as 'nullptr' rather than '0'
    
    Note: in 'mc_enum_test.cpp', this hypothetical replacement:
        BOOST_TEST_UNEQUAL(base_pointer, nullptr);
    would be an ambiguous overload because it expands to
      << "  '" << (base_pointer) << "' "#op" '" << (nullptr) << "'"
    so the replacement is instead simply this:
        BOOST_TEST(nullptr != base_pointer);
---
 bcc_ar.cpp                | 18 +++++++++---------
 bcc_cc.cpp                | 14 +++++++-------
 bcc_ld.cpp                | 22 +++++++++++-----------
 bcc_rc.cpp                | 16 ++++++++--------
 cpp_main.cpp              |  8 ++++----
 getopt_test.cpp           | 28 ++++++++++++++--------------
 ihs_crc_comp.cpp          | 14 +++++++-------
 main_cli.cpp              | 34 +++++++++++++++++-----------------
 mc_enum_test.cpp          |  2 +-
 md5sum_cli.cpp            | 16 ++++++++--------
 rate_table_tool.cpp       | 26 +++++++++++++-------------
 system_command_non_wx.cpp | 10 +++++-----
 12 files changed, 104 insertions(+), 104 deletions(-)

diff --git a/bcc_ar.cpp b/bcc_ar.cpp
index f9facd0..bf82d60 100644
--- a/bcc_ar.cpp
+++ b/bcc_ar.cpp
@@ -52,15 +52,15 @@ int try_main(int argc, char* argv[])
     // librarian. TRICKY !! They are aliased to unlikely octal values.
     static Option long_options[] =
       {
-        {"help",         NO_ARG,   0, 001, 0, "display this help and exit"},
-        {"license",      NO_ARG,   0, 002, 0, "display license and exit"},
-        {"accept",       NO_ARG,   0, 003, 0, "accept license (-l to 
display)"},
-        {"program",      REQD_ARG, 0, 004, 0, "librarian's filepath"},
-        {"r",            REQD_ARG, 0, 'r', 0, "see inline documentation"},
-        {"s",            REQD_ARG, 0, 's', 0, "see inline documentation"},
-        {"u",            REQD_ARG, 0, 'u', 0, "see inline documentation"},
-        {"v",            REQD_ARG, 0, 'v', 0, "see inline documentation"},
-        {0,              NO_ARG,   0,   0, 0, ""}
+        {"help",         NO_ARG,   nullptr, 001, nullptr, "display this help 
and exit"},
+        {"license",      NO_ARG,   nullptr, 002, nullptr, "display license and 
exit"},
+        {"accept",       NO_ARG,   nullptr, 003, nullptr, "accept license (-l 
to display)"},
+        {"program",      REQD_ARG, nullptr, 004, nullptr, "librarian's 
filepath"},
+        {"r",            REQD_ARG, nullptr, 'r', nullptr, "see inline 
documentation"},
+        {"s",            REQD_ARG, nullptr, 's', nullptr, "see inline 
documentation"},
+        {"u",            REQD_ARG, nullptr, 'u', nullptr, "see inline 
documentation"},
+        {"v",            REQD_ARG, nullptr, 'v', nullptr, "see inline 
documentation"},
+        {nullptr,        NO_ARG,   nullptr, 000, nullptr, ""}
       };
 
     bool license_accepted = false;
diff --git a/bcc_cc.cpp b/bcc_cc.cpp
index 905d828..0f1ee58 100644
--- a/bcc_cc.cpp
+++ b/bcc_cc.cpp
@@ -35,13 +35,13 @@ int try_main(int argc, char* argv[])
     // compiler. TRICKY !! They are aliased to unlikely octal values.
     static Option long_options[] =
       {
-        {"help",         NO_ARG,   0, 001, 0, "display this help and exit"},
-        {"license",      NO_ARG,   0, 002, 0, "display license and exit"},
-        {"accept",       NO_ARG,   0, 003, 0, "accept license (-l to 
display)"},
-        {"program",      REQD_ARG, 0, 004, 0, "compiler's filepath"},
-        {"include",      REQD_ARG, 0, 'I', 0, "include path"},
-        {"out-file",     REQD_ARG, 0, 'o', 0, "output object file"},
-        {0,              NO_ARG,   0,   0, 0, ""}
+        {"help",         NO_ARG,   nullptr, 001, nullptr, "display this help 
and exit"},
+        {"license",      NO_ARG,   nullptr, 002, nullptr, "display license and 
exit"},
+        {"accept",       NO_ARG,   nullptr, 003, nullptr, "accept license (-l 
to display)"},
+        {"program",      REQD_ARG, nullptr, 004, nullptr, "compiler's 
filepath"},
+        {"include",      REQD_ARG, nullptr, 'I', nullptr, "include path"},
+        {"out-file",     REQD_ARG, nullptr, 'o', nullptr, "output object 
file"},
+        {nullptr,        NO_ARG,   nullptr, 000, nullptr, ""}
       };
 
     bool license_accepted = false;
diff --git a/bcc_ld.cpp b/bcc_ld.cpp
index 592098c..13adbdd 100644
--- a/bcc_ld.cpp
+++ b/bcc_ld.cpp
@@ -112,17 +112,17 @@ int try_main(int argc, char* argv[])
     // as you use '/' rather than '-' to introduce borland options.
     static Option long_options[] =
       {
-        {"help",         NO_ARG,   0, 001, 0, "display this help and exit"},
-        {"license",      NO_ARG,   0, 002, 0, "display license and exit"},
-        {"accept",       NO_ARG,   0, 003, 0, "accept license (-l to 
display)"},
-        {"def-file",     REQD_ARG, 0, 004, 0, "module definition file"},
-        {"map-file",     REQD_ARG, 0, 005, 0, "map file"},
-        {"program",      REQD_ARG, 0, 007, 0, "linker's filepath"},
-        {"startup-file", REQD_ARG, 0, 010, 0, "startup file"},
-        {"lib-path",     REQD_ARG, 0, 'L', 0, "library path"},
-        {"out-file",     REQD_ARG, 0, 'o', 0, "output executable file"},
-        {"/",            REQD_ARG, 0, '/', 0, "linker option"},
-        {0,              NO_ARG,   0,   0, 0, ""}
+        {"help",         NO_ARG,   nullptr, 001, nullptr, "display this help 
and exit"},
+        {"license",      NO_ARG,   nullptr, 002, nullptr, "display license and 
exit"},
+        {"accept",       NO_ARG,   nullptr, 003, nullptr, "accept license (-l 
to display)"},
+        {"def-file",     REQD_ARG, nullptr, 004, nullptr, "module definition 
file"},
+        {"map-file",     REQD_ARG, nullptr, 005, nullptr, "map file"},
+        {"program",      REQD_ARG, nullptr, 007, nullptr, "linker's filepath"},
+        {"startup-file", REQD_ARG, nullptr, 010, nullptr, "startup file"},
+        {"lib-path",     REQD_ARG, nullptr, 'L', nullptr, "library path"},
+        {"out-file",     REQD_ARG, nullptr, 'o', nullptr, "output executable 
file"},
+        {"/",            REQD_ARG, nullptr, '/', nullptr, "linker option"},
+        {nullptr,        NO_ARG,   nullptr, 000, nullptr, ""}
       };
 
     bool license_accepted = false;
diff --git a/bcc_rc.cpp b/bcc_rc.cpp
index 07f5f49..518fb34 100644
--- a/bcc_rc.cpp
+++ b/bcc_rc.cpp
@@ -35,17 +35,17 @@ int try_main(int argc, char* argv[])
     // compiler. TRICKY !! They are aliased to unlikely octal values.
     static Option long_options[] =
       {
-        {"help",         NO_ARG,   0, 001, 0, "display this help and exit"},
-        {"license",      NO_ARG,   0, 002, 0, "display license and exit"},
-        {"accept",       NO_ARG,   0, 003, 0, "accept license (-l to 
display)"},
-        {"program",      REQD_ARG, 0, 004, 0, "resource compiler's filepath"},
+        {"help",         NO_ARG,   nullptr, 001, nullptr, "display this help 
and exit"},
+        {"license",      NO_ARG,   nullptr, 002, nullptr, "display license and 
exit"},
+        {"accept",       NO_ARG,   nullptr, 003, nullptr, "accept license (-l 
to display)"},
+        {"program",      REQD_ARG, nullptr, 004, nullptr, "resource compiler's 
filepath"},
 // TRICKY !! '-i' is ambiguous:
 //   for windres, it means 'input file'
 //   for borland, it means 'include path'
-//        {"in-file",      REQD_ARG, 0, 'i', 0, "input .rc text file"},
-        {"include",      REQD_ARG, 0, 'i', 0, "include path"},
-        {"out-file",     REQD_ARG, 0, 'o', 0, "output binary resource file"},
-        {0,              NO_ARG,   0,   0, 0, ""}
+//        {"in-file",      REQD_ARG, nullptr, 'i', nullptr, "input .rc text 
file"},
+        {"include",      REQD_ARG, nullptr, 'i', nullptr, "include path"},
+        {"out-file",     REQD_ARG, nullptr, 'o', nullptr, "output binary 
resource file"},
+        {nullptr,        NO_ARG,   nullptr, 000, nullptr, ""}
       };
 
     bool license_accepted = false;
diff --git a/cpp_main.cpp b/cpp_main.cpp
index c651b48..89ec8b3 100644
--- a/cpp_main.cpp
+++ b/cpp_main.cpp
@@ -164,10 +164,10 @@ int main(int argc, char* argv[])
     // TRICKY !! Some long options are aliased to unlikely octal values.
     static Option long_options[] =
       {
-        {"help",         NO_ARG,   0, 001, 0, "display this help and exit"},
-        {"license",      NO_ARG,   0, 002, 0, "display license and exit"},
-        {"accept",       NO_ARG,   0, 003, 0, "accept license (-l to 
display)"},
-        {0,              NO_ARG,   0,   0, 0, ""}
+        {"help",    NO_ARG, nullptr, 001, nullptr, "display this help and 
exit"},
+        {"license", NO_ARG, nullptr, 002, nullptr, "display license and exit"},
+        {"accept",  NO_ARG, nullptr, 003, nullptr, "accept license (-l to 
display)"},
+        {nullptr,   NO_ARG, nullptr,   0, nullptr, ""}
       };
 
     bool license_accepted = false;
diff --git a/getopt_test.cpp b/getopt_test.cpp
index 9c67010..86a0ee4 100644
--- a/getopt_test.cpp
+++ b/getopt_test.cpp
@@ -68,20 +68,20 @@ std::string getopt_test::test(int argc, char* argv[])
     static char const* vopt [] = {"optional", "alternative", nullptr};
     static Option long_options[] =
         {
-            {"add"     ,REQD_ARG ,0 ,  0 ,0     ,""},
-            {"append"  ,NO_ARG   ,0 ,  0 ,0     ,""},
-            {"delete"  ,REQD_ARG ,0 ,  0 ,0     ,""},
-            {"verbose" ,NO_ARG   ,0 ,  0 ,0     ,""},
-            {"create"  ,NO_ARG   ,0 ,  0 ,0     ,""},
-            {"file"    ,REQD_ARG ,0 ,  0 ,0     ,""},
-            {"list"    ,LIST_ARG ,0 ,  0 ,0     ,""},
-            {"opt"     ,OPT_ARG  ,0 ,  0 ,0     ,""},
-            {"alt"     ,ALT_ARG  ,0 ,  0 ,0     ,""},
-            {"vfile"   ,REQD_ARG ,0 ,  0 ,vfile ,""},
-            {"vlist"   ,LIST_ARG ,0 ,  0 ,vlist ,""},
-            {"vopt"    ,OPT_ARG  ,0 ,  0 ,vopt  ,""},
-            {"valt"    ,ALT_ARG  ,0 ,  0 ,vopt  ,""},
-            {0         ,NO_ARG   ,0 ,  0 ,0     ,""}
+            {"add"     ,REQD_ARG ,nullptr ,  0 ,nullptr ,""},
+            {"append"  ,NO_ARG   ,nullptr ,  0 ,nullptr ,""},
+            {"delete"  ,REQD_ARG ,nullptr ,  0 ,nullptr ,""},
+            {"verbose" ,NO_ARG   ,nullptr ,  0 ,nullptr ,""},
+            {"create"  ,NO_ARG   ,nullptr ,  0 ,nullptr ,""},
+            {"file"    ,REQD_ARG ,nullptr ,  0 ,nullptr ,""},
+            {"list"    ,LIST_ARG ,nullptr ,  0 ,nullptr ,""},
+            {"opt"     ,OPT_ARG  ,nullptr ,  0 ,nullptr ,""},
+            {"alt"     ,ALT_ARG  ,nullptr ,  0 ,nullptr ,""},
+            {"vfile"   ,REQD_ARG ,nullptr ,  0 ,vfile   ,""},
+            {"vlist"   ,LIST_ARG ,nullptr ,  0 ,vlist   ,""},
+            {"vopt"    ,OPT_ARG  ,nullptr ,  0 ,vopt    ,""},
+            {"valt"    ,ALT_ARG  ,nullptr ,  0 ,vopt    ,""},
+            {nullptr   ,NO_ARG   ,nullptr ,  0 ,nullptr ,""}
         };
     int option_index = 0;
     GetOpt getopt_long
diff --git a/ihs_crc_comp.cpp b/ihs_crc_comp.cpp
index 11dbfdf..cf2bc86 100644
--- a/ihs_crc_comp.cpp
+++ b/ihs_crc_comp.cpp
@@ -386,13 +386,13 @@ void f25(std::string const& line1, std::string const& 
line2)
 typedef void(*pf)(std::string const& line1, std::string const& line2);
 pf const transition_functions[6][6] =
     {
-    /*        to: 0     1     2     3     4     5 */
-    /* from 0 */ {0, &f01, &f02,    0,    0,    0,},
-    /* from 1 */ {0, &f11, &f12,    0,    0,    0,},
-    /* from 2 */ {0,    0, &f22, &f23, &f24, &f25,},
-    /* from 3 */ {0,    0, &f32, &f33, &f34,    0,},
-    /* from 4 */ {0,    0, &f42,    0, &f44,    0,},
-    /* from 5 */ {0,    0,    0,    0,    0,    0,},
+    /*        to: 0        1        2        3        4        5 */
+    /* from 0 */ {nullptr ,&f01    ,&f02    ,nullptr ,nullptr ,nullptr ,},
+    /* from 1 */ {nullptr ,&f11    ,&f12    ,nullptr ,nullptr ,nullptr ,},
+    /* from 2 */ {nullptr ,nullptr ,&f22    ,&f23    ,&f24    ,&f25    ,},
+    /* from 3 */ {nullptr ,nullptr ,&f32    ,&f33    ,&f34    ,nullptr ,},
+    /* from 4 */ {nullptr ,nullptr ,&f42    ,nullptr ,&f44    ,nullptr ,},
+    /* from 5 */ {nullptr ,nullptr ,nullptr ,nullptr ,nullptr ,nullptr ,},
     };
 
 //============================================================================
diff --git a/main_cli.cpp b/main_cli.cpp
index d94e565..9f79959 100644
--- a/main_cli.cpp
+++ b/main_cli.cpp
@@ -162,23 +162,23 @@ void process_command_line(int argc, char* argv[])
     // TRICKY !! Some long options are aliased to unlikely octal values.
     static Option long_options[] =
       {
-        {"ash_nazg"     ,NO_ARG   ,0 ,001 ,0 ,"ash nazg durbatul√Ľk"},
-        {"ash_naz"      ,NO_ARG   ,0 ,077 ,0 ,"fraud"},
-        {"mellon"       ,NO_ARG   ,0 ,002 ,0 ,"pedo mellon a minno"},
-        {"mello"        ,NO_ARG   ,0 ,077 ,0 ,"fraud"},
-        {"prospicience" ,REQD_ARG ,0 ,003 ,0 ,"validation date"},
-        {"accept"       ,NO_ARG   ,0 ,'a' ,0 ,"accept license (-l to 
display)"},
-        {"data_path"    ,REQD_ARG ,0 ,'d' ,0 ,"path to data files"},
-        {"emit"         ,REQD_ARG ,0 ,'e' ,0 ,"choose what output to emit"},
-        {"file"         ,REQD_ARG ,0 ,'f' ,0 ,"input file to run"},
-        {"help"         ,NO_ARG   ,0 ,'h' ,0 ,"display this help and exit"},
-        {"license"      ,NO_ARG   ,0 ,'l' ,0 ,"display license and exit"},
-        {"profile"      ,NO_ARG   ,0 ,'o' ,0 ,"set up for profiling and exit"},
-        {"print_db"     ,NO_ARG   ,0 ,'p' ,0 ,"print products and exit"},
-        {"selftest"     ,NO_ARG   ,0 ,'s' ,0 ,"perform self test and exit"},
-        {"test_db"      ,NO_ARG   ,0 ,'t' ,0 ,"test products and exit"},
-        {"pyx"          ,REQD_ARG ,0 ,'x' ,0 ,"for docimasy"},
-        {0              ,NO_ARG   ,0 ,0   ,0 ,""}
+        {"ash_nazg"     ,NO_ARG   ,nullptr ,001 ,nullptr ,"ash nazg 
durbatul√Ľk"},
+        {"ash_naz"      ,NO_ARG   ,nullptr ,077 ,nullptr ,"fraud"},
+        {"mellon"       ,NO_ARG   ,nullptr ,002 ,nullptr ,"pedo mellon a 
minno"},
+        {"mello"        ,NO_ARG   ,nullptr ,077 ,nullptr ,"fraud"},
+        {"prospicience" ,REQD_ARG ,nullptr ,003 ,nullptr ,"validation date"},
+        {"accept"       ,NO_ARG   ,nullptr ,'a' ,nullptr ,"accept license (-l 
to display)"},
+        {"data_path"    ,REQD_ARG ,nullptr ,'d' ,nullptr ,"path to data 
files"},
+        {"emit"         ,REQD_ARG ,nullptr ,'e' ,nullptr ,"choose what output 
to emit"},
+        {"file"         ,REQD_ARG ,nullptr ,'f' ,nullptr ,"input file to run"},
+        {"help"         ,NO_ARG   ,nullptr ,'h' ,nullptr ,"display this help 
and exit"},
+        {"license"      ,NO_ARG   ,nullptr ,'l' ,nullptr ,"display license and 
exit"},
+        {"profile"      ,NO_ARG   ,nullptr ,'o' ,nullptr ,"set up for 
profiling and exit"},
+        {"print_db"     ,NO_ARG   ,nullptr ,'p' ,nullptr ,"print products and 
exit"},
+        {"selftest"     ,NO_ARG   ,nullptr ,'s' ,nullptr ,"perform self test 
and exit"},
+        {"test_db"      ,NO_ARG   ,nullptr ,'t' ,nullptr ,"test products and 
exit"},
+        {"pyx"          ,REQD_ARG ,nullptr ,'x' ,nullptr ,"for docimasy"},
+        {nullptr        ,NO_ARG   ,nullptr ,000 ,nullptr ,""}
       };
 
     bool license_accepted    = false;
diff --git a/mc_enum_test.cpp b/mc_enum_test.cpp
index ff1a85a..c5612dd 100644
--- a/mc_enum_test.cpp
+++ b/mc_enum_test.cpp
@@ -119,7 +119,7 @@ void mc_enum_test::test()
     // Cardinality.
     BOOST_TEST_EQUAL(holiday4.cardinality(), 3);
     mc_enum_base* base_pointer = dynamic_cast<mc_enum_base*>(&holiday4);
-    BOOST_TEST_UNEQUAL(base_pointer, 0);
+    BOOST_TEST(nullptr != base_pointer);
     int expected_cardinality = 0;
     if(base_pointer)
         {
diff --git a/md5sum_cli.cpp b/md5sum_cli.cpp
index 4fee1f8..f23de6e 100644
--- a/md5sum_cli.cpp
+++ b/md5sum_cli.cpp
@@ -96,14 +96,14 @@ int try_main(int argc, char* argv[])
     int option_index = 0;
     struct Option long_options[] =
         {
-            {"binary"      ,NO_ARG   ,0 ,'b'            ,0 ,""},
-            {"check"       ,NO_ARG   ,0 ,'c'            ,0 ,""},
-            {"quiet"       ,NO_ARG   ,0 ,QUIET_OPTION   ,0 ,""},
-            {"status"      ,NO_ARG   ,0 ,STATUS_OPTION  ,0 ,""},
-            {"text"        ,NO_ARG   ,0 ,'t'            ,0 ,""},
-            {"help"        ,NO_ARG   ,0 ,HELP_OPTION    ,0 ,""},
-            {"version"     ,NO_ARG   ,0 ,VERSION_OPTION ,0 ,""},
-            {0             ,NO_ARG   ,0 ,0              ,0 ,""}
+            {"binary"      ,NO_ARG   ,nullptr ,'b'            ,nullptr ,""},
+            {"check"       ,NO_ARG   ,nullptr ,'c'            ,nullptr ,""},
+            {"quiet"       ,NO_ARG   ,nullptr ,QUIET_OPTION   ,nullptr ,""},
+            {"status"      ,NO_ARG   ,nullptr ,STATUS_OPTION  ,nullptr ,""},
+            {"text"        ,NO_ARG   ,nullptr ,'t'            ,nullptr ,""},
+            {"help"        ,NO_ARG   ,nullptr ,HELP_OPTION    ,nullptr ,""},
+            {"version"     ,NO_ARG   ,nullptr ,VERSION_OPTION ,nullptr ,""},
+            {nullptr       ,NO_ARG   ,nullptr ,000            ,nullptr ,""}
         };
 
     bool show_help = false;
diff --git a/rate_table_tool.cpp b/rate_table_tool.cpp
index 11bdadd..adb74ef 100644
--- a/rate_table_tool.cpp
+++ b/rate_table_tool.cpp
@@ -445,19 +445,19 @@ int try_main(int argc, char* argv[])
     int option_index = 0;
     static struct Option long_options[] =
       {
-        {"help"        ,NO_ARG   ,0 ,'h' ,0 ,"display this help and exit"},
-        {"delete"      ,REQD_ARG ,0 ,'d' ,0 ,"delete table #n from database"},
-        {"license"     ,NO_ARG   ,0 ,'l' ,0 ,"display license and exit"},
-        {"accept"      ,NO_ARG   ,0 ,'a' ,0 ,"accept license (-l to display)"},
-        {"file=FILE"   ,REQD_ARG ,0 ,'f' ,0 ,"use database FILE"},
-        {"crc"         ,NO_ARG   ,0 ,'c' ,0 ,"show CRCs of all tables"},
-        {"list"        ,NO_ARG   ,0 ,'t' ,0 ,"list all tables"},
-        {"merge=PATH"  ,REQD_ARG ,0 ,'m' ,0 ,"merge PATH (file or dir) into 
database"},
-        {"extract=n"   ,REQD_ARG ,0 ,'e' ,0 ,"extract table #n into 
'0000n.rates'"},
-        {"extract-all" ,NO_ARG   ,0 ,'x' ,0 ,"extract all tables to '.rates' 
files"},
-        {"rename=FILE" ,REQD_ARG ,0 ,'r' ,0 ,"rename tables from FILE"},
-        {"verify"      ,NO_ARG   ,0 ,'v' ,0 ,"verify integrity of all tables"},
-        {0             ,NO_ARG   ,0 ,0   ,0 ,""}
+        {"help"        ,NO_ARG   ,nullptr ,'h' ,nullptr ,"display this help 
and exit"},
+        {"delete"      ,REQD_ARG ,nullptr ,'d' ,nullptr ,"delete table #n from 
database"},
+        {"license"     ,NO_ARG   ,nullptr ,'l' ,nullptr ,"display license and 
exit"},
+        {"accept"      ,NO_ARG   ,nullptr ,'a' ,nullptr ,"accept license (-l 
to display)"},
+        {"file=FILE"   ,REQD_ARG ,nullptr ,'f' ,nullptr ,"use database FILE"},
+        {"crc"         ,NO_ARG   ,nullptr ,'c' ,nullptr ,"show CRCs of all 
tables"},
+        {"list"        ,NO_ARG   ,nullptr ,'t' ,nullptr ,"list all tables"},
+        {"merge=PATH"  ,REQD_ARG ,nullptr ,'m' ,nullptr ,"merge PATH (file or 
dir) into database"},
+        {"extract=n"   ,REQD_ARG ,nullptr ,'e' ,nullptr ,"extract table #n 
into '0000n.rates'"},
+        {"extract-all" ,NO_ARG   ,nullptr ,'x' ,nullptr ,"extract all tables 
to '.rates' files"},
+        {"rename=FILE" ,REQD_ARG ,nullptr ,'r' ,nullptr ,"rename tables from 
FILE"},
+        {"verify"      ,NO_ARG   ,nullptr ,'v' ,nullptr ,"verify integrity of 
all tables"},
+        {nullptr       ,NO_ARG   ,nullptr ,000 ,nullptr ,""}
       };
     bool license_accepted = false;
     bool show_license     = false;
diff --git a/system_command_non_wx.cpp b/system_command_non_wx.cpp
index ca25ddb..ebfd4bc 100644
--- a/system_command_non_wx.cpp
+++ b/system_command_non_wx.cpp
@@ -68,14 +68,14 @@ void concrete_system_command(std::string const& 
command_line)
     // POSIX too) because of this msw implementation detail.
     std::string non_const_cmd_line_copy = command_line;
     ::CreateProcessA
-        (0
+        (nullptr
         ,non_const_cmd_line_copy.data()
-        ,0
-        ,0
+        ,nullptr
+        ,nullptr
         ,true
         ,NORMAL_PRIORITY_CLASS
-        ,0
-        ,0
+        ,nullptr
+        ,nullptr
         ,&startup_info
         ,&process_info
         );



reply via email to

[Prev in Thread] Current Thread [Next in Thread]