Remove some unused code and a spurious comment and reword one message.

This commit is contained in:
Philip.Hazel 2014-10-25 14:28:43 +00:00
parent b23ec7e1f5
commit 56805a1246
3 changed files with 2 additions and 26 deletions

View File

@ -7677,22 +7677,6 @@ code follows after that. */
codestart = (PCRE2_SPTR)((uint8_t *)re + sizeof(pcre2_real_code)) + codestart = (PCRE2_SPTR)((uint8_t *)re + sizeof(pcre2_real_code)) +
re->name_entry_size * re->name_count; 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 /* 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 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 compile data block. The start/end pattern and initial options are already set

View File

@ -83,15 +83,10 @@ PCRE2_EXP_DEFN void PCRE2_CALL_CONVENTION
pcre2_jit_free_unused_memory(pcre2_general_context *gcontext) pcre2_jit_free_unused_memory(pcre2_general_context *gcontext)
{ {
#ifndef SUPPORT_JIT #ifndef SUPPORT_JIT
(void)gcontext; /* Suppress warning */ (void)gcontext; /* Suppress warning */
#else /* SUPPORT_JIT */ #else /* SUPPORT_JIT */
/* Dummy code */
SLJIT_UNUSED_ARG(gcontext); SLJIT_UNUSED_ARG(gcontext);
sljit_free_unused_memory_exec(); sljit_free_unused_memory_exec();
#endif /* SUPPORT_JIT */ #endif /* SUPPORT_JIT */
} }
@ -141,18 +136,15 @@ pcre2_jit_stack_assign(const pcre2_code *code, pcre2_jit_callback callback,
void *callback_data) void *callback_data)
{ {
#ifndef SUPPORT_JIT #ifndef SUPPORT_JIT
(void)code; (void)code;
(void)callback; (void)callback;
(void)callback_data; (void)callback_data;
#else /* SUPPORT_JIT */ #else /* SUPPORT_JIT */
pcre2_real_code *re = (pcre2_real_code *)code; pcre2_real_code *re = (pcre2_real_code *)code;
executable_functions *functions; executable_functions *functions;
if (re == NULL) if (re == NULL) return;
return;
functions = (executable_functions *)re->executable_jit; functions = (executable_functions *)re->executable_jit;
if (functions != NULL) if (functions != NULL)

View File

@ -5522,7 +5522,7 @@ while (argc > 1 && argv[op][0] == '-')
def_patctl.jit = 7; /* full & partial */ def_patctl.jit = 7; /* full & partial */
#ifndef SUPPORT_JIT #ifndef SUPPORT_JIT
fprintf(stderr, "** Warning: JIT support is not available: " fprintf(stderr, "** Warning: JIT support is not available: "
"-jit calls dummy functions.\n"); "-jit calls functions that do nothing.\n");
#endif #endif
} }