/[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 1476 by ph10, Mon Apr 21 16:11:50 2014 UTC revision 1477 by ph10, Wed May 21 17:53:49 2014 UTC
# Line 3035  switch(c) Line 3035  switch(c)
3035      end += 1 + 2 * IMM2_SIZE;      end += 1 + 2 * IMM2_SIZE;
3036      break;      break;
3037      }      }
3038    list[2] = end - code;    list[2] = (pcre_uint32)(end - code);
3039    return end;    return end;
3040    }    }
3041  return NULL;    /* Opcode not accepted */  return NULL;    /* Opcode not accepted */
# Line 4860  for (;; ptr++) Line 4860  for (;; ptr++)
4860        if (lengthptr != NULL && class_uchardata > class_uchardata_base)        if (lengthptr != NULL && class_uchardata > class_uchardata_base)
4861          {          {
4862          xclass = TRUE;          xclass = TRUE;
4863          *lengthptr += class_uchardata - class_uchardata_base;          *lengthptr += (int)(class_uchardata - class_uchardata_base);
4864          class_uchardata = class_uchardata_base;          class_uchardata = class_uchardata_base;
4865          }          }
4866  #endif  #endif
# Line 6005  for (;; ptr++) Line 6005  for (;; ptr++)
6005                while (cd->hwm > cd->start_workspace + cd->workspace_size -                while (cd->hwm > cd->start_workspace + cd->workspace_size -
6006                       WORK_SIZE_SAFETY_MARGIN - (this_hwm - save_hwm))                       WORK_SIZE_SAFETY_MARGIN - (this_hwm - save_hwm))
6007                  {                  {
6008                  int save_offset = save_hwm - cd->start_workspace;                  size_t save_offset = save_hwm - cd->start_workspace;
6009                  int this_offset = this_hwm - cd->start_workspace;                  size_t this_offset = this_hwm - cd->start_workspace;
6010                  *errorcodeptr = expand_workspace(cd);                  *errorcodeptr = expand_workspace(cd);
6011                  if (*errorcodeptr != 0) goto FAILED;                  if (*errorcodeptr != 0) goto FAILED;
6012                  save_hwm = (pcre_uchar *)cd->start_workspace + save_offset;                  save_hwm = (pcre_uchar *)cd->start_workspace + save_offset;
# Line 6087  for (;; ptr++) Line 6087  for (;; ptr++)
6087            while (cd->hwm > cd->start_workspace + cd->workspace_size -            while (cd->hwm > cd->start_workspace + cd->workspace_size -
6088                   WORK_SIZE_SAFETY_MARGIN - (this_hwm - save_hwm))                   WORK_SIZE_SAFETY_MARGIN - (this_hwm - save_hwm))
6089              {              {
6090              int save_offset = save_hwm - cd->start_workspace;              size_t save_offset = save_hwm - cd->start_workspace;
6091              int this_offset = this_hwm - cd->start_workspace;              size_t this_offset = this_hwm - cd->start_workspace;
6092              *errorcodeptr = expand_workspace(cd);              *errorcodeptr = expand_workspace(cd);
6093              if (*errorcodeptr != 0) goto FAILED;              if (*errorcodeptr != 0) goto FAILED;
6094              save_hwm = (pcre_uchar *)cd->start_workspace + save_offset;              save_hwm = (pcre_uchar *)cd->start_workspace + save_offset;

Legend:
Removed from v.1476  
changed lines
  Added in v.1477

  ViewVC Help
Powered by ViewVC 1.1.5