[Pcre-svn] [123] code/trunk/src: Remove some unused code and…

Revision: 123

          http://www.exim.org/viewvc/pcre2?view=rev&revision=123
Author:   ph10
Date:     2014-10-25 15:28:43 +0100 (Sat, 25 Oct 2014)

Log Message:
-----------
Remove some unused code and a spurious comment and reword one message.

Modified Paths:
--------------
    code/trunk/src/pcre2_compile.c
    code/trunk/src/pcre2_jit_misc.c
    code/trunk/src/pcre2test.c

Modified: code/trunk/src/pcre2_compile.c
===================================================================
--- code/trunk/src/pcre2_compile.c    2014-10-25 14:16:46 UTC (rev 122)
+++ code/trunk/src/pcre2_compile.c    2014-10-25 14:28:43 UTC (rev 123)
@@ -7677,22 +7677,6 @@
 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

Modified: code/trunk/src/pcre2_jit_misc.c
===================================================================
--- code/trunk/src/pcre2_jit_misc.c    2014-10-25 14:16:46 UTC (rev 122)
+++ code/trunk/src/pcre2_jit_misc.c    2014-10-25 14:28:43 UTC (rev 123)
@@ -83,15 +83,10 @@
 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 @@
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)

Modified: code/trunk/src/pcre2test.c
===================================================================
--- code/trunk/src/pcre2test.c    2014-10-25 14:16:46 UTC (rev 122)
+++ code/trunk/src/pcre2test.c    2014-10-25 14:28:43 UTC (rev 123)
@@ -5522,7 +5522,7 @@
     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
     }