Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixing string_utils types to FwSizeType #2884

Merged
merged 2 commits into from
Sep 24, 2024
Merged

Fixing string_utils types to FwSizeType #2884

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
14987c1
Fixing string_utils types to FwSizeType
LeStarch Sep 19, 2024
89506ec
Fixing precision reduction
LeStarch Sep 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Fw/Types/StringBase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
StringBase::~StringBase() {}

const CHAR* StringBase::operator+=(const CHAR* src) {
this->appendBuff(src, StringUtils::string_length(src, this->getCapacity()));
this->appendBuff(src, static_cast<SizeType>(StringUtils::string_length(src, this->getCapacity())));

Check warning

Code scanning / CodeQL

Unchecked function argument Warning

This use of parameter src has not been checked.
return this->toChar();
}

Expand Down
18 changes: 1 addition & 17 deletions Fw/Types/StringUtils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,6 @@
#include <cstring>
#include <limits>

char* Fw::StringUtils::string_copy(char* destination, const char* source, U32 num) {
// Check for size support
FW_ASSERT(std::numeric_limits<U32>::max() <= std::numeric_limits<FwSizeType>::max());
char* returned = Fw::StringUtils::string_copy(destination, source, static_cast<FwSizeType>(num));
return returned;
}

U32 Fw::StringUtils::string_length(const CHAR* source, U32 max_len) {
// Check for size support
FW_ASSERT(std::numeric_limits<U32>::max() <= std::numeric_limits<FwSizeType>::max());
FwSizeType returned = Fw::StringUtils::string_length(source, static_cast<FwSizeType>(max_len));
// Range checking for type remapping
FW_ASSERT(returned <= static_cast<FwSizeType>(std::numeric_limits<U32>::max()));
return static_cast<U32>(returned);
}

char* Fw::StringUtils::string_copy(char* destination, const char* source, FwSizeType num) {
// Handle self-copy and 0 bytes copy
if (destination == source || num == 0) {
Expand All @@ -37,7 +21,7 @@
}

FwSizeType Fw::StringUtils::string_length(const CHAR* source, FwSizeType max_len) {
U32 length = 0;
FwSizeType length = 0;

Check notice

Code scanning / CodeQL

Use of basic integral type Note

length uses the basic integral type unsigned long rather than a typedef with size and signedness.
FW_ASSERT(source != nullptr);
for (length = 0; length < max_len; length++) {
if (source[length] == '\0') {
Expand Down
28 changes: 0 additions & 28 deletions Fw/Types/StringUtils.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,34 +4,6 @@

namespace Fw {
namespace StringUtils {

/**
* \brief copy string with null-termination guaranteed
*
* Standard implementations of strncpy fail to guarantee the termination of a
* string with the null terminator. This implementation guarantees the string is
* properly null-terminated at the possible expense of the last character of the
* copied string being lost. The user is responsible for providing a destination
* large enough for the content and a null-character. Other behavior retains the
* behavior of strncpy.
*
* \param destination: destination buffer to hold copied contents
* \param source: source buffer to read content to copy
* \param num: length of destination buffer
* \return destination buffer
*/
char* string_copy(char* destination, const char* source, U32 num);

/**
* \brief get the length of the source string or max_len if the string is
* longer than max_len.
*
* \param source: string to calculate the length
* \param max_len: the maximum length of the source string
* \return length of the source string or max_len
*/
U32 string_length(const CHAR* source, U32 max_len);

/**
* \brief copy string with null-termination guaranteed
*
Expand Down
Loading