/[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 1325 by ph10, Fri May 10 14:03:18 2013 UTC revision 1346 by ph10, Tue Jul 2 18:37:36 2013 UTC
# Line 3590  for (;;) Line 3590  for (;;)
3590            if (fc != cc && foc != cc) break;            if (fc != cc && foc != cc) break;
3591            eptr++;            eptr++;
3592            }            }
   
3593          if (possessive) continue;       /* No backtracking */          if (possessive) continue;       /* No backtracking */
3594          for (;;)          for (;;)
3595            {            {
# Line 3599  for (;;) Line 3598  for (;;)
3598            eptr--;            eptr--;
3599            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3600            }            }
3601          RRETURN(MATCH_NOMATCH);          /* Control never gets here */
3602          }          }
       /* Control never gets here */  
3603        }        }
3604    
3605      /* Caseful comparisons (includes all multi-byte characters) */      /* Caseful comparisons (includes all multi-byte characters) */
# Line 3657  for (;;) Line 3655  for (;;)
3655            eptr--;            eptr--;
3656            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
3657            }            }
3658          RRETURN(MATCH_NOMATCH);          /* Control never gets here */
3659          }          }
3660        }        }
3661      /* Control never gets here */      /* Control never gets here */
# Line 3942  for (;;) Line 3940  for (;;)
3940              eptr--;              eptr--;
3941              }              }
3942            }            }
3943            /* Control never gets here */
         RRETURN(MATCH_NOMATCH);  
3944          }          }
       /* Control never gets here */  
3945        }        }
3946    
3947      /* Caseful comparisons */      /* Caseful comparisons */
# Line 4079  for (;;) Line 4075  for (;;)
4075              eptr--;              eptr--;
4076              }              }
4077            }            }
4078            /* Control never gets here */
         RRETURN(MATCH_NOMATCH);  
4079          }          }
4080        }        }
4081      /* Control never gets here */      /* Control never gets here */
# Line 6210  for (;;) Line 6205  for (;;)
6205                eptr[-1] == CHAR_CR) eptr--;                eptr[-1] == CHAR_CR) eptr--;
6206            }            }
6207          }          }
6208    
6209        /* Get here if we can't make it match with any permitted repetitions */        /* Control never gets here */
   
       RRETURN(MATCH_NOMATCH);  
6210        }        }
     /* Control never gets here */  
6211    
6212      /* There's been some horrible disaster. Arrival here can only mean there is      /* There's been some horrible disaster. Arrival here can only mean there is
6213      something seriously wrong in the code above or the OP_xxx definitions. */      something seriously wrong in the code above or the OP_xxx definitions. */
# Line 6410  const pcre_uint8 *start_bits = NULL; Line 6402  const pcre_uint8 *start_bits = NULL;
6402  PCRE_PUCHAR start_match = (PCRE_PUCHAR)subject + start_offset;  PCRE_PUCHAR start_match = (PCRE_PUCHAR)subject + start_offset;
6403  PCRE_PUCHAR end_subject;  PCRE_PUCHAR end_subject;
6404  PCRE_PUCHAR start_partial = NULL;  PCRE_PUCHAR start_partial = NULL;
6405  PCRE_PUCHAR match_partial;  PCRE_PUCHAR match_partial = NULL;
6406  PCRE_PUCHAR req_char_ptr = start_match - 1;  PCRE_PUCHAR req_char_ptr = start_match - 1;
6407    
6408  const pcre_study_data *study;  const pcre_study_data *study;
# Line 7178  if (rc != MATCH_NOMATCH && rc != PCRE_ER Line 7170  if (rc != MATCH_NOMATCH && rc != PCRE_ER
7170    
7171  /* Handle partial matches - disable any mark data */  /* Handle partial matches - disable any mark data */
7172    
7173  if (start_partial != NULL)  if (match_partial != NULL)
7174    {    {
7175    DPRINTF((">>>> returning PCRE_ERROR_PARTIAL\n"));    DPRINTF((">>>> returning PCRE_ERROR_PARTIAL\n"));
7176    md->mark = NULL;    md->mark = NULL;

Legend:
Removed from v.1325  
changed lines
  Added in v.1346

  ViewVC Help
Powered by ViewVC 1.1.5