embedaddon/pcre/pcre.h.generic - diff

Return to pcre.h.generic CVS log

Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / pcre

Diff for /embedaddon/pcre/pcre.h.generic between versions 1.1.1.1 and 1.1.1.2

version 1.1.1.1, 2012/02/21 23:05:51	version 1.1.1.2, 2012/02/21 23:50:25
Line 5	Line 5
/* This is the public header file for the PCRE library, to be #included by	/* This is the public header file for the PCRE library, to be #included by
applications that call the PCRE functions.	applications that call the PCRE functions.

Copyright (c) 1997-2011 University of Cambridge	Copyright (c) 1997-2012 University of Cambridge

-----------------------------------------------------------------------------	-----------------------------------------------------------------------------
Redistribution and use in source and binary forms, with or without	Redistribution and use in source and binary forms, with or without
Line 42 POSSIBILITY OF SUCH DAMAGE.	Line 42 POSSIBILITY OF SUCH DAMAGE.
/* The current PCRE version information. */	/* The current PCRE version information. */

#define PCRE_MAJOR 8	#define PCRE_MAJOR 8
#define PCRE_MINOR 21	#define PCRE_MINOR 30
#define PCRE_PRERELEASE	#define PCRE_PRERELEASE
#define PCRE_DATE 2011-12-12	#define PCRE_DATE 2012-02-04

/* When an application links to a PCRE DLL in Windows, the symbols that are	/* When an application links to a PCRE DLL in Windows, the symbols that are
imported have to be identified as such. When building PCRE, the appropriate	imported have to be identified as such. When building PCRE, the appropriate
Line 116 compiling). */	Line 116 compiling). */
#define PCRE_NOTEOL 0x00000100 /* Exec, DFA exec */	#define PCRE_NOTEOL 0x00000100 /* Exec, DFA exec */
#define PCRE_UNGREEDY 0x00000200 /* Compile */	#define PCRE_UNGREEDY 0x00000200 /* Compile */
#define PCRE_NOTEMPTY 0x00000400 /* Exec, DFA exec */	#define PCRE_NOTEMPTY 0x00000400 /* Exec, DFA exec */
#define PCRE_UTF8 0x00000800 /* Compile, used in exec, DFA exec */	/* The next two are also used in exec and DFA exec */
	#define PCRE_UTF8 0x00000800 /* Compile (same as PCRE_UTF16) */
	#define PCRE_UTF16 0x00000800 /* Compile (same as PCRE_UTF8) */
#define PCRE_NO_AUTO_CAPTURE 0x00001000 /* Compile */	#define PCRE_NO_AUTO_CAPTURE 0x00001000 /* Compile */
#define PCRE_NO_UTF8_CHECK 0x00002000 /* Compile, exec, DFA exec */	/* The next two are also used in exec and DFA exec */
	#define PCRE_NO_UTF8_CHECK 0x00002000 /* Compile (same as PCRE_NO_UTF16_CHECK) */
	#define PCRE_NO_UTF16_CHECK 0x00002000 /* Compile (same as PCRE_NO_UTF8_CHECK) */
#define PCRE_AUTO_CALLOUT 0x00004000 /* Compile */	#define PCRE_AUTO_CALLOUT 0x00004000 /* Compile */
#define PCRE_PARTIAL_SOFT 0x00008000 /* Exec, DFA exec */	#define PCRE_PARTIAL_SOFT 0x00008000 /* Exec, DFA exec */
#define PCRE_PARTIAL 0x00008000 /* Backwards compatible synonym */	#define PCRE_PARTIAL 0x00008000 /* Backwards compatible synonym */
Line 142 compiling). */	Line 146 compiling). */

/* Exec-time and get/set-time error codes */	/* Exec-time and get/set-time error codes */

#define PCRE_ERROR_NOMATCH (-1)	#define PCRE_ERROR_NOMATCH (-1)
#define PCRE_ERROR_NULL (-2)	#define PCRE_ERROR_NULL (-2)
#define PCRE_ERROR_BADOPTION (-3)	#define PCRE_ERROR_BADOPTION (-3)
#define PCRE_ERROR_BADMAGIC (-4)	#define PCRE_ERROR_BADMAGIC (-4)
#define PCRE_ERROR_UNKNOWN_OPCODE (-5)	#define PCRE_ERROR_UNKNOWN_OPCODE (-5)
#define PCRE_ERROR_UNKNOWN_NODE (-5) /* For backward compatibility */	#define PCRE_ERROR_UNKNOWN_NODE (-5) /* For backward compatibility */
#define PCRE_ERROR_NOMEMORY (-6)	#define PCRE_ERROR_NOMEMORY (-6)
#define PCRE_ERROR_NOSUBSTRING (-7)	#define PCRE_ERROR_NOSUBSTRING (-7)
#define PCRE_ERROR_MATCHLIMIT (-8)	#define PCRE_ERROR_MATCHLIMIT (-8)
#define PCRE_ERROR_CALLOUT (-9) /* Never used by PCRE itself */	#define PCRE_ERROR_CALLOUT (-9) /* Never used by PCRE itself */
#define PCRE_ERROR_BADUTF8 (-10)	#define PCRE_ERROR_BADUTF8 (-10) /* Same for 8/16 */
#define PCRE_ERROR_BADUTF8_OFFSET (-11)	#define PCRE_ERROR_BADUTF16 (-10) /* Same for 8/16 */
#define PCRE_ERROR_PARTIAL (-12)	#define PCRE_ERROR_BADUTF8_OFFSET (-11) /* Same for 8/16 */
#define PCRE_ERROR_BADPARTIAL (-13)	#define PCRE_ERROR_BADUTF16_OFFSET (-11) /* Same for 8/16 */
#define PCRE_ERROR_INTERNAL (-14)	#define PCRE_ERROR_PARTIAL (-12)
#define PCRE_ERROR_BADCOUNT (-15)	#define PCRE_ERROR_BADPARTIAL (-13)
#define PCRE_ERROR_DFA_UITEM (-16)	#define PCRE_ERROR_INTERNAL (-14)
#define PCRE_ERROR_DFA_UCOND (-17)	#define PCRE_ERROR_BADCOUNT (-15)
#define PCRE_ERROR_DFA_UMLIMIT (-18)	#define PCRE_ERROR_DFA_UITEM (-16)
#define PCRE_ERROR_DFA_WSSIZE (-19)	#define PCRE_ERROR_DFA_UCOND (-17)
#define PCRE_ERROR_DFA_RECURSE (-20)	#define PCRE_ERROR_DFA_UMLIMIT (-18)
#define PCRE_ERROR_RECURSIONLIMIT (-21)	#define PCRE_ERROR_DFA_WSSIZE (-19)
#define PCRE_ERROR_NULLWSLIMIT (-22) /* No longer actually used */	#define PCRE_ERROR_DFA_RECURSE (-20)
#define PCRE_ERROR_BADNEWLINE (-23)	#define PCRE_ERROR_RECURSIONLIMIT (-21)
#define PCRE_ERROR_BADOFFSET (-24)	#define PCRE_ERROR_NULLWSLIMIT (-22) /* No longer actually used */
#define PCRE_ERROR_SHORTUTF8 (-25)	#define PCRE_ERROR_BADNEWLINE (-23)
#define PCRE_ERROR_RECURSELOOP (-26)	#define PCRE_ERROR_BADOFFSET (-24)
#define PCRE_ERROR_JIT_STACKLIMIT (-27)	#define PCRE_ERROR_SHORTUTF8 (-25)
	#define PCRE_ERROR_SHORTUTF16 (-25) /* Same for 8/16 */
	#define PCRE_ERROR_RECURSELOOP (-26)
	#define PCRE_ERROR_JIT_STACKLIMIT (-27)
	#define PCRE_ERROR_BADMODE (-28)
	#define PCRE_ERROR_BADENDIANNESS (-29)

/* Specific error codes for UTF-8 validity checks */	/* Specific error codes for UTF-8 validity checks */

Line 196 compiling). */	Line 205 compiling). */
#define PCRE_UTF8_ERR20 20	#define PCRE_UTF8_ERR20 20
#define PCRE_UTF8_ERR21 21	#define PCRE_UTF8_ERR21 21

	/* Specific error codes for UTF-16 validity checks */

	#define PCRE_UTF16_ERR0 0
	#define PCRE_UTF16_ERR1 1
	#define PCRE_UTF16_ERR2 2
	#define PCRE_UTF16_ERR3 3
	#define PCRE_UTF16_ERR4 4

/* Request types for pcre_fullinfo() */	/* Request types for pcre_fullinfo() */

#define PCRE_INFO_OPTIONS 0	#define PCRE_INFO_OPTIONS 0
Line 231 compatible. */	Line 248 compatible. */
#define PCRE_CONFIG_MATCH_LIMIT_RECURSION 7	#define PCRE_CONFIG_MATCH_LIMIT_RECURSION 7
#define PCRE_CONFIG_BSR 8	#define PCRE_CONFIG_BSR 8
#define PCRE_CONFIG_JIT 9	#define PCRE_CONFIG_JIT 9
	#define PCRE_CONFIG_UTF16 10
	#define PCRE_CONFIG_JITTARGET 11

/* Request types for pcre_study(). Do not re-arrange, in order to remain	/* Request types for pcre_study(). Do not re-arrange, in order to remain
compatible. */	compatible. */

#define PCRE_STUDY_JIT_COMPILE 0x0001	#define PCRE_STUDY_JIT_COMPILE 0x0001

/* Bit flags for the pcre_extra structure. Do not re-arrange or redefine	/* Bit flags for the pcre[16]_extra structure. Do not re-arrange or redefine
these bits, just add new ones on the end, in order to remain compatible. */	these bits, just add new ones on the end, in order to remain compatible. */

#define PCRE_EXTRA_STUDY_DATA 0x0001	#define PCRE_EXTRA_STUDY_DATA 0x0001
Line 253 these bits, just add new ones on the end, in order to	Line 272 these bits, just add new ones on the end, in order to
struct real_pcre; /* declaration; the definition is private */	struct real_pcre; /* declaration; the definition is private */
typedef struct real_pcre pcre;	typedef struct real_pcre pcre;

	struct real_pcre16; /* declaration; the definition is private */
	typedef struct real_pcre16 pcre16;

struct real_pcre_jit_stack; /* declaration; the definition is private */	struct real_pcre_jit_stack; /* declaration; the definition is private */
typedef struct real_pcre_jit_stack pcre_jit_stack;	typedef struct real_pcre_jit_stack pcre_jit_stack;

	struct real_pcre16_jit_stack; /* declaration; the definition is private */
	typedef struct real_pcre16_jit_stack pcre16_jit_stack;

	/* If PCRE is compiled with 16 bit character support, PCRE_UCHAR16 must contain
	a 16 bit wide signed data type. Otherwise it can be a dummy data type since
	pcre16 functions are not implemented. There is a check for this in pcre_internal.h. */
	#ifndef PCRE_UCHAR16
	#define PCRE_UCHAR16 unsigned short
	#endif

	#ifndef PCRE_SPTR16
	#define PCRE_SPTR16 const PCRE_UCHAR16 *
	#endif

/* When PCRE is compiled as a C++ library, the subject pointer type can be	/* When PCRE is compiled as a C++ library, the subject pointer type can be
replaced with a custom type. For conventional use, the public interface is a	replaced with a custom type. For conventional use, the public interface is a
const char . /	const char . /
Line 279 typedef struct pcre_extra {	Line 315 typedef struct pcre_extra {
void executable_jit; / Contains a pointer to a compiled jit code */	void executable_jit; / Contains a pointer to a compiled jit code */
} pcre_extra;	} pcre_extra;

	/* Same structure as above, but with 16 bit char pointers. */

	typedef struct pcre16_extra {
	unsigned long int flags; /* Bits for which fields are set */
	void study_data; / Opaque data from pcre_study() */
	unsigned long int match_limit; /* Maximum number of calls to match() */
	void callout_data; / Data passed back in callouts */
	const unsigned char tables; / Pointer to character tables */
	unsigned long int match_limit_recursion; /* Max recursive calls to match() */
	PCRE_UCHAR16 *mark; / For passing back a mark pointer */
	void executable_jit; / Contains a pointer to a compiled jit code */
	} pcre16_extra;

/* The structure for passing out data via the pcre_callout_function. We use a	/* The structure for passing out data via the pcre_callout_function. We use a
structure so that new fields can be added on the end in future versions,	structure so that new fields can be added on the end in future versions,
without changing the API of the function, thereby allowing old clients to work	without changing the API of the function, thereby allowing old clients to work
Line 304 typedef struct pcre_callout_block {	Line 353 typedef struct pcre_callout_block {
/* ------------------------------------------------------------------ */	/* ------------------------------------------------------------------ */
} pcre_callout_block;	} pcre_callout_block;

	/* Same structure as above, but with 16 bit char pointers. */

	typedef struct pcre16_callout_block {
	int version; /* Identifies version of block */
	/* ------------------------ Version 0 ------------------------------- */
	int callout_number; /* Number compiled into pattern */
	int offset_vector; / The offset vector */
	PCRE_SPTR16 subject; /* The subject being matched */
	int subject_length; /* The length of the subject */
	int start_match; /* Offset to start of this match attempt */
	int current_position; /* Where we currently are in the subject */
	int capture_top; /* Max current capture */
	int capture_last; /* Most recently closed capture */
	void callout_data; / Data passed in with the call */
	/* ------------------- Added for Version 1 -------------------------- */
	int pattern_position; /* Offset to next item in the pattern */
	int next_item_length; /* Length of next item in the pattern */
	/* ------------------- Added for Version 2 -------------------------- */
	const PCRE_UCHAR16 mark; / Pointer to current mark or NULL */
	/* ------------------------------------------------------------------ */
	} pcre16_callout_block;

/* Indirection for store get and free functions. These can be set to	/* Indirection for store get and free functions. These can be set to
alternative malloc/free functions if required. Special ones are used in the	alternative malloc/free functions if required. Special ones are used in the
non-recursive case for "frames". There is also an optional callout function	non-recursive case for "frames". There is also an optional callout function
Line 316 PCRE_EXP_DECL void (pcre_free)(void );	Line 387 PCRE_EXP_DECL void (pcre_free)(void );
PCRE_EXP_DECL void (pcre_stack_malloc)(size_t);	PCRE_EXP_DECL void (pcre_stack_malloc)(size_t);
PCRE_EXP_DECL void (pcre_stack_free)(void );	PCRE_EXP_DECL void (pcre_stack_free)(void );
PCRE_EXP_DECL int (pcre_callout)(pcre_callout_block );	PCRE_EXP_DECL int (pcre_callout)(pcre_callout_block );

	PCRE_EXP_DECL void (pcre16_malloc)(size_t);
	PCRE_EXP_DECL void (pcre16_free)(void );
	PCRE_EXP_DECL void (pcre16_stack_malloc)(size_t);
	PCRE_EXP_DECL void (pcre16_stack_free)(void );
	PCRE_EXP_DECL int (pcre16_callout)(pcre16_callout_block );
#else /* VPCOMPAT */	#else /* VPCOMPAT */
PCRE_EXP_DECL void *pcre_malloc(size_t);	PCRE_EXP_DECL void *pcre_malloc(size_t);
PCRE_EXP_DECL void pcre_free(void *);	PCRE_EXP_DECL void pcre_free(void *);
PCRE_EXP_DECL void *pcre_stack_malloc(size_t);	PCRE_EXP_DECL void *pcre_stack_malloc(size_t);
PCRE_EXP_DECL void pcre_stack_free(void *);	PCRE_EXP_DECL void pcre_stack_free(void *);
PCRE_EXP_DECL int pcre_callout(pcre_callout_block *);	PCRE_EXP_DECL int pcre_callout(pcre_callout_block *);

	PCRE_EXP_DECL void *pcre16_malloc(size_t);
	PCRE_EXP_DECL void pcre16_free(void *);
	PCRE_EXP_DECL void *pcre16_stack_malloc(size_t);
	PCRE_EXP_DECL void pcre16_stack_free(void *);
	PCRE_EXP_DECL int pcre16_callout(pcre16_callout_block *);
#endif /* VPCOMPAT */	#endif /* VPCOMPAT */

/* User defined callback which provides a stack just before the match starts. */	/* User defined callback which provides a stack just before the match starts. */

typedef pcre_jit_stack (pcre_jit_callback)(void *);	typedef pcre_jit_stack (pcre_jit_callback)(void *);
	typedef pcre16_jit_stack (pcre16_jit_callback)(void *);

/* Exported PCRE functions */	/* Exported PCRE functions */

PCRE_EXP_DECL pcre pcre_compile(const char , int, const char *, int ,	PCRE_EXP_DECL pcre pcre_compile(const char , int, const char *, int ,
const unsigned char *);	const unsigned char *);
	PCRE_EXP_DECL pcre16 pcre16_compile(PCRE_SPTR16, int, const char , int ,
	const unsigned char *);
PCRE_EXP_DECL pcre pcre_compile2(const char , int, int , const char *,	PCRE_EXP_DECL pcre pcre_compile2(const char , int, int , const char *,
int , const unsigned char );	int , const unsigned char );
	PCRE_EXP_DECL pcre16 pcre16_compile2(PCRE_SPTR16, int, int , const char **,
	int , const unsigned char );
PCRE_EXP_DECL int pcre_config(int, void *);	PCRE_EXP_DECL int pcre_config(int, void *);
	PCRE_EXP_DECL int pcre16_config(int, void *);
PCRE_EXP_DECL int pcre_copy_named_substring(const pcre , const char ,	PCRE_EXP_DECL int pcre_copy_named_substring(const pcre , const char ,
int , int, const char , char *, int);	int , int, const char , char *, int);
PCRE_EXP_DECL int pcre_copy_substring(const char , int , int, int, char *,	PCRE_EXP_DECL int pcre16_copy_named_substring(const pcre16 *, PCRE_SPTR16,
int);	int , int, PCRE_SPTR16, PCRE_UCHAR16 , int);
	PCRE_EXP_DECL int pcre_copy_substring(const char , int , int, int,
	char *, int);
	PCRE_EXP_DECL int pcre16_copy_substring(PCRE_SPTR16, int *, int, int,
	PCRE_UCHAR16 *, int);
PCRE_EXP_DECL int pcre_dfa_exec(const pcre , const pcre_extra ,	PCRE_EXP_DECL int pcre_dfa_exec(const pcre , const pcre_extra ,
const char , int, int, int, int , int , int *, int);	const char , int, int, int, int , int , int *, int);
	PCRE_EXP_DECL int pcre16_dfa_exec(const pcre16 , const pcre16_extra ,
	PCRE_SPTR16, int, int, int, int , int , int , int);
PCRE_EXP_DECL int pcre_exec(const pcre , const pcre_extra , PCRE_SPTR,	PCRE_EXP_DECL int pcre_exec(const pcre , const pcre_extra , PCRE_SPTR,
int, int, int, int *, int);	int, int, int, int *, int);
	PCRE_EXP_DECL int pcre16_exec(const pcre16 , const pcre16_extra ,
	PCRE_SPTR16, int, int, int, int *, int);
PCRE_EXP_DECL void pcre_free_substring(const char *);	PCRE_EXP_DECL void pcre_free_substring(const char *);
	PCRE_EXP_DECL void pcre16_free_substring(PCRE_SPTR16);
PCRE_EXP_DECL void pcre_free_substring_list(const char **);	PCRE_EXP_DECL void pcre_free_substring_list(const char **);
	PCRE_EXP_DECL void pcre16_free_substring_list(PCRE_SPTR16 *);
PCRE_EXP_DECL int pcre_fullinfo(const pcre , const pcre_extra , int,	PCRE_EXP_DECL int pcre_fullinfo(const pcre , const pcre_extra , int,
void *);	void *);
	PCRE_EXP_DECL int pcre16_fullinfo(const pcre16 , const pcre16_extra , int,
	void *);
PCRE_EXP_DECL int pcre_get_named_substring(const pcre , const char ,	PCRE_EXP_DECL int pcre_get_named_substring(const pcre , const char ,
int , int, const char , const char **);	int , int, const char , const char **);
	PCRE_EXP_DECL int pcre16_get_named_substring(const pcre16 *, PCRE_SPTR16,
	int , int, PCRE_SPTR16, PCRE_SPTR16 );
PCRE_EXP_DECL int pcre_get_stringnumber(const pcre , const char );	PCRE_EXP_DECL int pcre_get_stringnumber(const pcre , const char );
	PCRE_EXP_DECL int pcre16_get_stringnumber(const pcre16 *, PCRE_SPTR16);
PCRE_EXP_DECL int pcre_get_stringtable_entries(const pcre , const char ,	PCRE_EXP_DECL int pcre_get_stringtable_entries(const pcre , const char ,
char , char );	char , char );
	PCRE_EXP_DECL int pcre16_get_stringtable_entries(const pcre16 *, PCRE_SPTR16,
	PCRE_UCHAR16 , PCRE_UCHAR16 );
PCRE_EXP_DECL int pcre_get_substring(const char , int , int, int,	PCRE_EXP_DECL int pcre_get_substring(const char , int , int, int,
const char **);	const char **);
	PCRE_EXP_DECL int pcre16_get_substring(PCRE_SPTR16, int *, int, int,
	PCRE_SPTR16 *);
PCRE_EXP_DECL int pcre_get_substring_list(const char , int , int,	PCRE_EXP_DECL int pcre_get_substring_list(const char , int , int,
const char ***);	const char ***);
PCRE_EXP_DECL int pcre_info(const pcre , int , int *);	PCRE_EXP_DECL int pcre16_get_substring_list(PCRE_SPTR16, int *, int,
	PCRE_SPTR16 **);
PCRE_EXP_DECL const unsigned char *pcre_maketables(void);	PCRE_EXP_DECL const unsigned char *pcre_maketables(void);
	PCRE_EXP_DECL const unsigned char *pcre16_maketables(void);
PCRE_EXP_DECL int pcre_refcount(pcre *, int);	PCRE_EXP_DECL int pcre_refcount(pcre *, int);
	PCRE_EXP_DECL int pcre16_refcount(pcre16 *, int);
PCRE_EXP_DECL pcre_extra pcre_study(const pcre , int, const char **);	PCRE_EXP_DECL pcre_extra pcre_study(const pcre , int, const char **);
	PCRE_EXP_DECL pcre16_extra pcre16_study(const pcre16 , int, const char **);
PCRE_EXP_DECL void pcre_free_study(pcre_extra *);	PCRE_EXP_DECL void pcre_free_study(pcre_extra *);
	PCRE_EXP_DECL void pcre16_free_study(pcre16_extra *);
PCRE_EXP_DECL const char *pcre_version(void);	PCRE_EXP_DECL const char *pcre_version(void);
	PCRE_EXP_DECL const char *pcre16_version(void);

	/* Utility functions for byte order swaps. */
	PCRE_EXP_DECL int pcre_pattern_to_host_byte_order(pcre , pcre_extra ,
	const unsigned char *);
	PCRE_EXP_DECL int pcre16_pattern_to_host_byte_order(pcre16 , pcre16_extra ,
	const unsigned char *);
	PCRE_EXP_DECL int pcre16_utf16_to_host_byte_order(PCRE_UCHAR16 *,
	PCRE_SPTR16, int, int *, int);

/* JIT compiler related functions. */	/* JIT compiler related functions. */

PCRE_EXP_DECL pcre_jit_stack *pcre_jit_stack_alloc(int, int);	PCRE_EXP_DECL pcre_jit_stack *pcre_jit_stack_alloc(int, int);
	PCRE_EXP_DECL pcre16_jit_stack *pcre16_jit_stack_alloc(int, int);
PCRE_EXP_DECL void pcre_jit_stack_free(pcre_jit_stack *);	PCRE_EXP_DECL void pcre_jit_stack_free(pcre_jit_stack *);
PCRE_EXP_DECL void pcre_assign_jit_stack(pcre_extra , pcre_jit_callback, void );	PCRE_EXP_DECL void pcre16_jit_stack_free(pcre16_jit_stack *);
	PCRE_EXP_DECL void pcre_assign_jit_stack(pcre_extra *,
	pcre_jit_callback, void *);
	PCRE_EXP_DECL void pcre16_assign_jit_stack(pcre16_extra *,
	pcre16_jit_callback, void *);

#ifdef __cplusplus	#ifdef __cplusplus
} /* extern "C" */	} /* extern "C" */

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.1.1.1
changed lines
	Added in v.1.1.1.2