From 46678f2eacf278203d5570f1c683131316bb022d Mon Sep 17 00:00:00 2001
From: ridiculousfish <rf@fishshell.com>
Date: Tue, 31 May 2022 12:29:10 -0700
Subject: [PATCH] complete_add to take const wcstring& instead of const wchar_t
 *

An oversight that this wasn't done earlier. No functional change here.
---
 src/builtins/complete.cpp | 10 +++++-----
 src/complete.cpp          |  3 +--
 src/complete.h            |  2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/builtins/complete.cpp b/src/builtins/complete.cpp
index a4c293722..3243fe1b5 100644
--- a/src/builtins/complete.cpp
+++ b/src/builtins/complete.cpp
@@ -30,7 +30,7 @@
 // complete_add function only accepts one short switch and one long switch.
 
 /// Silly function.
-static void builtin_complete_add2(const wchar_t *cmd, bool cmd_is_path, const wchar_t *short_opt,
+static void builtin_complete_add2(const wcstring &cmd, bool cmd_is_path, const wchar_t *short_opt,
                                   const wcstring_list_t &gnu_opts, const wcstring_list_t &old_opts,
                                   completion_mode_t result_mode, const wcstring_list_t &condition,
                                   const wchar_t *comp, const wchar_t *desc,
@@ -63,13 +63,13 @@ static void builtin_complete_add(const wcstring_list_t &cmds, const wcstring_lis
                                  const wcstring_list_t &condition, const wchar_t *comp,
                                  const wchar_t *desc, complete_flags_t flags) {
     for (const wcstring &cmd : cmds) {
-        builtin_complete_add2(cmd.c_str(), false /* not path */, short_opt, gnu_opt, old_opt,
-                              result_mode, condition, comp, desc, flags);
+        builtin_complete_add2(cmd, false /* not path */, short_opt, gnu_opt, old_opt, result_mode,
+                              condition, comp, desc, flags);
     }
 
     for (const wcstring &path : paths) {
-        builtin_complete_add2(path.c_str(), true /* is path */, short_opt, gnu_opt, old_opt,
-                              result_mode, condition, comp, desc, flags);
+        builtin_complete_add2(path, true /* is path */, short_opt, gnu_opt, old_opt, result_mode,
+                              condition, comp, desc, flags);
     }
 }
 
diff --git a/src/complete.cpp b/src/complete.cpp
index 0689d5547..a36f7356d 100644
--- a/src/complete.cpp
+++ b/src/complete.cpp
@@ -1731,11 +1731,10 @@ void append_completion(completion_list_t *completions, wcstring comp, wcstring d
     completions->emplace_back(std::move(comp), std::move(desc), match, flags);
 }
 
-void complete_add(const wchar_t *cmd, bool cmd_is_path, const wcstring &option,
+void complete_add(const wcstring &cmd, bool cmd_is_path, const wcstring &option,
                   complete_option_type_t option_type, completion_mode_t result_mode,
                   wcstring_list_t condition, const wchar_t *comp, const wchar_t *desc,
                   complete_flags_t flags) {
-    assert(cmd && "Null command");
     // option should be empty iff the option type is arguments only.
     assert(option.empty() == (option_type == option_type_args_only));
 
diff --git a/src/complete.h b/src/complete.h
index 7d0fbb2b5..3606f7da1 100644
--- a/src/complete.h
+++ b/src/complete.h
@@ -224,7 +224,7 @@ void completions_sort_and_prioritize(completion_list_t *comps,
 /// \param condition a command to be run to check it this completion should be used. If \c condition
 /// is empty, the completion is always used.
 /// \param flags A set of completion flags
-void complete_add(const wchar_t *cmd, bool cmd_is_path, const wcstring &option,
+void complete_add(const wcstring &cmd, bool cmd_is_path, const wcstring &option,
                   complete_option_type_t option_type, completion_mode_t result_mode,
                   wcstring_list_t condition, const wchar_t *comp, const wchar_t *desc,
                   complete_flags_t flags);