@@ -184,6 +184,7 @@ static inline int dd_outfopen(FAR const char *name, FAR struct dd_s *dd)
184
184
static int dd_verify (FAR const char * infile , FAR const char * outfile ,
185
185
FAR struct dd_s * dd )
186
186
{
187
+ FAR struct nsh_vtbl_s * vtbl = dd -> vtbl ;
187
188
FAR uint8_t * buffer ;
188
189
unsigned sector = 0 ;
189
190
int ret = OK ;
@@ -194,15 +195,15 @@ static int dd_verify(FAR const char *infile, FAR const char *outfile,
194
195
ret = lseek (dd -> infd , dd -> skip ? dd -> skip * dd -> sectsize : 0 , SEEK_SET );
195
196
if (ret < 0 )
196
197
{
197
- nsh_error (dd -> vtbl , g_fmtcmdfailed , g_dd , "lseek" , NSH_ERRNO );
198
+ nsh_error (vtbl , g_fmtcmdfailed , g_dd , "lseek" , NSH_ERRNO );
198
199
return ret ;
199
200
}
200
201
201
202
dd -> eof = 0 ;
202
203
ret = lseek (dd -> outfd , 0 , SEEK_SET );
203
204
if (ret < 0 )
204
205
{
205
- nsh_error (dd -> vtbl , g_fmtcmdfailed , g_dd , "lseek" , NSH_ERRNO );
206
+ nsh_error (vtbl , g_fmtcmdfailed , g_dd , "lseek" , NSH_ERRNO );
206
207
return ret ;
207
208
}
208
209
@@ -223,18 +224,18 @@ static int dd_verify(FAR const char *infile, FAR const char *outfile,
223
224
ret = read (dd -> outfd , buffer , dd -> nbytes );
224
225
if (ret != dd -> nbytes )
225
226
{
226
- nsh_error (dd -> vtbl , g_fmtcmdfailed , g_dd , "read" , NSH_ERRNO );
227
+ nsh_error (vtbl , g_fmtcmdfailed , g_dd , "read" , NSH_ERRNO );
227
228
break ;
228
229
}
229
230
230
231
if (memcmp (dd -> buffer , buffer , dd -> nbytes ) != 0 )
231
232
{
232
233
char msg [32 ];
233
234
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 );
235
236
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" );
238
239
ret = ERROR ;
239
240
break ;
240
241
}
@@ -244,7 +245,7 @@ static int dd_verify(FAR const char *infile, FAR const char *outfile,
244
245
245
246
if (ret < 0 )
246
247
{
247
- nsh_error (dd -> vtbl , g_fmtcmdfailed , g_dd , "dd_verify" , ret );
248
+ nsh_error (vtbl , g_fmtcmdfailed , g_dd , "dd_verify" , ret );
248
249
}
249
250
250
251
free (buffer );
0 commit comments