sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

nshlib: fix build break if CONFIG_CPP_HAVE_VARARGS if undefined

Browse Source 
ctc E272: ["nsh_ddcmd.c" 197/7] undeclared identifier "vtbl"

Signed-off-by: chao an <anchao@lixiang.com>
This commit is contained in:
chao an 2024-01-31 10:06:12 +08:00 committed by Xiang Xiao
parent 32f269a079
commit 0968264ac0
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
nshlib/nsh_ddcmd.c
View File

@ -184,6 +184,7 @@ static inline int dd_outfopen(FAR const char *name, FAR struct dd_s *dd)
static int dd_verify(FAR const char *infile, FAR const char *outfile, static int dd_verify(FAR const char *infile, FAR const char *outfile,
FAR struct dd_s *dd) FAR struct dd_s *dd)
{ {
FAR struct nsh_vtbl_s *vtbl = dd->vtbl;
FAR uint8_t *buffer; FAR uint8_t *buffer;
unsigned sector = 0; unsigned sector = 0;
int ret = OK; int ret = OK;
@ -194,7 +195,7 @@ static int dd_verify(FAR const char *infile, FAR const char *outfile,
ret = lseek(dd->infd, dd->skip ? dd->skip * dd->sectsize : 0, SEEK_SET); ret = lseek(dd->infd, dd->skip ? dd->skip * dd->sectsize : 0, SEEK_SET);
if (ret < 0) if (ret < 0)
{ {
nsh_error(dd->vtbl, g_fmtcmdfailed, g_dd, "lseek", NSH_ERRNO); nsh_error(vtbl, g_fmtcmdfailed, g_dd, "lseek", NSH_ERRNO);
return ret; return ret;
} }
@ -202,7 +203,7 @@ static int dd_verify(FAR const char *infile, FAR const char *outfile,
ret = lseek(dd->outfd, 0, SEEK_SET); ret = lseek(dd->outfd, 0, SEEK_SET);
if (ret < 0) if (ret < 0)
{ {
nsh_error(dd->vtbl, g_fmtcmdfailed, g_dd, "lseek", NSH_ERRNO); nsh_error(vtbl, g_fmtcmdfailed, g_dd, "lseek", NSH_ERRNO);
return ret; return ret;
} }
@ -223,7 +224,7 @@ static int dd_verify(FAR const char *infile, FAR const char *outfile,
ret = read(dd->outfd, buffer, dd->nbytes); ret = read(dd->outfd, buffer, dd->nbytes);
if (ret != dd->nbytes) if (ret != dd->nbytes)
{ {
nsh_error(dd->vtbl, g_fmtcmdfailed, g_dd, "read", NSH_ERRNO); nsh_error(vtbl, g_fmtcmdfailed, g_dd, "read", NSH_ERRNO);
break; break;
} }
@ -231,10 +232,10 @@ static int dd_verify(FAR const char *infile, FAR const char *outfile,
{ {
char msg[32]; char msg[32];
snprintf(msg, sizeof(msg), "infile sector %d", sector); snprintf(msg, sizeof(msg), "infile sector %d", sector);
nsh_dumpbuffer(dd->vtbl, msg, dd->buffer, dd->nbytes); nsh_dumpbuffer(vtbl, msg, dd->buffer, dd->nbytes);
snprintf(msg, sizeof(msg), "\noutfile sector %d", sector); snprintf(msg, sizeof(msg), "\noutfile sector %d", sector);
nsh_dumpbuffer(dd->vtbl, msg, buffer, dd->nbytes); nsh_dumpbuffer(vtbl, msg, buffer, dd->nbytes);
nsh_output(dd->vtbl, "\n"); nsh_output(vtbl, "\n");
ret = ERROR; ret = ERROR;
break; break;
} }
@ -244,7 +245,7 @@ static int dd_verify(FAR const char *infile, FAR const char *outfile,
if (ret < 0) if (ret < 0)
{ {
nsh_error(dd->vtbl, g_fmtcmdfailed, g_dd, "dd_verify", ret); nsh_error(vtbl, g_fmtcmdfailed, g_dd, "dd_verify", ret);
} }
free(buffer); free(buffer);