admin/mlib
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rewrite the wrappers of strncpy & strncat:

Browse Source 
Add one argument about the allocation of the dest buffer
Theses wrappers are internal (so no impact to API)
and only used in a few place in m-string.
This make the wrappers able to use the function
strncpy_s & strncat_s for MSVC rather than using
reimplementation of the original functions.
This commit is contained in:
Patrick Pelissier committed 2021-01-13 08:34:47 +01:00
1 parent 561f67b3b9
commit cd357c5eb7
2 files changed
+16 -42
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

m-string.h
+7 -7
View File
@@ -2035,7 +2035,7 @@ namespace m_lib {
M_C(name, _set_str)(bounded_t s, const char str[]) \
{ \
BOUNDED_STRINGI_CONTRACT(s, max_size); \
m_core_strncpy(s->s, str, max_size); \
m_core_strncpy(s->s, max_size+1, str, max_size); \
BOUNDED_STRINGI_CONTRACT(s, max_size); \
} \
\
@@ -2045,7 +2045,7 @@ namespace m_lib {
BOUNDED_STRINGI_CONTRACT(s, max_size); \
M_ASSERT(str != NULL); \
size_t len = M_MIN(max_size, n); \
m_core_strncpy(s->s, str, len); \
m_core_strncpy(s->s, max_size+1, str, len); \
s->s[len] = 0; \
BOUNDED_STRINGI_CONTRACT(s, max_size); \
} \
@@ -2095,7 +2095,7 @@ namespace m_lib {
BOUNDED_STRINGI_CONTRACT(s, max_size); \
M_ASSERT (str != NULL); \
M_ASSERT_INDEX (strlen(s->s), max_size+1); \
m_core_strncat(s->s, str, max_size-strlen(s->s)); \
m_core_strncat(s->s, max_size+1, str, max_size-strlen(s->s)); \
} \
\
static inline void \
@@ -2256,7 +2256,7 @@ namespace m_lib {
string_t v2; \
string_init(v2); \
bool ret = string_in_str(v2, f); \
m_core_strncpy(v->s, string_get_cstr(v2), max_size); \
m_core_strncpy(v->s, max_size+1, string_get_cstr(v2), max_size); \
string_clear(v2); \
return ret; \
} \
@@ -2269,7 +2269,7 @@ namespace m_lib {
string_t v2; \
string_init(v2); \
bool ret = string_parse_str(v2, str, endptr); \
m_core_strncpy(v->s, string_get_cstr(v2), max_size); \
m_core_strncpy(v->s, max_size+1, string_get_cstr(v2), max_size); \
string_clear(v2); \
return ret; \
} \
@@ -2291,7 +2291,7 @@ namespace m_lib {
/* TODO: Not optimum */ \
string_init(tmp); \
m_serial_return_code_t r = serial->m_interface->read_string(serial, tmp); \
m_core_strncpy(v->s, string_get_cstr(tmp), max_size); \
m_core_strncpy(v->s, max_size+1, string_get_cstr(tmp), max_size); \
string_clear(tmp); \
BOUNDED_STRINGI_CONTRACT(v, max_size); \
return r; \
@@ -2314,7 +2314,7 @@ namespace m_lib {
inline m_bounded_string(const char lstr[])
{
memset(this->s, 0, N);
m_core_strncpy(this->s, lstr, N-1);
m_core_strncpy(this->s, N, lstr, N-1);
}
};
}