C++-ify compopt functions somewhat

diff --git a/src/compopt.cpp b/src/compopt.cpp
index 3d70b89e2d7d9f7f8a39f6c37e65582bb1303e9f..d4700d977cc12fe18b93fdc34404fabc9485bee7 100644 (file)
--- a/src/compopt.cpp
+++ b/src/compopt.cpp
@@ -147,10 +147,10 @@ compare_prefix_compopts(const void* key1, const void* key2)
 }
 
 static const struct compopt*
-find(const char* option)
+find(const std::string& option)
 {
   struct compopt key;
-  key.name = option;
+  key.name = option.c_str();
   void* result = bsearch(&key,
                          compopts,
                          ARRAY_SIZE(compopts),
@@ -160,10 +160,10 @@ find(const char* option)
 }
 
 static const struct compopt*
-find_prefix(const char* option)
+find_prefix(const std::string& option)
 {
   struct compopt key;
-  key.name = option;
+  key.name = option.c_str();
   void* result = bsearch(&key,
                          compopts,
                          ARRAY_SIZE(compopts),
@@ -174,11 +174,9 @@ find_prefix(const char* option)
 
 // Runs fn on the first two characters of option.
 bool
-compopt_short(bool (*fn)(const char*), const char* option)
+compopt_short(bool (*fn)(const std::string&), const std::string& option)
 {
-  char* short_opt = x_strndup(option, 2);
-  bool retval = fn(short_opt);
-  free(short_opt);
+  bool retval = fn(option.substr(0, 2));
   return retval;
 }
 
@@ -213,49 +211,49 @@ compopt_verify_sortedness_and_flags()
 }
 
 bool
-compopt_affects_cpp(const char* option)
+compopt_affects_cpp(const std::string& option)
 {
   const struct compopt* co = find(option);
   return co && (co->type & AFFECTS_CPP);
 }
 
 bool
-compopt_affects_comp(const char* option)
+compopt_affects_comp(const std::string& option)
 {
   const struct compopt* co = find(option);
   return co && (co->type & AFFECTS_COMP);
 }
 
 bool
-compopt_too_hard(const char* option)
+compopt_too_hard(const std::string& option)
 {
   const struct compopt* co = find(option);
   return co && (co->type & TOO_HARD);
 }
 
 bool
-compopt_too_hard_for_direct_mode(const char* option)
+compopt_too_hard_for_direct_mode(const std::string& option)
 {
   const struct compopt* co = find(option);
   return co && (co->type & TOO_HARD_DIRECT);
 }
 
 bool
-compopt_takes_path(const char* option)
+compopt_takes_path(const std::string& option)
 {
   const struct compopt* co = find(option);
   return co && (co->type & TAKES_PATH);
 }
 
 bool
-compopt_takes_arg(const char* option)
+compopt_takes_arg(const std::string& option)
 {
   const struct compopt* co = find(option);
   return co && (co->type & TAKES_ARG);
 }
 
 bool
-compopt_takes_concat_arg(const char* option)
+compopt_takes_concat_arg(const std::string& option)
 {
   const struct compopt* co = find(option);
   return co && (co->type & TAKES_CONCAT_ARG);
@@ -264,7 +262,7 @@ compopt_takes_concat_arg(const char* option)
 // Determines if the prefix of the option matches any option and affects the
 // preprocessor.
 bool
-compopt_prefix_affects_cpp(const char* option)
+compopt_prefix_affects_cpp(const std::string& option)
 {
   // Prefix options have to take concatenated args.
   const struct compopt* co = find_prefix(option);
@@ -274,7 +272,7 @@ compopt_prefix_affects_cpp(const char* option)
 // Determines if the prefix of the option matches any option and affects the
 // preprocessor.
 bool
-compopt_prefix_affects_comp(const char* option)
+compopt_prefix_affects_comp(const std::string& option)
 {
   // Prefix options have to take concatenated args.
   const struct compopt* co = find_prefix(option);

diff --git a/src/compopt.hpp b/src/compopt.hpp
index bb65369497bff81abc2f403fc9a82fb07dbe02ce..d6712d1f30cc311ec37ad4413938a0a678c8d6e4 100644 (file)
--- a/src/compopt.hpp
+++ b/src/compopt.hpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2010-2019 Joel Rosdahl and other contributors
+// Copyright (C) 2010-2020 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -20,13 +20,16 @@
 
 #include "system.hpp"
 
-bool compopt_short(bool (*fn)(const char* option), const char* option);
-bool compopt_affects_cpp(const char* option);
-bool compopt_affects_comp(const char* option);
-bool compopt_too_hard(const char* option);
-bool compopt_too_hard_for_direct_mode(const char* option);
-bool compopt_takes_path(const char* option);
-bool compopt_takes_arg(const char* option);
-bool compopt_takes_concat_arg(const char* option);
-bool compopt_prefix_affects_cpp(const char* option);
-bool compopt_prefix_affects_comp(const char* option);
+#include <string>
+
+bool compopt_short(bool (*fn)(const std::string& option),
+                   const std::string& option);
+bool compopt_affects_cpp(const std::string& option);
+bool compopt_affects_comp(const std::string& option);
+bool compopt_too_hard(const std::string& option);
+bool compopt_too_hard_for_direct_mode(const std::string& option);
+bool compopt_takes_path(const std::string& option);
+bool compopt_takes_arg(const std::string& option);
+bool compopt_takes_concat_arg(const std::string& option);
+bool compopt_prefix_affects_cpp(const std::string& option);
+bool compopt_prefix_affects_comp(const std::string& option);