#Cleanup: Consistently use char* argv[] instead of char**

PiperOrigin-RevId: 444782296
Change-Id: If8e7647be28f794392675ae001abbe9b809da0ac

oss-internship-2020/gdal/raster.cc

@@ -167,7 +167,7 @@ absl::Status GdalMain(std::string filename) {
   return absl::OkStatus();
 }
 
-int main(int argc, char** argv) {
+int main(int argc, char* argv[]) {
   // The file to be converted should be specified in the first argument while
   // running the program.
   if (argc < 2) {

oss-internship-2020/gdal/raster_to_gtiff/raster_to_gtiff.cc

@@ -51,7 +51,7 @@ void Usage() {
 
 }  // namespace
 
-int main(int argc, char** argv) {
+int main(int argc, char* argv[]) {
   if (argc < 3 || !sandbox2::file::IsAbsolutePath(argv[2])) {
     Usage();
     return EXIT_FAILURE;

oss-internship-2020/guetzli/guetzli_sandboxed.cc

@@ -44,7 +44,7 @@ void Usage() {
 
 }  // namespace
 
-int main(int argc, const char** argv) {
+int main(int argc, char* argv[]) {
   int verbose = 0;
   int quality = kDefaultJPEGQuality;
   int memlimit_mb = kDefaultMemlimitMB;

oss-internship-2020/libarchive/examples/sapi_minitar_main.cc

@@ -38,7 +38,7 @@ static void PrintUsage() {
   exit(EXIT_FAILURE);
 }
 
-int main(int unused_argc, const char** argv) {
+int main(int unused_argc, char* argv[]) {
   google::InitGoogleLogging(argv[0]);
   const char* filename = nullptr;
   int compress;

oss-internship-2020/libarchive/ld_preload_example/minitar_main.cc

@@ -117,7 +117,7 @@
 #define NO_GZIP_CREATE
 #endif
 
-int main(int unused_argc, const char** argv) {
+int main(int unused_argc, char* argv[]) {
   const char* filename = nullptr;
   int compress;
   int flags;

oss-internship-2020/libpng/examples/example1.cc

@@ -64,7 +64,7 @@ absl::Status LibPNGMain(const std::string& infile, const std::string& outfile) {
   return absl::OkStatus();
 }
 
-int main(int argc, const char** argv) {
+int main(int argc, char* argv[]) {
   if (argc != 3) {
     LOG(ERROR) << "usage: example input-file output-file";
     return EXIT_FAILURE;

oss-internship-2020/libpng/examples/example2.cc

@@ -220,7 +220,7 @@ absl::Status LibPNGMain(const std::string& infile, const std::string& outfile) {
   return absl::OkStatus();
 }
 
-int main(int argc, const char** argv) {
+int main(int argc, char* argv[]) {
   if (argc != 3) {
     LOG(ERROR) << "Usage: example5 infile outfile";
     return EXIT_FAILURE;

oss-internship-2020/libtiff/example/main_sandboxed.cc

@@ -132,7 +132,7 @@ std::string GetFilePath(const std::string filename) {
 
 }  // namespace
 
-int main(int argc, char** argv) {
+int main(int argc, char* argv[]) {
   gflags::ParseCommandLineFlags(&argc, &argv, true);
 
   std::string srcfile;

sandboxed_api/examples/sum/main_sum.cc

@@ -205,7 +205,7 @@ absl::Status test_addition(sapi::Sandbox* sandbox, int a, int b, int c) {
 
 }  // namespace
 
-int main(int argc, char** argv) {
+int main(int argc, char* argv[]) {
   gflags::ParseCommandLineFlags(&argc, &argv, true);
   google::InitGoogleLogging(argv[0]);
 

sandboxed_api/examples/zlib/main_zlib.cc

@@ -37,7 +37,7 @@
 #define Z_STREAM_ERROR (-2)
 #define Z_STREAM_END 1
 
-int main(int argc, char** argv) {
+int main(int argc, char* argv[]) {
   gflags::ParseCommandLineFlags(&argc, &argv, true);
   google::InitGoogleLogging(argv[0]);
 

sandboxed_api/sandbox2/examples/crc4/crc4bin.cc

@@ -44,7 +44,7 @@ static uint32_t ComputeCRC4Impl(const uint8_t* ptr, uint64_t len) {
   return crc4;
 }
 
-int main(int argc, char** argv) {
+int main(int argc, char* argv[]) {
   gflags::ParseCommandLineFlags(&argc, &argv, false);
 
   // Set-up the sandbox2::Client object, using a file descriptor (1023).

sandboxed_api/sandbox2/examples/crc4/crc4sandbox.cc

@@ -87,7 +87,7 @@ bool SandboxedCRC4(sandbox2::Comms* comms, uint32_t* crc4) {
 
 }  // namespace
 
-int main(int argc, char** argv) {
+int main(int argc, char* argv[]) {
   gflags::ParseCommandLineFlags(&argc, &argv, true);
   google::InitGoogleLogging(argv[0]);
 

sandboxed_api/sandbox2/examples/custom_fork/custom_fork_bin.cc

@@ -37,7 +37,7 @@ static int SandboxeeFunction(sandbox2::Comms* comms) {
   return i;
 }
 
-int main(int argc, char** argv) {
+int main(int argc, char* argv[]) {
   // Writing to stderr limits the number of invoked syscalls.
   gflags::SetCommandLineOptionWithMode("logtostderr", "true",
                                        gflags::SET_FLAG_IF_DEFAULT);

sandboxed_api/sandbox2/examples/custom_fork/custom_fork_sandbox.cc

@@ -92,7 +92,7 @@ static int SandboxIteration(sandbox2::ForkClient* fork_client, int32_t i) {
   return result.reason_code();
 }
 
-int main(int argc, char** argv) {
+int main(int argc, char* argv[]) {
   gflags::ParseCommandLineFlags(&argc, &argv, true);
   google::InitGoogleLogging(argv[0]);
 

sandboxed_api/sandbox2/examples/network/network_bin.cc

@@ -60,7 +60,7 @@ static bool CommunicationTest(int sock) {
   return true;
 }
 
-int main(int argc, char** argv) {
+int main(int argc, char* argv[]) {
   // Set-up the sandbox2::Client object, using a file descriptor (1023).
   sandbox2::Comms comms(sandbox2::Comms::kSandbox2ClientCommsFD);
   sandbox2::Client sandbox2_client(&comms);

sandboxed_api/sandbox2/examples/network/network_sandbox.cc

@@ -162,7 +162,7 @@ bool HandleSandboxee(sandbox2::Comms* comms, int port) {
 
 }  // namespace
 
-int main(int argc, char** argv) {
+int main(int argc, char* argv[]) {
   // This test is incompatible with sanitizers.
   // The `SKIP_SANITIZERS_AND_COVERAGE` macro won't work for us here since we
   // need to return something.

sandboxed_api/sandbox2/examples/network_proxy/networkproxy_bin.cc

@@ -104,7 +104,7 @@ absl::StatusOr<int> ConnectToServer(int port) {
 
 }  // namespace
 
-int main(int argc, char** argv) {
+int main(int argc, char* argv[]) {
   gflags::ParseCommandLineFlags(&argc, &argv, false);
 
   // Set-up the sandbox2::Client object, using a file descriptor (1023).

sandboxed_api/sandbox2/examples/network_proxy/networkproxy_sandbox.cc

@@ -112,7 +112,7 @@ void Server(int port) {
 
 }  // namespace
 
-int main(int argc, char** argv) {
+int main(int argc, char* argv[]) {
   // This test is incompatible with sanitizers.
   // The `SKIP_SANITIZERS_AND_COVERAGE` macro won't work for us here since we
   // need to return something.

sandboxed_api/sandbox2/examples/static/static_bin.cc

@@ -25,7 +25,7 @@
 #include <cstddef>
 #include <cstdio>
 
-int main(int argc, char** argv) {
+int main(int argc, char* argv[]) {
   char buf[1024];
   size_t total_bytes = 0U;
 

sandboxed_api/sandbox2/examples/static/static_sandbox.cc

@@ -119,7 +119,7 @@ std::unique_ptr<sandbox2::Policy> GetPolicy() {
       .BuildOrDie();
 }
 
-int main(int argc, char** argv) {
+int main(int argc, char* argv[]) {
   // This test is incompatible with sanitizers.
   // The `SKIP_SANITIZERS_AND_COVERAGE` macro won't work for us here since we
   // need to return something.

sandboxed_api/sandbox2/examples/tool/sandbox2tool.cc

@@ -104,7 +104,7 @@ void OutputFD(int fd) {
 
 }  // namespace
 
-int main(int argc, char** argv) {
+int main(int argc, char* argv[]) {
   gflags::ParseCommandLineFlags(&argc, &argv, true);
   google::InitGoogleLogging(argv[0]);
 

sandboxed_api/sandbox2/examples/zlib/zpipe_sandbox.cc

@@ -71,7 +71,7 @@ std::unique_ptr<sandbox2::Policy> GetPolicy() {
 
 }  // namespace
 
-int main(int argc, char** argv) {
+int main(int argc, char* argv[]) {
   gflags::ParseCommandLineFlags(&argc, &argv, true);
   google::InitGoogleLogging(argv[0]);
 

sandboxed_api/sandbox2/testcases/abort.cc

@@ -19,7 +19,7 @@
 
 #include "sandboxed_api/util/raw_logging.h"
 
-int main(int argc, char** argv) {
+int main(int argc, char* argv[]) {
   SAPI_RAW_LOG(ERROR, "Raising SIGABRT");
   abort();
   return EXIT_SUCCESS;  // Not reached

sandboxed_api/sandbox2/testcases/buffer.cc

@@ -21,7 +21,7 @@
 #include "sandboxed_api/sandbox2/buffer.h"
 #include "sandboxed_api/sandbox2/comms.h"
 
-int main(int argc, char** argv) {
+int main(int argc, char* argv[]) {
   if (argc != 2) {
     absl::FPrintF(stderr, "argc != 2\n");
     return EXIT_FAILURE;

sandboxed_api/sandbox2/testcases/hostname.cc

@@ -23,7 +23,7 @@
 #include <cstdlib>
 #include <cstring>
 
-int main(int argc, char** argv) {
+int main(int argc, char* argv[]) {
   if (argc < 2) {
     printf("argc < 2\n");
     return EXIT_FAILURE;

sandboxed_api/sandbox2/testcases/ipc.cc

@@ -24,7 +24,7 @@
 #include "sandboxed_api/sandbox2/comms.h"
 #include "sandboxed_api/util/raw_logging.h"
 
-int main(int argc, char** argv) {
+int main(int argc, char* argv[]) {
   if (argc < 2) {
     printf("argc < 2\n");
     return EXIT_FAILURE;

sandboxed_api/sandbox2/testcases/limits.cc

@@ -72,7 +72,7 @@ __attribute__((noinline)) int TestAllocaBigAboveLimit() {
   return EXIT_FAILURE;
 }
 
-int main(int argc, char** argv) {
+int main(int argc, char* argv[]) {
   // Disable buffering.
   setbuf(stdin, nullptr);
   setbuf(stdout, nullptr);

sandboxed_api/sandbox2/testcases/minimal.cc

@@ -15,7 +15,7 @@
 // A binary doing nothing and returning 0 or 1.
 // It is used to find the minimal syscall policy to allow.
 
-int main(int argc, char** argv) {
+int main(int argc, char* argv[]) {
   if (argc <= 1) {
     return 0;
   }

sandboxed_api/sandbox2/testcases/personality.cc

@@ -20,7 +20,7 @@
 
 #include <cstdint>
 
-int main(int argc, char** argv) {
+int main(int argc, char* argv[]) {
   syscall(__NR_personality, uintptr_t{1}, uintptr_t{2}, uintptr_t{3},
           uintptr_t{4}, uintptr_t{5}, uintptr_t{6});
   return 22;

sandboxed_api/sandbox2/testcases/pidcomms.cc

@@ -18,7 +18,7 @@
 #include "sandboxed_api/sandbox2/comms.h"
 #include "sandboxed_api/util/raw_logging.h"
 
-int main(int argc, char** argv) {
+int main(int argc, char* argv[]) {
   sandbox2::Comms comms(sandbox2::Comms::kSandbox2ClientCommsFD);
 
   // Exchange data with sandbox sandbox (parent) before sandboxing is enabled.

sandboxed_api/sandbox2/testcases/policy.cc

@@ -91,7 +91,7 @@ void TestIsatty() {
   exit(EXIT_FAILURE);
 }
 
-int main(int argc, char** argv) {
+int main(int argc, char* argv[]) {
   // Disable buffering.
   setbuf(stdin, nullptr);
   setbuf(stdout, nullptr);

sandboxed_api/sandbox2/testcases/print_fds.cc

@@ -18,7 +18,7 @@
 
 #include <cstdio>
 
-int main(int argc, char** argv) {
+int main(int argc, char* argv[]) {
   for (int fd = 0; fd < 4096; fd++) {
     if (fcntl(fd, F_GETFD) != -1) {
       printf("%d\n", fd);

sandboxed_api/sandbox2/testcases/sanitizer.cc

@@ -48,7 +48,7 @@ void TestOpenFd(int fd) {
   }
 }
 
-int main(int argc, char** argv) {
+int main(int argc, char* argv[]) {
   // Disable caching.
   setbuf(stdin, nullptr);
   setbuf(stdout, nullptr);

sandboxed_api/sandbox2/testcases/sleep.cc

@@ -14,7 +14,7 @@
 
 #include <unistd.h>
 
-int main(int argc, char** argv) {
+int main(int argc, char* argv[]) {
   sleep(10);
   return 0;
 }

sandboxed_api/sandbox2/testcases/symbolize.cc

@@ -65,7 +65,7 @@ void RunWritable() {
   SAPI_RAW_PCHECK(execv(tmpname.c_str(), argv) == 0, "Executing copied binary");
 }
 
-int main(int argc, char** argv) {
+int main(int argc, char* argv[]) {
   if (argc < 2) {
     printf("argc < 3\n");
     return EXIT_FAILURE;

sandboxed_api/sandbox2/testcases/tsync.cc

@@ -33,7 +33,7 @@ void* Sleepy(void*) {
   }
 }
 
-int main(int argc, char** argv) {
+int main(int argc, char* argv[]) {
   pthread_t thread;
 
   if (pthread_barrier_init(&g_barrier, nullptr, 2) < 0) {

sandboxed_api/tools/clang_generator/generator_tool.cc

@@ -103,9 +103,10 @@ GeneratorOptions GeneratorOptionsFromFlags(
   return options;
 }
 
-absl::Status GeneratorMain(int argc, const char** argv) {
+absl::Status GeneratorMain(int argc, char* argv[]) {
   auto expected_opt_parser = OptionsParser::create(
-      argc, argv, *sapi::g_tool_category, llvm::cl::ZeroOrMore,
+      argc, const_cast<const char**>(argv), *sapi::g_tool_category,
+      llvm::cl::ZeroOrMore,
       "Generates a Sandboxed API header for C/C++ translation units.");
   if (!expected_opt_parser) {
     return absl::InternalError(llvm::toString(expected_opt_parser.takeError()));
@@ -149,7 +150,7 @@ absl::Status GeneratorMain(int argc, const char** argv) {
 
 }  // namespace sapi
 
-int main(int argc, const char** argv) {
+int main(int argc, char* argv[]) {
   if (absl::Status status = sapi::GeneratorMain(argc, argv); !status.ok()) {
     absl::FPrintF(stderr, "%s\n", status.message());
     return EXIT_FAILURE;