Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-03 06:28:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_Common: add return to strncpy_noterm

Browse Source
This commit is contained in:
bugobliterator 2023-01-06 23:03:34 +11:00 committed by Andrew Tridgell
parent c386f9bdcd
commit ac905caae9
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/AP_Common/AP_Common.cpp
View File

@ -74,14 +74,16 @@ bool hex_to_uint8(uint8_t a, uint8_t &res)
/* /*
strncpy without the warning for not leaving room for nul termination strncpy without the warning for not leaving room for nul termination
*/ */
void strncpy_noterm(char *dest, const char *src, size_t n) size_t strncpy_noterm(char *dest, const char *src, size_t n)
{ {
size_t len = strnlen(src, n); size_t len = strnlen(src, n);
size_t ret = len; // return value is length of src
if (len < n) { if (len < n) {
// include nul term if it fits // include nul term if it fits
len++; len++;
} }
memcpy(dest, src, len); memcpy(dest, src, len);
return ret;
} }
/** /**

2
libraries/AP_Common/AP_Common.h
View File

@ -158,7 +158,7 @@ bool hex_to_uint8(uint8_t a, uint8_t &res); // return the uint8 value of an asc
/* /*
strncpy without the warning for not leaving room for nul termination strncpy without the warning for not leaving room for nul termination
*/ */
void strncpy_noterm(char *dest, const char *src, size_t n); size_t strncpy_noterm(char *dest, const char *src, size_t n);
// return the numeric value of an ascii hex character // return the numeric value of an ascii hex character
int16_t char_to_hex(char a); int16_t char_to_hex(char a);