Used strarray_owned_wrapper in tag_list_match method

Author: JohanMabille

src/subcommand/push_subcommand.cpp

@@ -7,7 +7,6 @@
 #include <git2/remote.h>
 
 #include "../utils/ansi_code.hpp"
-//#include "../utils/common.hpp"
 #include "../utils/credentials.hpp"
 #include "../utils/progress.hpp"
 #include "../wasm/scope.hpp"

src/subcommand/tag_subcommand.cpp

@@ -136,9 +136,9 @@ void tag_subcommand::list_tags(repository_wrapper& repo)
     std::string pattern = m_tag_name.empty() ? "*" : m_tag_name;
     auto tag_names = repo.tag_list_match(pattern);
 
-    for (const auto& tag_name : tag_names)
+    for (size_t i = 0u; i < tag_names.size(); ++i)
     {
-        each_tag(repo, tag_name, m_num_lines);
+        each_tag(repo, tag_names[i], m_num_lines);
     }
 }
 

src/wrapper/repository_wrapper.cpp

@@ -6,11 +6,11 @@
 
 #include "../utils/git_exception.hpp"
 #include "../wrapper/commit_wrapper.hpp"
+#include "../wrapper/config_wrapper.hpp"
+#include "../wrapper/diff_wrapper.hpp"
 #include "../wrapper/index_wrapper.hpp"
 #include "../wrapper/object_wrapper.hpp"
 #include "../wrapper/remote_wrapper.hpp"
-#include "config_wrapper.hpp"
-#include "diff_wrapper.hpp"
 
 repository_wrapper::~repository_wrapper()
 {
@@ -651,13 +651,10 @@ repository_wrapper::diff_index_to_workdir(std::optional<index_wrapper> index, gi
 
 // Tags
 
-std::vector<std::string> repository_wrapper::tag_list_match(std::string pattern)
+strarray_owned_wrapper repository_wrapper::tag_list_match(std::string pattern)
 {
-    git_strarray tag_names;
-    throw_if_error(git_tag_list_match(&tag_names, pattern.c_str(), *this));
-
-    std::vector<std::string> result(tag_names.strings, tag_names.strings + tag_names.count);
-
-    git_strarray_dispose(&tag_names);
-    return result;
+    strarray_owned_wrapper tag_names;
+    throw_if_error(git_tag_list_match(tag_names, pattern.c_str(), *this));
+    return tag_names;
 }
+

src/wrapper/repository_wrapper.hpp

@@ -19,6 +19,7 @@
 #include "../wrapper/remote_wrapper.hpp"
 #include "../wrapper/revwalk_wrapper.hpp"
 #include "../wrapper/signature_wrapper.hpp"
+#include "../wrapper/strarray_wrapper.hpp"
 #include "../wrapper/tree_wrapper.hpp"
 #include "../wrapper/wrapper_base.hpp"
 
@@ -134,8 +135,7 @@ class repository_wrapper : public wrapper_base<git_repository>
     diff_wrapper diff_index_to_workdir(std::optional<index_wrapper> index, git_diff_options* diffopts);
 
     // Tags
-    //  strarray_view_wrapper tag_list_match(std::string pattern);
-    std::vector<std::string> tag_list_match(std::string pattern);
+    strarray_owned_wrapper tag_list_match(std::string pattern);
 
 private:
 

src/wrapper/strarray_wrapper.cpp

@@ -38,7 +38,7 @@ size_t strarray_owned_wrapper::size() const
     return m_array.count;
 }
 
-std::string_view strarray_owned_wrapper::operator[](size_t i) const
+std::string strarray_owned_wrapper::operator[](size_t i) const
 {
     return { m_array.strings[i] };
 }

src/wrapper/strarray_wrapper.hpp

@@ -1,7 +1,6 @@
 #pragma once
 
 #include <string>
-#include <string_view>
 #include <vector>
 
 #include <git2.h>
@@ -27,7 +26,7 @@ class strarray_owned_wrapper
 
     size_t size() const;
 
-    std::string_view operator[](size_t i) const;
+    std::string operator[](size_t i) const;
 
 private: