From 56805a1246dd952cedebfb92c84d72a8bdb1854f Mon Sep 17 00:00:00 2001
From: "Philip.Hazel" <Philip.Hazel@gmail.com>
Date: Sat, 25 Oct 2014 14:28:43 +0000
Subject: [PATCH] Remove some unused code and a spurious comment and reword one
 message.

---
 src/pcre2_compile.c  | 16 ----------------
 src/pcre2_jit_misc.c | 10 +---------
 src/pcre2test.c      |  2 +-
 3 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/src/pcre2_compile.c b/src/pcre2_compile.c
index dbffc98..062a7de 100644
--- a/src/pcre2_compile.c
+++ b/src/pcre2_compile.c
@@ -7677,22 +7677,6 @@ code follows after that. */
 codestart = (PCRE2_SPTR)((uint8_t *)re + sizeof(pcre2_real_code)) +
   re->name_entry_size * re->name_count;
 
-
-/* FIXME: Is this necessary? The nullpad field is at the end; it's there to
-help in the case when a regex compiled on a system with 4-byte pointers is run
-on another with 8-byte pointers. */
-
-#ifdef FIXME
-#if PCRE2_CODE_UNIT_WIDTH == 32
-re->dummy = 0;
-#else
-re->dummy1 = re->dummy2 = re->dummy3 = 0;
-#endif
-#endif
-
-
-
-
 /* Update the compile data block for the actual compile. The starting points of
 the name/number translation table and of the code are passed around in the
 compile data block. The start/end pattern and initial options are already set
diff --git a/src/pcre2_jit_misc.c b/src/pcre2_jit_misc.c
index a11f853..2b6da8b 100644
--- a/src/pcre2_jit_misc.c
+++ b/src/pcre2_jit_misc.c
@@ -83,15 +83,10 @@ PCRE2_EXP_DEFN void PCRE2_CALL_CONVENTION
 pcre2_jit_free_unused_memory(pcre2_general_context *gcontext)
 {
 #ifndef SUPPORT_JIT
-
 (void)gcontext;     /* Suppress warning */
-
 #else  /* SUPPORT_JIT */
-
-/* Dummy code */
 SLJIT_UNUSED_ARG(gcontext);
 sljit_free_unused_memory_exec();
-
 #endif  /* SUPPORT_JIT */
 }
 
@@ -141,18 +136,15 @@ pcre2_jit_stack_assign(const pcre2_code *code, pcre2_jit_callback callback,
   void *callback_data)
 {
 #ifndef SUPPORT_JIT
-
 (void)code;
 (void)callback;
 (void)callback_data;
-
 #else  /* SUPPORT_JIT */
 
 pcre2_real_code *re = (pcre2_real_code *)code;
 executable_functions *functions;
 
-if (re == NULL)
-  return;
+if (re == NULL) return;
 
 functions = (executable_functions *)re->executable_jit;
 if (functions != NULL)
diff --git a/src/pcre2test.c b/src/pcre2test.c
index 25e96ed..12f0d39 100644
--- a/src/pcre2test.c
+++ b/src/pcre2test.c
@@ -5522,7 +5522,7 @@ while (argc > 1 && argv[op][0] == '-')
     def_patctl.jit = 7;  /* full & partial */
 #ifndef SUPPORT_JIT
     fprintf(stderr, "** Warning: JIT support is not available: "
-                    "-jit calls dummy functions.\n");
+                    "-jit calls functions that do nothing.\n");
 #endif
     }