# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1637582405 -3600
# Node ID d757c9c87a583bdd369fed8b500f900554b16b6f
# Parent  786b2a8ec97076ecd4d3d614320c1de82ad7da36
patch 8.2.3641: xxd code has duplicate expressions

Commit: https://github.com/vim/vim/commit/581f41adb3ba1dc95bf4fc7c434427e1203be5e8
Author: DungSaga <dungsaga@users.noreply.github.com>
Date:   Mon Nov 22 11:57:31 2021 +0000

    patch 8.2.3641: xxd code has duplicate expressions

    Problem:    Xxd code has duplicate expressions.
    Solution:   Refactor to avoid duplication. (closes https://github.com/vim/vim/issues/9185)

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 */
 /**/
+    3641,
+/**/
     3640,
 /**/
     3639,
diff --git a/src/xxd/xxd.c b/src/xxd/xxd.c
--- a/src/xxd/xxd.c
+++ b/src/xxd/xxd.c
@@ -811,24 +811,16 @@ main(int argc, char *argv[])
     {
       if (p == 0)
 	{
-	  if (decimal_offset)
-		addrlen = sprintf(l, "%08ld:",
-				  ((unsigned long)(n + seekoff + displayoff)));
-	  else
-		addrlen = sprintf(l, "%08lx:",
+	  addrlen = sprintf(l, decimal_offset ? "%08ld:" : "%08lx:",
 				  ((unsigned long)(n + seekoff + displayoff)));
 	  for (c = addrlen; c < LLEN; l[c++] = ' ');
 	}
-      if (hextype == HEX_NORMAL)
+      if (hextype == HEX_NORMAL || hextype == HEX_LITTLEENDIAN)
 	{
-	  l[c = (addrlen + 1 + (grplen * p) / octspergrp)] = hexx[(e >> 4) & 0xf];
-	  l[++c]				  = hexx[ e       & 0xf];
-	}
-      else if (hextype == HEX_LITTLEENDIAN)
-	{
-	  int x = p ^ (octspergrp-1);
-	  l[c = (addrlen + 1 + (grplen * x) / octspergrp)] = hexx[(e >> 4) & 0xf];
-	  l[++c]				  = hexx[ e       & 0xf];
+	  int x = hextype == HEX_NORMAL ? p : p ^ (octspergrp-1);
+	  l[c = (addrlen + 1 + (grplen * x) / octspergrp)]
+	         = hexx[(e >> 4) & 0xf];
+	  l[++c] = hexx[e & 0xf];
 	}
       else /* hextype == HEX_BITS */
 	{