[Refactor] #3184 angband_strcat() の引数をconcptr からstring_view に変えた

diff --git a/src/autopick/autopick-describer.cpp b/src/autopick/autopick-describer.cpp
index 294a6f0..0a2ba07 100644 (file)
--- a/src/autopick/autopick-describer.cpp
+++ b/src/autopick/autopick-describer.cpp
@@ -231,7 +231,7 @@ static void describe_autpick_jp(char *buff, const autopick_type &entry, autopick
     if (describer->insc) {
         char tmp[MAX_INSCRIPTION + 1] = "";
         angband_strcat(tmp, describer->insc, MAX_INSCRIPTION);
-        angband_strcat(buff, format("に「%s」", tmp).data(), MAX_INSCRIPTION + 6);
+        angband_strcat(buff, format("に「%s」", tmp), MAX_INSCRIPTION + 6);
 
         if (angband_strstr(describer->insc, "%%all")) {
             strcat(buff, "(%%allは全能力を表す英字の記号で置換)");

diff --git a/src/util/string-processor.cpp b/src/util/string-processor.cpp
index 927bbea..be51b2a 100644 (file)
--- a/src/util/string-processor.cpp
+++ b/src/util/string-processor.cpp
@@ -463,13 +463,13 @@ size_t angband_strcpy(char *buf, std::string_view src, size_t bufsize)
  *
  * This function should be equivalent to the strlcat() function in BSD.
  */
-size_t angband_strcat(char *buf, concptr src, size_t bufsize)
+size_t angband_strcat(char *buf, std::string_view src, size_t bufsize)
 {
     size_t dlen = strlen(buf);
     if (dlen < bufsize - 1) {
         return dlen + angband_strcpy(buf + dlen, src, bufsize - dlen);
     } else {
-        return dlen + strlen(src);
+        return dlen + src.length();
     }
 }
 

diff --git a/src/util/string-processor.h b/src/util/string-processor.h
index 30cf0c5..57a0e0a 100644 (file)
--- a/src/util/string-processor.h
+++ b/src/util/string-processor.h
@@ -23,7 +23,7 @@ extern concptr macro_trigger_keycode[2][MAX_MACRO_TRIG];
 void text_to_ascii(char *buf, std::string_view sv, size_t bufsize);
 void ascii_to_text(char *buf, std::string_view sv, size_t bufsize);
 size_t angband_strcpy(char *buf, std::string_view src, size_t bufsize);
-size_t angband_strcat(char *buf, concptr src, size_t bufsize);
+size_t angband_strcat(char *buf, std::string_view src, size_t bufsize);
 char *angband_strstr(concptr haystack, concptr needle);
 char *angband_strchr(concptr ptr, char ch);
 char *ltrim(char *p);