diff --git a/src/safeguards.h b/src/safeguards.h index e3ae5326ac..02da05b918 100644 --- a/src/safeguards.h +++ b/src/safeguards.h @@ -36,7 +36,7 @@ #define strcpy SAFEGUARD_DO_NOT_USE_THIS_METHOD #define strncpy SAFEGUARD_DO_NOT_USE_THIS_METHOD -/* Use strecat instead. */ +/* Use std::string concatenation/fmt::format instead. */ #define strcat SAFEGUARD_DO_NOT_USE_THIS_METHOD #define strncat SAFEGUARD_DO_NOT_USE_THIS_METHOD diff --git a/src/string.cpp b/src/string.cpp index f55ebfbe24..c16ec8c540 100644 --- a/src/string.cpp +++ b/src/string.cpp @@ -49,33 +49,6 @@ #include "safeguards.h" #undef vsnprintf -/** - * Appends characters from one string to another. - * - * Appends the source string to the destination string with respect of the - * terminating null-character and and the last pointer to the last element - * in the destination buffer. If the last pointer is set to nullptr no - * boundary check is performed. - * - * @note usage: strecat(dst, src, lastof(dst)); - * @note lastof() applies only to fixed size arrays - * - * @param dst The buffer containing the target string - * @param src The buffer containing the string to append - * @param last The pointer to the last element of the destination buffer - * @return The pointer to the terminating null-character in the destination buffer - */ -char *strecat(char *dst, const char *src, const char *last) -{ - assert(dst <= last); - while (*dst != '\0') { - if (dst == last) return dst; - dst++; - } - - return strecpy(dst, src, last); -} - /** * Copies characters from one buffer to another. diff --git a/src/string_func.h b/src/string_func.h index 914cd064c3..d66a992f09 100644 --- a/src/string_func.h +++ b/src/string_func.h @@ -30,7 +30,6 @@ #include "core/span_type.hpp" #include "string_type.h" -char *strecat(char *dst, const char *src, const char *last) NOACCESS(3); char *strecpy(char *dst, const char *src, const char *last) NOACCESS(3); char *stredup(const char *src, const char *last = nullptr) NOACCESS(2); diff --git a/src/strings_internal.h b/src/strings_internal.h index 61a5745e4a..34a93e9cdc 100644 --- a/src/strings_internal.h +++ b/src/strings_internal.h @@ -122,7 +122,7 @@ public: } /** - * Add a string using the strecpy/strecat-esque calling signature. + * Add a string using the strecpy-esque calling signature. * @param function The function to pass the current and last location to, * that will then return the new current location. */