Skip to content

Commit 0968264

Browse files
anchaoxiaoxiang781216
authored andcommitted
nshlib: fix build break if CONFIG_CPP_HAVE_VARARGS if undefined
ctc E272: ["nsh_ddcmd.c" 197/7] undeclared identifier "vtbl" Signed-off-by: chao an <anchao@lixiang.com>
1 parent 32f269a commit 0968264

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

nshlib/nsh_ddcmd.c

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,7 @@ static inline int dd_outfopen(FAR const char *name, FAR struct dd_s *dd)
184184
static int dd_verify(FAR const char *infile, FAR const char *outfile,
185185
FAR struct dd_s *dd)
186186
{
187+
FAR struct nsh_vtbl_s *vtbl = dd->vtbl;
187188
FAR uint8_t *buffer;
188189
unsigned sector = 0;
189190
int ret = OK;
@@ -194,15 +195,15 @@ static int dd_verify(FAR const char *infile, FAR const char *outfile,
194195
ret = lseek(dd->infd, dd->skip ? dd->skip * dd->sectsize : 0, SEEK_SET);
195196
if (ret < 0)
196197
{
197-
nsh_error(dd->vtbl, g_fmtcmdfailed, g_dd, "lseek", NSH_ERRNO);
198+
nsh_error(vtbl, g_fmtcmdfailed, g_dd, "lseek", NSH_ERRNO);
198199
return ret;
199200
}
200201

201202
dd->eof = 0;
202203
ret = lseek(dd->outfd, 0, SEEK_SET);
203204
if (ret < 0)
204205
{
205-
nsh_error(dd->vtbl, g_fmtcmdfailed, g_dd, "lseek", NSH_ERRNO);
206+
nsh_error(vtbl, g_fmtcmdfailed, g_dd, "lseek", NSH_ERRNO);
206207
return ret;
207208
}
208209

@@ -223,18 +224,18 @@ static int dd_verify(FAR const char *infile, FAR const char *outfile,
223224
ret = read(dd->outfd, buffer, dd->nbytes);
224225
if (ret != dd->nbytes)
225226
{
226-
nsh_error(dd->vtbl, g_fmtcmdfailed, g_dd, "read", NSH_ERRNO);
227+
nsh_error(vtbl, g_fmtcmdfailed, g_dd, "read", NSH_ERRNO);
227228
break;
228229
}
229230

230231
if (memcmp(dd->buffer, buffer, dd->nbytes) != 0)
231232
{
232233
char msg[32];
233234
snprintf(msg, sizeof(msg), "infile sector %d", sector);
234-
nsh_dumpbuffer(dd->vtbl, msg, dd->buffer, dd->nbytes);
235+
nsh_dumpbuffer(vtbl, msg, dd->buffer, dd->nbytes);
235236
snprintf(msg, sizeof(msg), "\noutfile sector %d", sector);
236-
nsh_dumpbuffer(dd->vtbl, msg, buffer, dd->nbytes);
237-
nsh_output(dd->vtbl, "\n");
237+
nsh_dumpbuffer(vtbl, msg, buffer, dd->nbytes);
238+
nsh_output(vtbl, "\n");
238239
ret = ERROR;
239240
break;
240241
}
@@ -244,7 +245,7 @@ static int dd_verify(FAR const char *infile, FAR const char *outfile,
244245

245246
if (ret < 0)
246247
{
247-
nsh_error(dd->vtbl, g_fmtcmdfailed, g_dd, "dd_verify", ret);
248+
nsh_error(vtbl, g_fmtcmdfailed, g_dd, "dd_verify", ret);
248249
}
249250

250251
free(buffer);

0 commit comments

Comments
 (0)