walkero
/
pcre2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Add PCRE2_CALL_CONVENTION into prototypes.

This commit is contained in:
Philip.Hazel 2016-11-19 12:46:24 +00:00
parent e0cccdd028
commit 2ce680f2f5
4 changed files with 304 additions and 246 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -167,6 +167,10 @@ obsolete these days and in any case had become very haphazard.
23. Fix an off-by-one bug in pcre2test for the list of names for 'get' and 23. Fix an off-by-one bug in pcre2test for the list of names for 'get' and
'copy' modifiers. 'copy' modifiers.
24. Add PCRE2_CALL_CONVENTION into the prototype declarations in pcre2.h as it
is apparently needed there as well as in the function definitions. (Why did
nobody ask for this in PCRE1?)
Version 10.22 29-July-2016 Version 10.22 29-July-2016
-------------------------- --------------------------

258
src/pcre2.h
View File

@ -67,6 +67,20 @@ don't change existing definitions of PCRE2_EXP_DECL. */
# endif # endif
#endif #endif
/* When compiling with the MSVC compiler, it is sometimes necessary to include
a "calling convention" before exported function names. (This is secondhand
information; I know nothing about MSVC myself). For example, something like
void __cdecl function(....)
might be needed. In order so make this easy, all the exported functions have
PCRE2_CALL_CONVENTION just before their names. It is rarely needed; if not
set, we ensure here that it has no effect. */
#ifndef PCRE2_CALL_CONVENTION
#define PCRE2_CALL_CONVENTION
#endif
/* Have to include limits.h, stdlib.h and stdint.h to ensure that size_t and /* Have to include limits.h, stdlib.h and stdint.h to ensure that size_t and
uint8_t, UCHAR_MAX, etc are defined. */ uint8_t, UCHAR_MAX, etc are defined. */
@ -386,170 +400,190 @@ expanded for each width below. Start with functions that give general
information. */ information. */
#define PCRE2_GENERAL_INFO_FUNCTIONS \ #define PCRE2_GENERAL_INFO_FUNCTIONS \
PCRE2_EXP_DECL int pcre2_config(uint32_t, void *); PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION pcre2_config(uint32_t, void *);
/* Functions for manipulating contexts. */ /* Functions for manipulating contexts. */
#define PCRE2_GENERAL_CONTEXT_FUNCTIONS \ #define PCRE2_GENERAL_CONTEXT_FUNCTIONS \
PCRE2_EXP_DECL \ PCRE2_EXP_DECL pcre2_general_context PCRE2_CALL_CONVENTION \
pcre2_general_context *pcre2_general_context_copy(pcre2_general_context *); \ *pcre2_general_context_copy(pcre2_general_context *); \
PCRE2_EXP_DECL \ PCRE2_EXP_DECL pcre2_general_context PCRE2_CALL_CONVENTION \
pcre2_general_context *pcre2_general_context_create( \ *pcre2_general_context_create(void *(*)(PCRE2_SIZE, void *), \
void *(*)(PCRE2_SIZE, void *), \
void (*)(void *, void *), void *); \ void (*)(void *, void *), void *); \
PCRE2_EXP_DECL void pcre2_general_context_free(pcre2_general_context *); PCRE2_EXP_DECL void PCRE2_CALL_CONVENTION \
pcre2_general_context_free(pcre2_general_context *);
#define PCRE2_COMPILE_CONTEXT_FUNCTIONS \ #define PCRE2_COMPILE_CONTEXT_FUNCTIONS \
PCRE2_EXP_DECL \ PCRE2_EXP_DECL pcre2_compile_context PCRE2_CALL_CONVENTION \
pcre2_compile_context *pcre2_compile_context_copy(pcre2_compile_context *); \ *pcre2_compile_context_copy(pcre2_compile_context *); \
PCRE2_EXP_DECL \ PCRE2_EXP_DECL pcre2_compile_context PCRE2_CALL_CONVENTION \
pcre2_compile_context *pcre2_compile_context_create(pcre2_general_context *);\ *pcre2_compile_context_create(pcre2_general_context *);\
PCRE2_EXP_DECL void pcre2_compile_context_free(pcre2_compile_context *); \ PCRE2_EXP_DECL void PCRE2_CALL_CONVENTION \
PCRE2_EXP_DECL int pcre2_set_bsr(pcre2_compile_context *, uint32_t); \ pcre2_compile_context_free(pcre2_compile_context *); \
PCRE2_EXP_DECL int pcre2_set_character_tables(pcre2_compile_context *, \ PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
const unsigned char *); \ pcre2_set_bsr(pcre2_compile_context *, uint32_t); \
PCRE2_EXP_DECL int pcre2_set_max_pattern_length(pcre2_compile_context *, \ PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
PCRE2_SIZE); \ pcre2_set_character_tables(pcre2_compile_context *, const unsigned char *); \
PCRE2_EXP_DECL int pcre2_set_newline(pcre2_compile_context *, uint32_t); \ PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
PCRE2_EXP_DECL int pcre2_set_parens_nest_limit(pcre2_compile_context *, \ pcre2_set_max_pattern_length(pcre2_compile_context *, PCRE2_SIZE); \
uint32_t); \ PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
PCRE2_EXP_DECL int pcre2_set_compile_recursion_guard(\ pcre2_set_newline(pcre2_compile_context *, uint32_t); \
pcre2_compile_context *, int (*)(uint32_t, void *), \ PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
void *); pcre2_set_parens_nest_limit(pcre2_compile_context *, uint32_t); \
PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
pcre2_set_compile_recursion_guard(pcre2_compile_context *, \
int (*)(uint32_t, void *), void *);
#define PCRE2_MATCH_CONTEXT_FUNCTIONS \ #define PCRE2_MATCH_CONTEXT_FUNCTIONS \
PCRE2_EXP_DECL \ PCRE2_EXP_DECL pcre2_match_context PCRE2_CALL_CONVENTION \
pcre2_match_context *pcre2_match_context_copy(pcre2_match_context *); \ *pcre2_match_context_copy(pcre2_match_context *); \
PCRE2_EXP_DECL \ PCRE2_EXP_DECL pcre2_match_context PCRE2_CALL_CONVENTION \
pcre2_match_context *pcre2_match_context_create(pcre2_general_context *); \ *pcre2_match_context_create(pcre2_general_context *); \
PCRE2_EXP_DECL void pcre2_match_context_free(pcre2_match_context *); \ PCRE2_EXP_DECL void PCRE2_CALL_CONVENTION \
PCRE2_EXP_DECL int pcre2_set_callout(pcre2_match_context *, \ pcre2_match_context_free(pcre2_match_context *); \
PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
pcre2_set_callout(pcre2_match_context *, \
int (*)(pcre2_callout_block *, void *), void *); \ int (*)(pcre2_callout_block *, void *), void *); \
PCRE2_EXP_DECL int pcre2_set_match_limit(pcre2_match_context *, \ PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
uint32_t); \ pcre2_set_match_limit(pcre2_match_context *, uint32_t); \
PCRE2_EXP_DECL int pcre2_set_offset_limit(pcre2_match_context *, \ PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
PCRE2_SIZE); \ pcre2_set_offset_limit(pcre2_match_context *, PCRE2_SIZE); \
PCRE2_EXP_DECL int pcre2_set_recursion_limit(pcre2_match_context *, \ PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
uint32_t); \ pcre2_set_recursion_limit(pcre2_match_context *, uint32_t); \
PCRE2_EXP_DECL int pcre2_set_recursion_memory_management( \ PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
pcre2_match_context *, void *(*)(PCRE2_SIZE, void *), \ pcre2_set_recursion_memory_management(pcre2_match_context *, \
void (*)(void *, void *), void *); void *(*)(PCRE2_SIZE, void *), void (*)(void *, void *), void *);
/* Functions concerned with compiling a pattern to PCRE internal code. */ /* Functions concerned with compiling a pattern to PCRE internal code. */
#define PCRE2_COMPILE_FUNCTIONS \ #define PCRE2_COMPILE_FUNCTIONS \
PCRE2_EXP_DECL \ PCRE2_EXP_DECL pcre2_code PCRE2_CALL_CONVENTION \
pcre2_code *pcre2_compile(PCRE2_SPTR, PCRE2_SIZE, uint32_t, \ *pcre2_compile(PCRE2_SPTR, PCRE2_SIZE, uint32_t, int *, PCRE2_SIZE *, \
int *, PCRE2_SIZE *, pcre2_compile_context *); \ pcre2_compile_context *); \
PCRE2_EXP_DECL void pcre2_code_free(pcre2_code *); \ PCRE2_EXP_DECL void PCRE2_CALL_CONVENTION \
PCRE2_EXP_DECL \ pcre2_code_free(pcre2_code *); \
pcre2_code *pcre2_code_copy(const pcre2_code *); PCRE2_EXP_DECL pcre2_code PCRE2_CALL_CONVENTION \
*pcre2_code_copy(const pcre2_code *);
/* Functions that give information about a compiled pattern. */ /* Functions that give information about a compiled pattern. */
#define PCRE2_PATTERN_INFO_FUNCTIONS \ #define PCRE2_PATTERN_INFO_FUNCTIONS \
PCRE2_EXP_DECL int pcre2_pattern_info(const pcre2_code *, uint32_t, \ PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
void *); \ pcre2_pattern_info(const pcre2_code *, uint32_t, void *); \
PCRE2_EXP_DECL int pcre2_callout_enumerate(const pcre2_code *, \ PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
int (*)(pcre2_callout_enumerate_block *, void *), \ pcre2_callout_enumerate(const pcre2_code *, \
void *); int (*)(pcre2_callout_enumerate_block *, void *), void *);
/* Functions for running a match and inspecting the result. */ /* Functions for running a match and inspecting the result. */
#define PCRE2_MATCH_FUNCTIONS \ #define PCRE2_MATCH_FUNCTIONS \
PCRE2_EXP_DECL \ PCRE2_EXP_DECL pcre2_match_data PCRE2_CALL_CONVENTION \
pcre2_match_data *pcre2_match_data_create(uint32_t, \ *pcre2_match_data_create(uint32_t, pcre2_general_context *); \
PCRE2_EXP_DECL pcre2_match_data PCRE2_CALL_CONVENTION \
*pcre2_match_data_create_from_pattern(const pcre2_code *, \
pcre2_general_context *); \ pcre2_general_context *); \
PCRE2_EXP_DECL \ PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
pcre2_match_data *pcre2_match_data_create_from_pattern(\ pcre2_dfa_match(const pcre2_code *, PCRE2_SPTR, PCRE2_SIZE, PCRE2_SIZE, \
const pcre2_code *, \ uint32_t, pcre2_match_data *, pcre2_match_context *, int *, PCRE2_SIZE); \
pcre2_general_context *); \ PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
PCRE2_EXP_DECL int pcre2_dfa_match(const pcre2_code *, PCRE2_SPTR, \ pcre2_match(const pcre2_code *, PCRE2_SPTR, PCRE2_SIZE, PCRE2_SIZE, \
PCRE2_SIZE, PCRE2_SIZE, uint32_t, \ uint32_t, pcre2_match_data *, pcre2_match_context *); \
pcre2_match_data *, pcre2_match_context *, int *, \ PCRE2_EXP_DECL void PCRE2_CALL_CONVENTION \
PCRE2_SIZE); \ pcre2_match_data_free(pcre2_match_data *); \
PCRE2_EXP_DECL int pcre2_match(const pcre2_code *, \ PCRE2_EXP_DECL PCRE2_SPTR PCRE2_CALL_CONVENTION \
PCRE2_SPTR, PCRE2_SIZE, PCRE2_SIZE, uint32_t, \ pcre2_get_mark(pcre2_match_data *); \
pcre2_match_data *, pcre2_match_context *); \ PCRE2_EXP_DECL uint32_t PCRE2_CALL_CONVENTION \
PCRE2_EXP_DECL void pcre2_match_data_free(pcre2_match_data *); \ pcre2_get_ovector_count(pcre2_match_data *); \
PCRE2_EXP_DECL PCRE2_SPTR pcre2_get_mark(pcre2_match_data *); \ PCRE2_EXP_DECL PCRE2_SIZE PCRE2_CALL_CONVENTION \
PCRE2_EXP_DECL uint32_t pcre2_get_ovector_count(pcre2_match_data *); \ *pcre2_get_ovector_pointer(pcre2_match_data *); \
PCRE2_EXP_DECL PCRE2_SIZE *pcre2_get_ovector_pointer(pcre2_match_data *); \ PCRE2_EXP_DECL PCRE2_SIZE PCRE2_CALL_CONVENTION \
PCRE2_EXP_DECL PCRE2_SIZE pcre2_get_startchar(pcre2_match_data *); pcre2_get_startchar(pcre2_match_data *);
/* Convenience functions for handling matched substrings. */ /* Convenience functions for handling matched substrings. */
#define PCRE2_SUBSTRING_FUNCTIONS \ #define PCRE2_SUBSTRING_FUNCTIONS \
PCRE2_EXP_DECL int pcre2_substring_copy_byname(pcre2_match_data *, \ PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
PCRE2_SPTR, PCRE2_UCHAR *, PCRE2_SIZE *); \ pcre2_substring_copy_byname(pcre2_match_data *, PCRE2_SPTR, PCRE2_UCHAR *, \
PCRE2_EXP_DECL int pcre2_substring_copy_bynumber(pcre2_match_data *, \ PCRE2_SIZE *); \
uint32_t, PCRE2_UCHAR *, PCRE2_SIZE *); \ PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
PCRE2_EXP_DECL void pcre2_substring_free(PCRE2_UCHAR *); \ pcre2_substring_copy_bynumber(pcre2_match_data *, uint32_t, PCRE2_UCHAR *, \
PCRE2_EXP_DECL int pcre2_substring_get_byname(pcre2_match_data *, \ PCRE2_SIZE *); \
PCRE2_SPTR, PCRE2_UCHAR **, PCRE2_SIZE *); \ PCRE2_EXP_DECL void PCRE2_CALL_CONVENTION \
PCRE2_EXP_DECL int pcre2_substring_get_bynumber(pcre2_match_data *, \ pcre2_substring_free(PCRE2_UCHAR *); \
uint32_t, PCRE2_UCHAR **, PCRE2_SIZE *); \ PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
PCRE2_EXP_DECL int pcre2_substring_length_byname(pcre2_match_data *, \ pcre2_substring_get_byname(pcre2_match_data *, PCRE2_SPTR, PCRE2_UCHAR **, \
PCRE2_SPTR, PCRE2_SIZE *); \ PCRE2_SIZE *); \
PCRE2_EXP_DECL int pcre2_substring_length_bynumber(pcre2_match_data *, \ PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
uint32_t, PCRE2_SIZE *); \ pcre2_substring_get_bynumber(pcre2_match_data *, uint32_t, PCRE2_UCHAR **, \
PCRE2_EXP_DECL int pcre2_substring_nametable_scan(const pcre2_code *, \ PCRE2_SIZE *); \
PCRE2_SPTR, PCRE2_SPTR *, PCRE2_SPTR *); \ PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
PCRE2_EXP_DECL int pcre2_substring_number_from_name(\ pcre2_substring_length_byname(pcre2_match_data *, PCRE2_SPTR, PCRE2_SIZE *); \
const pcre2_code *, PCRE2_SPTR); \ PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
PCRE2_EXP_DECL void pcre2_substring_list_free(PCRE2_SPTR *); \ pcre2_substring_length_bynumber(pcre2_match_data *, uint32_t, PCRE2_SIZE *); \
PCRE2_EXP_DECL int pcre2_substring_list_get(pcre2_match_data *, \ PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
PCRE2_UCHAR ***, PCRE2_SIZE **); pcre2_substring_nametable_scan(const pcre2_code *, PCRE2_SPTR, PCRE2_SPTR *, \
PCRE2_SPTR *); \
PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
pcre2_substring_number_from_name(const pcre2_code *, PCRE2_SPTR); \
PCRE2_EXP_DECL void PCRE2_CALL_CONVENTION \
pcre2_substring_list_free(PCRE2_SPTR *); \
PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
pcre2_substring_list_get(pcre2_match_data *, PCRE2_UCHAR ***, PCRE2_SIZE **);
/* Functions for serializing / deserializing compiled patterns. */ /* Functions for serializing / deserializing compiled patterns. */
#define PCRE2_SERIALIZE_FUNCTIONS \ #define PCRE2_SERIALIZE_FUNCTIONS \
PCRE2_EXP_DECL int32_t pcre2_serialize_encode(const pcre2_code **, \ PCRE2_EXP_DECL int32_t PCRE2_CALL_CONVENTION \
int32_t, uint8_t **, PCRE2_SIZE *, \ pcre2_serialize_encode(const pcre2_code **, int32_t, uint8_t **, \
PCRE2_SIZE *, pcre2_general_context *); \
PCRE2_EXP_DECL int32_t PCRE2_CALL_CONVENTION \
pcre2_serialize_decode(pcre2_code **, int32_t, const uint8_t *, \
pcre2_general_context *); \ pcre2_general_context *); \
PCRE2_EXP_DECL int32_t pcre2_serialize_decode(pcre2_code **, int32_t, \ PCRE2_EXP_DECL int32_t PCRE2_CALL_CONVENTION \
const uint8_t *, pcre2_general_context *); \ pcre2_serialize_get_number_of_codes(const uint8_t *); \
PCRE2_EXP_DECL int32_t pcre2_serialize_get_number_of_codes(const uint8_t *); \ PCRE2_EXP_DECL void PCRE2_CALL_CONVENTION \
PCRE2_EXP_DECL void pcre2_serialize_free(uint8_t *); pcre2_serialize_free(uint8_t *);
/* Convenience function for match + substitute. */ /* Convenience function for match + substitute. */
#define PCRE2_SUBSTITUTE_FUNCTION \ #define PCRE2_SUBSTITUTE_FUNCTION \
PCRE2_EXP_DECL int pcre2_substitute(const pcre2_code *, \ PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
PCRE2_SPTR, PCRE2_SIZE, PCRE2_SIZE, uint32_t, \ pcre2_substitute(const pcre2_code *, PCRE2_SPTR, PCRE2_SIZE, PCRE2_SIZE, \
pcre2_match_data *, pcre2_match_context *, \ uint32_t, pcre2_match_data *, pcre2_match_context *, PCRE2_SPTR, \
PCRE2_SPTR, PCRE2_SIZE, PCRE2_UCHAR *, \ PCRE2_SIZE, PCRE2_UCHAR *, PCRE2_SIZE *);
PCRE2_SIZE *);
/* Functions for JIT processing */ /* Functions for JIT processing */
#define PCRE2_JIT_FUNCTIONS \ #define PCRE2_JIT_FUNCTIONS \
PCRE2_EXP_DECL int pcre2_jit_compile(pcre2_code *, uint32_t); \ PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
PCRE2_EXP_DECL int pcre2_jit_match(const pcre2_code *, \ pcre2_jit_compile(pcre2_code *, uint32_t); \
PCRE2_SPTR, PCRE2_SIZE, PCRE2_SIZE, uint32_t, \ PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
pcre2_match_data *, pcre2_match_context *); \ pcre2_jit_match(const pcre2_code *, PCRE2_SPTR, PCRE2_SIZE, PCRE2_SIZE, \
PCRE2_EXP_DECL void pcre2_jit_free_unused_memory(pcre2_general_context *); \ uint32_t, pcre2_match_data *, pcre2_match_context *); \
PCRE2_EXP_DECL \ PCRE2_EXP_DECL void PCRE2_CALL_CONVENTION \
pcre2_jit_stack *pcre2_jit_stack_create(PCRE2_SIZE, PCRE2_SIZE, \ pcre2_jit_free_unused_memory(pcre2_general_context *); \
pcre2_general_context *); \ PCRE2_EXP_DECL pcre2_jit_stack PCRE2_CALL_CONVENTION \
PCRE2_EXP_DECL void pcre2_jit_stack_assign(pcre2_match_context *, \ *pcre2_jit_stack_create(PCRE2_SIZE, PCRE2_SIZE, pcre2_general_context *); \
pcre2_jit_callback, void *); \ PCRE2_EXP_DECL void PCRE2_CALL_CONVENTION \
PCRE2_EXP_DECL void pcre2_jit_stack_free(pcre2_jit_stack *); pcre2_jit_stack_assign(pcre2_match_context *, pcre2_jit_callback, void *); \
PCRE2_EXP_DECL void PCRE2_CALL_CONVENTION \
pcre2_jit_stack_free(pcre2_jit_stack *);
/* Other miscellaneous functions. */ /* Other miscellaneous functions. */
#define PCRE2_OTHER_FUNCTIONS \ #define PCRE2_OTHER_FUNCTIONS \
PCRE2_EXP_DECL int pcre2_get_error_message(int, PCRE2_UCHAR *, PCRE2_SIZE); \ PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
PCRE2_EXP_DECL \ pcre2_get_error_message(int, PCRE2_UCHAR *, PCRE2_SIZE); \
const uint8_t *pcre2_maketables(pcre2_general_context *); \ PCRE2_EXP_DECL const uint8_t PCRE2_CALL_CONVENTION \
*pcre2_maketables(pcre2_general_context *); \
/* Define macros that generate width-specific names from generic versions. The /* Define macros that generate width-specific names from generic versions. The

258
src/pcre2.h.in
View File

@ -67,6 +67,20 @@ don't change existing definitions of PCRE2_EXP_DECL. */
# endif # endif
#endif #endif
/* When compiling with the MSVC compiler, it is sometimes necessary to include
a "calling convention" before exported function names. (This is secondhand
information; I know nothing about MSVC myself). For example, something like
void __cdecl function(....)
might be needed. In order so make this easy, all the exported functions have
PCRE2_CALL_CONVENTION just before their names. It is rarely needed; if not
set, we ensure here that it has no effect. */
#ifndef PCRE2_CALL_CONVENTION
#define PCRE2_CALL_CONVENTION
#endif
/* Have to include limits.h, stdlib.h and stdint.h to ensure that size_t and /* Have to include limits.h, stdlib.h and stdint.h to ensure that size_t and
uint8_t, UCHAR_MAX, etc are defined. */ uint8_t, UCHAR_MAX, etc are defined. */
@ -386,170 +400,190 @@ expanded for each width below. Start with functions that give general
information. */ information. */
#define PCRE2_GENERAL_INFO_FUNCTIONS \ #define PCRE2_GENERAL_INFO_FUNCTIONS \
PCRE2_EXP_DECL int pcre2_config(uint32_t, void *); PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION pcre2_config(uint32_t, void *);
/* Functions for manipulating contexts. */ /* Functions for manipulating contexts. */
#define PCRE2_GENERAL_CONTEXT_FUNCTIONS \ #define PCRE2_GENERAL_CONTEXT_FUNCTIONS \
PCRE2_EXP_DECL \ PCRE2_EXP_DECL pcre2_general_context PCRE2_CALL_CONVENTION \
pcre2_general_context *pcre2_general_context_copy(pcre2_general_context *); \ *pcre2_general_context_copy(pcre2_general_context *); \
PCRE2_EXP_DECL \ PCRE2_EXP_DECL pcre2_general_context PCRE2_CALL_CONVENTION \
pcre2_general_context *pcre2_general_context_create( \ *pcre2_general_context_create(void *(*)(PCRE2_SIZE, void *), \
void *(*)(PCRE2_SIZE, void *), \
void (*)(void *, void *), void *); \ void (*)(void *, void *), void *); \
PCRE2_EXP_DECL void pcre2_general_context_free(pcre2_general_context *); PCRE2_EXP_DECL void PCRE2_CALL_CONVENTION \
pcre2_general_context_free(pcre2_general_context *);
#define PCRE2_COMPILE_CONTEXT_FUNCTIONS \ #define PCRE2_COMPILE_CONTEXT_FUNCTIONS \
PCRE2_EXP_DECL \ PCRE2_EXP_DECL pcre2_compile_context PCRE2_CALL_CONVENTION \
pcre2_compile_context *pcre2_compile_context_copy(pcre2_compile_context *); \ *pcre2_compile_context_copy(pcre2_compile_context *); \
PCRE2_EXP_DECL \ PCRE2_EXP_DECL pcre2_compile_context PCRE2_CALL_CONVENTION \
pcre2_compile_context *pcre2_compile_context_create(pcre2_general_context *);\ *pcre2_compile_context_create(pcre2_general_context *);\
PCRE2_EXP_DECL void pcre2_compile_context_free(pcre2_compile_context *); \ PCRE2_EXP_DECL void PCRE2_CALL_CONVENTION \
PCRE2_EXP_DECL int pcre2_set_bsr(pcre2_compile_context *, uint32_t); \ pcre2_compile_context_free(pcre2_compile_context *); \
PCRE2_EXP_DECL int pcre2_set_character_tables(pcre2_compile_context *, \ PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
const unsigned char *); \ pcre2_set_bsr(pcre2_compile_context *, uint32_t); \
PCRE2_EXP_DECL int pcre2_set_max_pattern_length(pcre2_compile_context *, \ PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
PCRE2_SIZE); \ pcre2_set_character_tables(pcre2_compile_context *, const unsigned char *); \
PCRE2_EXP_DECL int pcre2_set_newline(pcre2_compile_context *, uint32_t); \ PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
PCRE2_EXP_DECL int pcre2_set_parens_nest_limit(pcre2_compile_context *, \ pcre2_set_max_pattern_length(pcre2_compile_context *, PCRE2_SIZE); \
uint32_t); \ PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
PCRE2_EXP_DECL int pcre2_set_compile_recursion_guard(\ pcre2_set_newline(pcre2_compile_context *, uint32_t); \
pcre2_compile_context *, int (*)(uint32_t, void *), \ PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
void *); pcre2_set_parens_nest_limit(pcre2_compile_context *, uint32_t); \
PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
pcre2_set_compile_recursion_guard(pcre2_compile_context *, \
int (*)(uint32_t, void *), void *);
#define PCRE2_MATCH_CONTEXT_FUNCTIONS \ #define PCRE2_MATCH_CONTEXT_FUNCTIONS \
PCRE2_EXP_DECL \ PCRE2_EXP_DECL pcre2_match_context PCRE2_CALL_CONVENTION \
pcre2_match_context *pcre2_match_context_copy(pcre2_match_context *); \ *pcre2_match_context_copy(pcre2_match_context *); \
PCRE2_EXP_DECL \ PCRE2_EXP_DECL pcre2_match_context PCRE2_CALL_CONVENTION \
pcre2_match_context *pcre2_match_context_create(pcre2_general_context *); \ *pcre2_match_context_create(pcre2_general_context *); \
PCRE2_EXP_DECL void pcre2_match_context_free(pcre2_match_context *); \ PCRE2_EXP_DECL void PCRE2_CALL_CONVENTION \
PCRE2_EXP_DECL int pcre2_set_callout(pcre2_match_context *, \ pcre2_match_context_free(pcre2_match_context *); \
PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
pcre2_set_callout(pcre2_match_context *, \
int (*)(pcre2_callout_block *, void *), void *); \ int (*)(pcre2_callout_block *, void *), void *); \
PCRE2_EXP_DECL int pcre2_set_match_limit(pcre2_match_context *, \ PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
uint32_t); \ pcre2_set_match_limit(pcre2_match_context *, uint32_t); \
PCRE2_EXP_DECL int pcre2_set_offset_limit(pcre2_match_context *, \ PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
PCRE2_SIZE); \ pcre2_set_offset_limit(pcre2_match_context *, PCRE2_SIZE); \
PCRE2_EXP_DECL int pcre2_set_recursion_limit(pcre2_match_context *, \ PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
uint32_t); \ pcre2_set_recursion_limit(pcre2_match_context *, uint32_t); \
PCRE2_EXP_DECL int pcre2_set_recursion_memory_management( \ PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
pcre2_match_context *, void *(*)(PCRE2_SIZE, void *), \ pcre2_set_recursion_memory_management(pcre2_match_context *, \
void (*)(void *, void *), void *); void *(*)(PCRE2_SIZE, void *), void (*)(void *, void *), void *);
/* Functions concerned with compiling a pattern to PCRE internal code. */ /* Functions concerned with compiling a pattern to PCRE internal code. */
#define PCRE2_COMPILE_FUNCTIONS \ #define PCRE2_COMPILE_FUNCTIONS \
PCRE2_EXP_DECL \ PCRE2_EXP_DECL pcre2_code PCRE2_CALL_CONVENTION \
pcre2_code *pcre2_compile(PCRE2_SPTR, PCRE2_SIZE, uint32_t, \ *pcre2_compile(PCRE2_SPTR, PCRE2_SIZE, uint32_t, int *, PCRE2_SIZE *, \
int *, PCRE2_SIZE *, pcre2_compile_context *); \ pcre2_compile_context *); \
PCRE2_EXP_DECL void pcre2_code_free(pcre2_code *); \ PCRE2_EXP_DECL void PCRE2_CALL_CONVENTION \
PCRE2_EXP_DECL \ pcre2_code_free(pcre2_code *); \
pcre2_code *pcre2_code_copy(const pcre2_code *); PCRE2_EXP_DECL pcre2_code PCRE2_CALL_CONVENTION \
*pcre2_code_copy(const pcre2_code *);
/* Functions that give information about a compiled pattern. */ /* Functions that give information about a compiled pattern. */
#define PCRE2_PATTERN_INFO_FUNCTIONS \ #define PCRE2_PATTERN_INFO_FUNCTIONS \
PCRE2_EXP_DECL int pcre2_pattern_info(const pcre2_code *, uint32_t, \ PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
void *); \ pcre2_pattern_info(const pcre2_code *, uint32_t, void *); \
PCRE2_EXP_DECL int pcre2_callout_enumerate(const pcre2_code *, \ PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
int (*)(pcre2_callout_enumerate_block *, void *), \ pcre2_callout_enumerate(const pcre2_code *, \
void *); int (*)(pcre2_callout_enumerate_block *, void *), void *);
/* Functions for running a match and inspecting the result. */ /* Functions for running a match and inspecting the result. */
#define PCRE2_MATCH_FUNCTIONS \ #define PCRE2_MATCH_FUNCTIONS \
PCRE2_EXP_DECL \ PCRE2_EXP_DECL pcre2_match_data PCRE2_CALL_CONVENTION \
pcre2_match_data *pcre2_match_data_create(uint32_t, \ *pcre2_match_data_create(uint32_t, pcre2_general_context *); \
PCRE2_EXP_DECL pcre2_match_data PCRE2_CALL_CONVENTION \
*pcre2_match_data_create_from_pattern(const pcre2_code *, \
pcre2_general_context *); \ pcre2_general_context *); \
PCRE2_EXP_DECL \ PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
pcre2_match_data *pcre2_match_data_create_from_pattern(\ pcre2_dfa_match(const pcre2_code *, PCRE2_SPTR, PCRE2_SIZE, PCRE2_SIZE, \
const pcre2_code *, \ uint32_t, pcre2_match_data *, pcre2_match_context *, int *, PCRE2_SIZE); \
pcre2_general_context *); \ PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
PCRE2_EXP_DECL int pcre2_dfa_match(const pcre2_code *, PCRE2_SPTR, \ pcre2_match(const pcre2_code *, PCRE2_SPTR, PCRE2_SIZE, PCRE2_SIZE, \
PCRE2_SIZE, PCRE2_SIZE, uint32_t, \ uint32_t, pcre2_match_data *, pcre2_match_context *); \
pcre2_match_data *, pcre2_match_context *, int *, \ PCRE2_EXP_DECL void PCRE2_CALL_CONVENTION \
PCRE2_SIZE); \ pcre2_match_data_free(pcre2_match_data *); \
PCRE2_EXP_DECL int pcre2_match(const pcre2_code *, \ PCRE2_EXP_DECL PCRE2_SPTR PCRE2_CALL_CONVENTION \
PCRE2_SPTR, PCRE2_SIZE, PCRE2_SIZE, uint32_t, \ pcre2_get_mark(pcre2_match_data *); \
pcre2_match_data *, pcre2_match_context *); \ PCRE2_EXP_DECL uint32_t PCRE2_CALL_CONVENTION \
PCRE2_EXP_DECL void pcre2_match_data_free(pcre2_match_data *); \ pcre2_get_ovector_count(pcre2_match_data *); \
PCRE2_EXP_DECL PCRE2_SPTR pcre2_get_mark(pcre2_match_data *); \ PCRE2_EXP_DECL PCRE2_SIZE PCRE2_CALL_CONVENTION \
PCRE2_EXP_DECL uint32_t pcre2_get_ovector_count(pcre2_match_data *); \ *pcre2_get_ovector_pointer(pcre2_match_data *); \
PCRE2_EXP_DECL PCRE2_SIZE *pcre2_get_ovector_pointer(pcre2_match_data *); \ PCRE2_EXP_DECL PCRE2_SIZE PCRE2_CALL_CONVENTION \
PCRE2_EXP_DECL PCRE2_SIZE pcre2_get_startchar(pcre2_match_data *); pcre2_get_startchar(pcre2_match_data *);
/* Convenience functions for handling matched substrings. */ /* Convenience functions for handling matched substrings. */
#define PCRE2_SUBSTRING_FUNCTIONS \ #define PCRE2_SUBSTRING_FUNCTIONS \
PCRE2_EXP_DECL int pcre2_substring_copy_byname(pcre2_match_data *, \ PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
PCRE2_SPTR, PCRE2_UCHAR *, PCRE2_SIZE *); \ pcre2_substring_copy_byname(pcre2_match_data *, PCRE2_SPTR, PCRE2_UCHAR *, \
PCRE2_EXP_DECL int pcre2_substring_copy_bynumber(pcre2_match_data *, \ PCRE2_SIZE *); \
uint32_t, PCRE2_UCHAR *, PCRE2_SIZE *); \ PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
PCRE2_EXP_DECL void pcre2_substring_free(PCRE2_UCHAR *); \ pcre2_substring_copy_bynumber(pcre2_match_data *, uint32_t, PCRE2_UCHAR *, \
PCRE2_EXP_DECL int pcre2_substring_get_byname(pcre2_match_data *, \ PCRE2_SIZE *); \
PCRE2_SPTR, PCRE2_UCHAR **, PCRE2_SIZE *); \ PCRE2_EXP_DECL void PCRE2_CALL_CONVENTION \
PCRE2_EXP_DECL int pcre2_substring_get_bynumber(pcre2_match_data *, \ pcre2_substring_free(PCRE2_UCHAR *); \
uint32_t, PCRE2_UCHAR **, PCRE2_SIZE *); \ PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
PCRE2_EXP_DECL int pcre2_substring_length_byname(pcre2_match_data *, \ pcre2_substring_get_byname(pcre2_match_data *, PCRE2_SPTR, PCRE2_UCHAR **, \
PCRE2_SPTR, PCRE2_SIZE *); \ PCRE2_SIZE *); \
PCRE2_EXP_DECL int pcre2_substring_length_bynumber(pcre2_match_data *, \ PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
uint32_t, PCRE2_SIZE *); \ pcre2_substring_get_bynumber(pcre2_match_data *, uint32_t, PCRE2_UCHAR **, \
PCRE2_EXP_DECL int pcre2_substring_nametable_scan(const pcre2_code *, \ PCRE2_SIZE *); \
PCRE2_SPTR, PCRE2_SPTR *, PCRE2_SPTR *); \ PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
PCRE2_EXP_DECL int pcre2_substring_number_from_name(\ pcre2_substring_length_byname(pcre2_match_data *, PCRE2_SPTR, PCRE2_SIZE *); \
const pcre2_code *, PCRE2_SPTR); \ PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
PCRE2_EXP_DECL void pcre2_substring_list_free(PCRE2_SPTR *); \ pcre2_substring_length_bynumber(pcre2_match_data *, uint32_t, PCRE2_SIZE *); \
PCRE2_EXP_DECL int pcre2_substring_list_get(pcre2_match_data *, \ PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
PCRE2_UCHAR ***, PCRE2_SIZE **); pcre2_substring_nametable_scan(const pcre2_code *, PCRE2_SPTR, PCRE2_SPTR *, \
PCRE2_SPTR *); \
PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
pcre2_substring_number_from_name(const pcre2_code *, PCRE2_SPTR); \
PCRE2_EXP_DECL void PCRE2_CALL_CONVENTION \
pcre2_substring_list_free(PCRE2_SPTR *); \
PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
pcre2_substring_list_get(pcre2_match_data *, PCRE2_UCHAR ***, PCRE2_SIZE **);
/* Functions for serializing / deserializing compiled patterns. */ /* Functions for serializing / deserializing compiled patterns. */
#define PCRE2_SERIALIZE_FUNCTIONS \ #define PCRE2_SERIALIZE_FUNCTIONS \
PCRE2_EXP_DECL int32_t pcre2_serialize_encode(const pcre2_code **, \ PCRE2_EXP_DECL int32_t PCRE2_CALL_CONVENTION \
int32_t, uint8_t **, PCRE2_SIZE *, \ pcre2_serialize_encode(const pcre2_code **, int32_t, uint8_t **, \
PCRE2_SIZE *, pcre2_general_context *); \
PCRE2_EXP_DECL int32_t PCRE2_CALL_CONVENTION \
pcre2_serialize_decode(pcre2_code **, int32_t, const uint8_t *, \
pcre2_general_context *); \ pcre2_general_context *); \
PCRE2_EXP_DECL int32_t pcre2_serialize_decode(pcre2_code **, int32_t, \ PCRE2_EXP_DECL int32_t PCRE2_CALL_CONVENTION \
const uint8_t *, pcre2_general_context *); \ pcre2_serialize_get_number_of_codes(const uint8_t *); \
PCRE2_EXP_DECL int32_t pcre2_serialize_get_number_of_codes(const uint8_t *); \ PCRE2_EXP_DECL void PCRE2_CALL_CONVENTION \
PCRE2_EXP_DECL void pcre2_serialize_free(uint8_t *); pcre2_serialize_free(uint8_t *);
/* Convenience function for match + substitute. */ /* Convenience function for match + substitute. */
#define PCRE2_SUBSTITUTE_FUNCTION \ #define PCRE2_SUBSTITUTE_FUNCTION \
PCRE2_EXP_DECL int pcre2_substitute(const pcre2_code *, \ PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
PCRE2_SPTR, PCRE2_SIZE, PCRE2_SIZE, uint32_t, \ pcre2_substitute(const pcre2_code *, PCRE2_SPTR, PCRE2_SIZE, PCRE2_SIZE, \
pcre2_match_data *, pcre2_match_context *, \ uint32_t, pcre2_match_data *, pcre2_match_context *, PCRE2_SPTR, \
PCRE2_SPTR, PCRE2_SIZE, PCRE2_UCHAR *, \ PCRE2_SIZE, PCRE2_UCHAR *, PCRE2_SIZE *);
PCRE2_SIZE *);
/* Functions for JIT processing */ /* Functions for JIT processing */
#define PCRE2_JIT_FUNCTIONS \ #define PCRE2_JIT_FUNCTIONS \
PCRE2_EXP_DECL int pcre2_jit_compile(pcre2_code *, uint32_t); \ PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
PCRE2_EXP_DECL int pcre2_jit_match(const pcre2_code *, \ pcre2_jit_compile(pcre2_code *, uint32_t); \
PCRE2_SPTR, PCRE2_SIZE, PCRE2_SIZE, uint32_t, \ PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
pcre2_match_data *, pcre2_match_context *); \ pcre2_jit_match(const pcre2_code *, PCRE2_SPTR, PCRE2_SIZE, PCRE2_SIZE, \
PCRE2_EXP_DECL void pcre2_jit_free_unused_memory(pcre2_general_context *); \ uint32_t, pcre2_match_data *, pcre2_match_context *); \
PCRE2_EXP_DECL \ PCRE2_EXP_DECL void PCRE2_CALL_CONVENTION \
pcre2_jit_stack *pcre2_jit_stack_create(PCRE2_SIZE, PCRE2_SIZE, \ pcre2_jit_free_unused_memory(pcre2_general_context *); \
pcre2_general_context *); \ PCRE2_EXP_DECL pcre2_jit_stack PCRE2_CALL_CONVENTION \
PCRE2_EXP_DECL void pcre2_jit_stack_assign(pcre2_match_context *, \ *pcre2_jit_stack_create(PCRE2_SIZE, PCRE2_SIZE, pcre2_general_context *); \
pcre2_jit_callback, void *); \ PCRE2_EXP_DECL void PCRE2_CALL_CONVENTION \
PCRE2_EXP_DECL void pcre2_jit_stack_free(pcre2_jit_stack *); pcre2_jit_stack_assign(pcre2_match_context *, pcre2_jit_callback, void *); \
PCRE2_EXP_DECL void PCRE2_CALL_CONVENTION \
pcre2_jit_stack_free(pcre2_jit_stack *);
/* Other miscellaneous functions. */ /* Other miscellaneous functions. */
#define PCRE2_OTHER_FUNCTIONS \ #define PCRE2_OTHER_FUNCTIONS \
PCRE2_EXP_DECL int pcre2_get_error_message(int, PCRE2_UCHAR *, PCRE2_SIZE); \ PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
PCRE2_EXP_DECL \ pcre2_get_error_message(int, PCRE2_UCHAR *, PCRE2_SIZE); \
const uint8_t *pcre2_maketables(pcre2_general_context *); \ PCRE2_EXP_DECL const uint8_t PCRE2_CALL_CONVENTION \
*pcre2_maketables(pcre2_general_context *); \
/* Define macros that generate width-specific names from generic versions. The /* Define macros that generate width-specific names from generic versions. The

14
src/pcre2_internal.h
View File

@ -142,20 +142,6 @@ pcre2_match() because of the way it backtracks. */
#define PCRE2_SPTR CUSTOM_SUBJECT_PTR #define PCRE2_SPTR CUSTOM_SUBJECT_PTR
#endif #endif
/* When compiling with the MSVC compiler, it is sometimes necessary to include
a "calling convention" before exported function names. (This is secondhand
information; I know nothing about MSVC myself). For example, something like
void __cdecl function(....)
might be needed. In order so make this easy, all the exported functions have
PCRE2_CALL_CONVENTION just before their names. It is rarely needed; if not
set, we ensure here that it has no effect. */
#ifndef PCRE2_CALL_CONVENTION
#define PCRE2_CALL_CONVENTION
#endif
/* When checking for integer overflow in pcre2_compile(), we need to handle /* When checking for integer overflow in pcre2_compile(), we need to handle
large integers. If a 64-bit integer type is available, we can use that. large integers. If a 64-bit integer type is available, we can use that.
Otherwise we have to cast to double, which of course requires floating point Otherwise we have to cast to double, which of course requires floating point