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

Diff of /code/trunk/pcre_compile.c

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

revision 117 by ph10, Fri Mar 9 15:59:06 2007 UTC revision 145 by ph10, Wed Apr 4 14:06:52 2007 UTC
# Line 5043  Returns:        pointer to compiled data Line 5043  Returns:        pointer to compiled data
5043                  with errorptr and erroroffset set                  with errorptr and erroroffset set
5044  */  */
5045    
5046  PCRE_DATA_SCOPE pcre *  PCRE_EXP_DEFN pcre *
5047  pcre_compile(const char *pattern, int options, const char **errorptr,  pcre_compile(const char *pattern, int options, const char **errorptr,
5048    int *erroroffset, const unsigned char *tables)    int *erroroffset, const unsigned char *tables)
5049  {  {
# Line 5051  return pcre_compile2(pattern, options, N Line 5051  return pcre_compile2(pattern, options, N
5051  }  }
5052    
5053    
5054  PCRE_DATA_SCOPE pcre *  PCRE_EXP_DEFN pcre *
5055  pcre_compile2(const char *pattern, int options, int *errorcodeptr,  pcre_compile2(const char *pattern, int options, int *errorcodeptr,
5056    const char **errorptr, int *erroroffset, const unsigned char *tables)    const char **errorptr, int *erroroffset, const unsigned char *tables)
5057  {  {
# Line 5100  if (errorcodeptr != NULL) *errorcodeptr Line 5100  if (errorcodeptr != NULL) *errorcodeptr
5100  if (erroroffset == NULL)  if (erroroffset == NULL)
5101    {    {
5102    errorcode = ERR16;    errorcode = ERR16;
5103    goto PCRE_EARLY_ERROR_RETURN;    goto PCRE_EARLY_ERROR_RETURN2;
5104    }    }
5105    
5106  *erroroffset = 0;  *erroroffset = 0;
# Line 5113  if (utf8 && (options & PCRE_NO_UTF8_CHEC Line 5113  if (utf8 && (options & PCRE_NO_UTF8_CHEC
5113       (*erroroffset = _pcre_valid_utf8((uschar *)pattern, -1)) >= 0)       (*erroroffset = _pcre_valid_utf8((uschar *)pattern, -1)) >= 0)
5114    {    {
5115    errorcode = ERR44;    errorcode = ERR44;
5116    goto PCRE_UTF8_ERROR_RETURN;    goto PCRE_EARLY_ERROR_RETURN2;
5117    }    }
5118  #else  #else
5119  if ((options & PCRE_UTF8) != 0)  if ((options & PCRE_UTF8) != 0)
# Line 5325  if (errorcode != 0) Line 5325  if (errorcode != 0)
5325    (pcre_free)(re);    (pcre_free)(re);
5326    PCRE_EARLY_ERROR_RETURN:    PCRE_EARLY_ERROR_RETURN:
5327    *erroroffset = ptr - (const uschar *)pattern;    *erroroffset = ptr - (const uschar *)pattern;
5328  #ifdef SUPPORT_UTF8    PCRE_EARLY_ERROR_RETURN2:
   PCRE_UTF8_ERROR_RETURN:  
 #endif  
5329    *errorptr = error_texts[errorcode];    *errorptr = error_texts[errorcode];
5330    if (errorcodeptr != NULL) *errorcodeptr = errorcode;    if (errorcodeptr != NULL) *errorcodeptr = errorcode;
5331    return NULL;    return NULL;
Legend:
Removed from v.117  
changed lines
  Added in v.145
  ViewVC Help
Powered by ViewVC 1.1.5