aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.2.3523: duplicated code in xxd

Browse Source 
Problem:    Duplicated code in xxd.
Solution:   Remove duplicated lines. (closes #8972)
This commit is contained in:
DungSaga 2021-10-16 19:07:46 +01:00 committed by Bram Moolenaar
parent 93ff6720fe
commit c89c91cafd
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/version.c
View File

@ -757,6 +757,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
3523,
/**/ /**/
3522, 3522,
/**/ /**/

12
src/xxd/xxd.c
View File

@ -346,16 +346,12 @@ huntype(
n1 = -1; n1 = -1;
if ((++p >= cols) && !hextype) if ((++p >= cols) && !hextype)
{ {
/* skip rest of line as garbage */ /* skip the rest of the line as garbage */
want_off = 0; n2 = -1;
while ((c = getc(fpi)) != '\n' && c != EOF) n3 = -1;
;
if (c == EOF && ferror(fpi))
die(2);
ign_garb = 1;
} }
} }
else if (n1 < 0 && n2 < 0 && n3 < 0) if (n1 < 0 && n2 < 0 && n3 < 0)
{ {
/* already stumbled into garbage, skip line, wait and see */ /* already stumbled into garbage, skip line, wait and see */
if (!hextype) if (!hextype)