Aksal/nuttx-apps
1
0
Fork 1
mirror of https://github.com/apache/nuttx-apps.git synced 2026-08-01 20:29:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

nxscope: use the entire reserved channel length when sending strings

Browse source 
The previous version makes stream data parser too complicated and susceptible to errors.
This commit is contained in:
raiden00pl 2023-02-07 20:40:24 +01:00 • committed by Xiang Xiao
parent ee1e84a261
commit 220a5a2ce6
2 changed files with 3 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

18
include/logging/nxscope/nxscope_chan.h
View file

@ -224,15 +224,6 @@ int nxscope_put_vub32_m(FAR struct nxscope_s *s, uint8_t ch,
int nxscope_put_vb32_m(FAR struct nxscope_s *s, uint8_t ch,
FAR b32_t *val, uint8_t d,
FAR uint8_t *meta, uint8_t mlen);
/****************************************************************************
* Name: nxscope_put_vchar_m
*
* NOTE: if a given string is shorten than initialized channel vdim,
* we put only string bytes + '\0'
*
****************************************************************************/
int nxscope_put_vchar_m(FAR struct nxscope_s *s, uint8_t ch,
FAR char *val, uint8_t d,
FAR uint8_t *meta, uint8_t mlen);
@ -283,15 +274,6 @@ int nxscope_put_vub32(FAR struct nxscope_s *s, uint8_t ch,
FAR ub32_t *val, uint8_t d);
int nxscope_put_vb32(FAR struct nxscope_s *s, uint8_t ch,
FAR b32_t *val, uint8_t d);
/****************************************************************************
* Name: nxscope_put_vchar
*
* NOTE: if a given string is shorten than initialized channel vdim,
* we put only string bytes + '\0'
*
****************************************************************************/
int nxscope_put_vchar(FAR struct nxscope_s *s, uint8_t ch,
FAR char *val, uint8_t d);

5
logging/nxscope/nxscope_chan.c
View file

@ -360,13 +360,14 @@ static int nxscope_put_vector(FAR uint8_t *buff, uint8_t type, FAR void *val,
case NXSCOPE_TYPE_CHAR:
{
/* Copy only string bytes + '\0' */
/* Copy string bytes and fill with '\0' */
DEBUGASSERT(val);
strncpy((FAR char *)buff, (FAR const char *)val, d);
j += strnlen((FAR char *)buff, d);
buff[j++] = '\0';
memset(&buff[j], '\0', d - j);
j = d;
break;
}