/[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 849 by ph10, Sat Dec 31 15:19:04 2011 UTC revision 850 by zherczeg, Wed Jan 4 17:29:11 2012 UTC
# Line 1223  for (;;) Line 1223  for (;;)
1223        {        {
1224        if (PUBL(callout) != NULL)        if (PUBL(callout) != NULL)
1225          {          {
1226          pcre_callout_block cb;          PUBL(callout_block) cb;
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;
# Line 1633  for (;;) Line 1633  for (;;)
1633      case OP_CALLOUT:      case OP_CALLOUT:
1634      if (PUBL(callout) != NULL)      if (PUBL(callout) != NULL)
1635        {        {
1636        pcre_callout_block cb;        PUBL(callout_block) cb;
1637        cb.version          = 2;   /* Version 1 of the callout block */        cb.version          = 2;   /* Version 1 of the callout block */
1638        cb.callout_number   = ecode[1];        cb.callout_number   = ecode[1];
1639        cb.offset_vector    = md->offset_vector;        cb.offset_vector    = md->offset_vector;
# Line 6139  pcre_exec(const pcre *argument_re, const Line 6139  pcre_exec(const pcre *argument_re, const
6139    int offsetcount)    int offsetcount)
6140  #else  #else
6141  PCRE_EXP_DEFN int PCRE_CALL_CONVENTION  PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
6142  pcre16_exec(const pcre *argument_re, const pcre_extra *extra_data,  pcre16_exec(const pcre *argument_re, const pcre16_extra *extra_data,
6143    PCRE_SPTR16 subject, int length, int start_offset, int options, int *offsets,    PCRE_SPTR16 subject, int length, int start_offset, int options, int *offsets,
6144    int offsetcount)    int offsetcount)
6145  #endif  #endif
# Line 6858  if (rc == MATCH_MATCH || rc == MATCH_ACC Line 6858  if (rc == MATCH_MATCH || rc == MATCH_ACC
6858    /* Return MARK data if requested */    /* Return MARK data if requested */
6859    
6860    if (extra_data != NULL && (extra_data->flags & PCRE_EXTRA_MARK) != 0)    if (extra_data != NULL && (extra_data->flags & PCRE_EXTRA_MARK) != 0)
6861      *(extra_data->mark) = (unsigned char *)(md->mark);      *(extra_data->mark) = (pcre_uchar *)md->mark;
6862    DPRINTF((">>>> returning %d\n", rc));    DPRINTF((">>>> returning %d\n", rc));
6863    return rc;    return rc;
6864    }    }
# Line 6905  else Line 6905  else
6905  /* Return the MARK data if it has been requested. */  /* Return the MARK data if it has been requested. */
6906    
6907  if (extra_data != NULL && (extra_data->flags & PCRE_EXTRA_MARK) != 0)  if (extra_data != NULL && (extra_data->flags & PCRE_EXTRA_MARK) != 0)
6908    *(extra_data->mark) = (unsigned char *)(md->nomatch_mark);    *(extra_data->mark) = (pcre_uchar *)md->nomatch_mark;
6909  return rc;  return rc;
6910  }  }
6911    

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

  ViewVC Help
Powered by ViewVC 1.1.5