commit fa8c9715587a24562dd755c44dc13aef43d7d875
author Christian Brabandt <cb@256bit.org> Thu Jan 25 20:50:49 2024 +0100
committer Christian Brabandt <cb@256bit.org> Thu Jan 25 20:50:49 2024 +0100
tree 99024c6ab86274c7daaf02b2c7bd9ad513e25006
parent f6ebaa7ae64edbe2e56d65c2a3f2494301d11acb

patch 9.1.0052: Patch 9.1.0041 causes regressions for users

Problem:  Patch 9.1.0041 causes regressions for users
          (Gleb Fotengauer-Malinovskiy)
Solution: Revert 9.1.0041 and restore old behaviour

Revert "patch 9.1.0041: xxd -i may generate incorrect C statements"

This reverts commit 7062be13129985fe297b9a8e59c57b8f0db61b8f.

Signed-off-by: Christian Brabandt <cb@256bit.org>

src/testdir/test_xxd.vim

diff --git a/src/testdir/test_xxd.vim b/src/testdir/test_xxd.vim
index a3f006b..7a2771e 100644
--- a/src/testdir/test_xxd.vim
+++ b/src/testdir/test_xxd.vim
@@ -103,7 +103,7 @@
     unsigned char XXDfile[] = {
       0x54, 0x45, 0x53, 0x54, 0x61, 0x62, 0x63, 0x64, 0x30, 0x39, 0x0a
     };
-    size_t XXDfile_len = 11;
+    unsigned int XXDfile_len = 11;
   [CODE]
 
   call assert_equal(expected, getline(1,'$'), s:Mess(s:test))
@@ -119,7 +119,7 @@
       unsigned char XXDFILE[] = {
         0x54, 0x45, 0x53, 0x54, 0x61, 0x62, 0x63, 0x64, 0x30, 0x39, 0x0a
       };
-      size_t XXDFILE_LEN = 11;
+      unsigned int XXDFILE_LEN = 11;
     [CODE]
     call assert_equal(expected, getline(1,'$'), s:Mess(s:test))
   endfor
@@ -233,7 +233,7 @@
       unsigned char varName[] = {
         0x54, 0x45, 0x53, 0x54, 0x61, 0x62, 0x63, 0x64, 0x30, 0x39, 0x0a
       };
-      size_t varName_len = 11;
+      unsigned int varName_len = 11;
     [CODE]
 
     call assert_equal(expected, getline(1,'$'), s:Mess(s:test))
@@ -247,7 +247,7 @@
     unsigned char StdIn[] = {
       0x54, 0x45, 0x53, 0x54, 0x61, 0x62, 0x63, 0x64, 0x30, 0x39, 0x0a
     };
-    size_t StdIn_len = 11;
+    unsigned int StdIn_len = 11;
   [CODE]
   call assert_equal(expected, getline(1,'$'), s:Mess(s:test))
 
@@ -263,7 +263,7 @@
       unsigned char VARNAME[] = {
         0x54, 0x45, 0x53, 0x54, 0x61, 0x62, 0x63, 0x64, 0x30, 0x39, 0x0a
       };
-      size_t VARNAME_LEN = 11;
+      unsigned int VARNAME_LEN = 11;
     [CODE]
     call assert_equal(expected, getline(1,'$'), s:Mess(s:test))
   endfor

src/version.c

diff --git a/src/version.c b/src/version.c
index a21d043..8b278c5 100644
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    52,
+/**/
     51,
 /**/
     50,

src/xxd/xxd.c

diff --git a/src/xxd/xxd.c b/src/xxd/xxd.c
index 75de982..a5f5f04 100644
--- a/src/xxd/xxd.c
+++ b/src/xxd/xxd.c
@@ -60,6 +60,7 @@
  * 06.10.2023  enable -r -b to reverse bit dumps
  * 12.01.2024  disable auto-conversion for z/OS (MVS)
  * 17.01.2024  use size_t instead of usigned int for code-generation (-i), #13876
+ * 25.01.2024  revert the previous patch (size_t instead of unsigned int)
  *
  * (c) 1990-1998 by Juergen Weigert (jnweiger@gmail.com)
  *
@@ -140,7 +141,7 @@
 # endif
 #endif
 
-char version[] = "xxd 2024-01-17 by Juergen Weigert et al.";
+char version[] = "xxd 2024-01-25 by Juergen Weigert et al.";
 #ifdef WIN32
 char osver[] = " (Win32)";
 #else
@@ -978,7 +979,7 @@
       if (varname != NULL)
 	{
 	  fputs_or_die("};\n", fpo);
-	  FPRINTF_OR_DIE((fpo, "size_t %s", isdigit((unsigned char)varname[0]) ? "__" : ""));
+	  FPRINTF_OR_DIE((fpo, "unsigned int %s", isdigit((unsigned char)varname[0]) ? "__" : ""));
 	  for (e = 0; (c = varname[e]) != 0; e++)
 	    putc_or_die(isalnum((unsigned char)c) ? CONDITIONAL_CAPITALIZE(c) : '_', fpo);
 	  FPRINTF_OR_DIE((fpo, "_%s = %d;\n", capitalize ? "LEN" : "len", p));