mirror of
https://github.com/gnss-sdr/gnss-sdr
synced 2025-05-01 23:14:11 +00:00
Replace use of strlen and strncpy by C++ counterparts
This commit is contained in:
parent
77eb09c2a7
commit
d6fec67489
@ -66,7 +66,7 @@
|
|||||||
/* Strip whitespace chars off end of given string, in place. Return s. */
|
/* Strip whitespace chars off end of given string, in place. Return s. */
|
||||||
static char* rstrip(char* s)
|
static char* rstrip(char* s)
|
||||||
{
|
{
|
||||||
char* p = s + strlen(s);
|
char* p = s + std::char_traits<char>::length(s);
|
||||||
while (p > s && isspace(*--p))
|
while (p > s && isspace(*--p))
|
||||||
*p = '\0';
|
*p = '\0';
|
||||||
return s;
|
return s;
|
||||||
@ -92,7 +92,10 @@ static char* find_char_or_comment(const char* s, char c)
|
|||||||
/* Version of strncpy that ensures dest (size bytes) is null-terminated. */
|
/* Version of strncpy that ensures dest (size bytes) is null-terminated. */
|
||||||
static char* strncpy0(char* dest, const char* src, size_t size)
|
static char* strncpy0(char* dest, const char* src, size_t size)
|
||||||
{
|
{
|
||||||
strncpy(dest, src, size);
|
for(unsigned int i = 0; i < size - 1; i++)
|
||||||
|
{
|
||||||
|
dest[i] = src [i];
|
||||||
|
}
|
||||||
dest[size - 1] = '\0';
|
dest[size - 1] = '\0';
|
||||||
return dest;
|
return dest;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user