# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1634408103 -7200
# Node ID 0ff315dd0c48dfbd4f816eccff2251e34eb67089
# Parent  05065e623c89468648d7c54d39ae9fc1b989a2c7
patch 8.2.3523: duplicated code in xxd

Commit: https://github.com/vim/vim/commit/c89c91cafd91fbf17f431d800bbf4cafcffffe7a
Author: DungSaga <dungsaga@users.noreply.github.com>
Date:   Sat Oct 16 19:07:46 2021 +0100

    patch 8.2.3523: duplicated code in xxd

    Problem:    Duplicated code in xxd.
    Solution:   Remove duplicated lines. (closes https://github.com/vim/vim/issues/8972)

diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    3523,
+/**/
     3522,
 /**/
     3521,
diff --git a/src/xxd/xxd.c b/src/xxd/xxd.c
--- a/src/xxd/xxd.c
+++ b/src/xxd/xxd.c
@@ -346,16 +346,12 @@ huntype(
 	  n1 = -1;
 	  if ((++p >= cols) && !hextype)
 	    {
-	      /* skip rest of line as garbage */
-	      want_off = 0;
-	      while ((c = getc(fpi)) != '\n' && c != EOF)
-		;
-	      if (c == EOF && ferror(fpi))
-		die(2);
-	      ign_garb = 1;
+	      /* skip the rest of the line as garbage */
+	      n2 = -1;
+	      n3 = -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 */
 	  if (!hextype)