/[pcre]/code/branches/pcre16/pcre_dfa_exec.c
ViewVC logotype

Diff of /code/branches/pcre16/pcre_dfa_exec.c

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

revision 803 by ph10, Mon Dec 12 16:23:37 2011 UTC revision 804 by zherczeg, Wed Dec 14 11:18:01 2011 UTC
# Line 2550  for (;;) Line 2550  for (;;)
2550          if (code[LINK_SIZE+1] == OP_CALLOUT)          if (code[LINK_SIZE+1] == OP_CALLOUT)
2551            {            {
2552            rrc = 0;            rrc = 0;
2553            if (pcre_callout != NULL)            if (PUBL(callout) != NULL)
2554              {              {
2555              pcre_callout_block cb;              pcre_callout_block cb;
2556              cb.version          = 1;   /* Version 1 of the callout block */              cb.version          = 1;   /* Version 1 of the callout block */
# Line 2566  for (;;) Line 2566  for (;;)
2566              cb.capture_last     = -1;              cb.capture_last     = -1;
2567              cb.callout_data     = md->callout_data;              cb.callout_data     = md->callout_data;
2568              cb.mark             = NULL;   /* No (*MARK) support */              cb.mark             = NULL;   /* No (*MARK) support */
2569              if ((rrc = (*pcre_callout)(&cb)) < 0) return rrc;   /* Abandon */              if ((rrc = (*PUBL(callout))(&cb)) < 0) return rrc;   /* Abandon */
2570              }              }
2571            if (rrc > 0) break;                      /* Fail this thread */            if (rrc > 0) break;                      /* Fail this thread */
2572            code += PRIV(OP_lengths)[OP_CALLOUT];    /* Skip callout data */            code += PRIV(OP_lengths)[OP_CALLOUT];    /* Skip callout data */
# Line 2883  for (;;) Line 2883  for (;;)
2883    
2884        case OP_CALLOUT:        case OP_CALLOUT:
2885        rrc = 0;        rrc = 0;
2886        if (pcre_callout != NULL)        if (PUBL(callout) != NULL)
2887          {          {
2888          pcre_callout_block cb;          pcre_callout_block cb;
2889          cb.version          = 1;   /* Version 1 of the callout block */          cb.version          = 1;   /* Version 1 of the callout block */
# Line 2899  for (;;) Line 2899  for (;;)
2899          cb.capture_last     = -1;          cb.capture_last     = -1;
2900          cb.callout_data     = md->callout_data;          cb.callout_data     = md->callout_data;
2901          cb.mark             = NULL;   /* No (*MARK) support */          cb.mark             = NULL;   /* No (*MARK) support */
2902          if ((rrc = (*pcre_callout)(&cb)) < 0) return rrc;   /* Abandon */          if ((rrc = (*PUBL(callout))(&cb)) < 0) return rrc;   /* Abandon */
2903          }          }
2904        if (rrc == 0)        if (rrc == 0)
2905          { ADD_ACTIVE(state_offset + PRIV(OP_lengths)[OP_CALLOUT], 0); }          { ADD_ACTIVE(state_offset + PRIV(OP_lengths)[OP_CALLOUT], 0); }

Legend:
Removed from v.803  
changed lines
  Added in v.804

  ViewVC Help
Powered by ViewVC 1.1.5