From 29bcb9f54e7509a532395a1e4ccaa779e0a0b472 Mon Sep 17 00:00:00 2001
From: Kostya Serebryany <kcc@google.com>
Date: Sat, 13 Feb 2016 03:59:26 +0000
Subject: [PATCH] [libFuzzer] remove the C++-ish variant of FuzzerDriver from
 the interface

llvm-svn: 260801
---
 llvm/lib/Fuzzer/FuzzerDriver.cpp  | 13 +++++++------
 llvm/lib/Fuzzer/FuzzerInterface.h |  6 ------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/llvm/lib/Fuzzer/FuzzerDriver.cpp b/llvm/lib/Fuzzer/FuzzerDriver.cpp
index 16a1470..92971b7 100644
--- a/llvm/lib/Fuzzer/FuzzerDriver.cpp
+++ b/llvm/lib/Fuzzer/FuzzerDriver.cpp
@@ -241,12 +241,8 @@ static bool AllInputsAreFiles() {
   return true;
 }
 
-int FuzzerDriver(int argc, char **argv, UserCallback Callback) {
-  std::vector<std::string> Args(argv, argv + argc);
-  return FuzzerDriver(Args, Callback);
-}
-
-int FuzzerDriver(const std::vector<std::string> &Args, UserCallback Callback) {
+static int FuzzerDriver(const std::vector<std::string> &Args,
+                        UserCallback Callback) {
   using namespace fuzzer;
   assert(!Args.empty());
   ProgName = new std::string(Args[0]);
@@ -377,4 +373,9 @@ int FuzzerDriver(const std::vector<std::string> &Args, UserCallback Callback) {
   exit(0);  // Don't let F destroy itself.
 }
 
+int FuzzerDriver(int argc, char **argv, UserCallback Callback) {
+  std::vector<std::string> Args(argv, argv + argc);
+  return FuzzerDriver(Args, Callback);
+}
+
 }  // namespace fuzzer
diff --git a/llvm/lib/Fuzzer/FuzzerInterface.h b/llvm/lib/Fuzzer/FuzzerInterface.h
index 04e9b83..48a5c1b 100644
--- a/llvm/lib/Fuzzer/FuzzerInterface.h
+++ b/llvm/lib/Fuzzer/FuzzerInterface.h
@@ -16,11 +16,8 @@
 #ifndef LLVM_FUZZER_INTERFACE_H
 #define LLVM_FUZZER_INTERFACE_H
 
-#include <limits>
 #include <cstddef>
 #include <cstdint>
-#include <vector>
-#include <string>
 
 // Plain C interface. Should be sufficient for most uses.
 extern "C" {
@@ -73,9 +70,6 @@ int main(int argc, char **argv) {
 */
 int FuzzerDriver(int argc, char **argv, UserCallback Callback);
 
-/// More C++-ish interface.
-int FuzzerDriver(const std::vector<std::string> &Args, UserCallback Callback);
-
 // Same interface as LLVMFuzzerTestOneInput.
 // Can be used inside the user-supplied LLVMFuzzerTestOneInput.
 size_t Mutate(uint8_t *Data, size_t Size, size_t MaxSize, unsigned int Seed);
-- 
2.7.4