/[pcre]/code/trunk/pcre_exec.c
ViewVC logotype

Diff of /code/trunk/pcre_exec.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 850 by zherczeg, Wed Jan 4 17:29:11 2012 UTC revision 852 by zherczeg, Thu Jan 5 19:18:12 2012 UTC
# Line 1227  for (;;) Line 1227  for (;;)
1227          cb.version          = 2;   /* Version 1 of the callout block */          cb.version          = 2;   /* Version 1 of the callout block */
1228          cb.callout_number   = ecode[LINK_SIZE+2];          cb.callout_number   = ecode[LINK_SIZE+2];
1229          cb.offset_vector    = md->offset_vector;          cb.offset_vector    = md->offset_vector;
1230    #ifdef COMPILE_PCRE8
1231          cb.subject          = (PCRE_SPTR)md->start_subject;          cb.subject          = (PCRE_SPTR)md->start_subject;
1232    #else
1233            cb.subject          = (PCRE_SPTR16)md->start_subject;
1234    #endif
1235          cb.subject_length   = (int)(md->end_subject - md->start_subject);          cb.subject_length   = (int)(md->end_subject - md->start_subject);
1236          cb.start_match      = (int)(mstart - md->start_subject);          cb.start_match      = (int)(mstart - md->start_subject);
1237          cb.current_position = (int)(eptr - md->start_subject);          cb.current_position = (int)(eptr - md->start_subject);
# Line 1637  for (;;) Line 1641  for (;;)
1641        cb.version          = 2;   /* Version 1 of the callout block */        cb.version          = 2;   /* Version 1 of the callout block */
1642        cb.callout_number   = ecode[1];        cb.callout_number   = ecode[1];
1643        cb.offset_vector    = md->offset_vector;        cb.offset_vector    = md->offset_vector;
1644    #ifdef COMPILE_PCRE8
1645        cb.subject          = (PCRE_SPTR)md->start_subject;        cb.subject          = (PCRE_SPTR)md->start_subject;
1646    #else
1647          cb.subject          = (PCRE_SPTR16)md->start_subject;
1648    #endif
1649        cb.subject_length   = (int)(md->end_subject - md->start_subject);        cb.subject_length   = (int)(md->end_subject - md->start_subject);
1650        cb.start_match      = (int)(mstart - md->start_subject);        cb.start_match      = (int)(mstart - md->start_subject);
1651        cb.current_position = (int)(eptr - md->start_subject);        cb.current_position = (int)(eptr - md->start_subject);
# Line 6139  pcre_exec(const pcre *argument_re, const Line 6147  pcre_exec(const pcre *argument_re, const
6147    int offsetcount)    int offsetcount)
6148  #else  #else
6149  PCRE_EXP_DEFN int PCRE_CALL_CONVENTION  PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
6150  pcre16_exec(const pcre *argument_re, const pcre16_extra *extra_data,  pcre16_exec(const pcre16 *argument_re, const pcre16_extra *extra_data,
6151    PCRE_SPTR16 subject, int length, int start_offset, int options, int *offsets,    PCRE_SPTR16 subject, int length, int start_offset, int options, int *offsets,
6152    int offsetcount)    int offsetcount)
6153  #endif  #endif
# Line 6167  PCRE_PUCHAR start_partial = NULL; Line 6175  PCRE_PUCHAR start_partial = NULL;
6175  PCRE_PUCHAR req_char_ptr = start_match - 1;  PCRE_PUCHAR req_char_ptr = start_match - 1;
6176    
6177  const pcre_study_data *study;  const pcre_study_data *study;
6178  const real_pcre *external_re = (const real_pcre *)argument_re;  const REAL_PCRE *re = (const REAL_PCRE *)argument_re;
 const real_pcre *re = external_re;  
6179    
6180  /* Plausibility checks */  /* Plausibility checks */
6181    
# Line 6255  md->callout_data = NULL; Line 6262  md->callout_data = NULL;
6262    
6263  /* The table pointer is always in native byte order. */  /* The table pointer is always in native byte order. */
6264    
6265  tables = external_re->tables;  tables = re->tables;
6266    
6267  if (extra_data != NULL)  if (extra_data != NULL)
6268    {    {
# Line 6295  firstline = (re->options & PCRE_FIRSTLIN Line 6302  firstline = (re->options & PCRE_FIRSTLIN
6302    
6303  /* The code starts after the real_pcre block and the capture name table. */  /* The code starts after the real_pcre block and the capture name table. */
6304    
6305  md->start_code = (const pcre_uchar *)external_re + re->name_table_offset +  md->start_code = (const pcre_uchar *)re + re->name_table_offset +
6306    re->name_count * re->name_entry_size;    re->name_count * re->name_entry_size;
6307    
6308  md->start_subject = (PCRE_PUCHAR)subject;  md->start_subject = (PCRE_PUCHAR)subject;

Legend:
Removed from v.850  
changed lines
  Added in v.852

  ViewVC Help
Powered by ViewVC 1.1.5