allocate make a std::vector<const char*> and pass .data() of that vector to commands.Run()

Author: yufengwangca

examples/fabric-admin/commands/interactive/InteractiveCommands.cpp

@@ -62,18 +62,19 @@ void ClearLine()
 
 void ENFORCE_FORMAT(3, 0) LoggingCallback(const char * module, uint8_t category, const char * msg, va_list args)
 {
+    if (sLogFile == nullptr)
+    {
+        return;
+    }
+
     uint64_t timeMs       = chip::System::SystemClock().GetMonotonicMilliseconds64().count();
     uint64_t seconds      = timeMs / 1000;
     uint64_t milliseconds = timeMs % 1000;
 
     flockfile(sLogFile);
 
-    // Portable thread and process identifiers
-    auto pid = static_cast<unsigned long>(getpid());
-    auto tid = static_cast<unsigned long>(pthread_self());
-
-    fprintf(sLogFile, "[%llu.%06llu][%lu:%lu] CHIP:%s: ", static_cast<unsigned long long>(seconds),
-            static_cast<unsigned long long>(milliseconds), pid, tid, module);
+    fprintf(sLogFile, "[%llu.%06llu] CHIP:%s: ", static_cast<unsigned long long>(seconds),
+            static_cast<unsigned long long>(milliseconds), module);
     vfprintf(sLogFile, msg, args);
     fprintf(sLogFile, "\n");
     fflush(sLogFile);

examples/fabric-admin/main.cpp

@@ -41,16 +41,8 @@ int main(int argc, char * argv[])
         // Insert "interactive" and "start" after the executable name
         args.insert(args.begin() + 1, "interactive");
         args.insert(args.begin() + 2, "start");
-
-        // Update argc and argv to reflect the new arguments
-        argc = static_cast<int>(args.size());
-        for (size_t i = 0; i < args.size(); ++i)
-        {
-            argv[i] = const_cast<char *>(args[i].c_str());
-        }
     }
 
-    // const char * args[] = { argv[0], "interactive", "start" };
     ExampleCredentialIssuerCommands credIssuerCommands;
     Commands commands;
 
@@ -59,5 +51,11 @@ int main(int argc, char * argv[])
     registerClusters(commands, &credIssuerCommands);
     registerCommandsSubscriptions(commands, &credIssuerCommands);
 
-    return commands.Run(argc, argv);
+    std::vector<char *> c_args;
+    for (auto & arg : args)
+    {
+        c_args.push_back(const_cast<char *>(arg.c_str()));
+    }
+
+    return commands.Run(static_cast<int>(c_args.size()), c_args.data());
 }