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

Diff of /code/trunk/pcreposix.c

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

revision 521 by ph10, Sat May 22 19:03:35 2010 UTC revision 574 by ph10, Sat Nov 20 17:47:27 2010 UTC
# Line 57  previously been set. */ Line 57  previously been set. */
57  #  define PCREPOSIX_EXP_DEFN __declspec(dllexport)  #  define PCREPOSIX_EXP_DEFN __declspec(dllexport)
58  #endif  #endif
59    
60    /* We include pcre.h before pcre_internal.h so that the PCRE library functions
61    are declared as "import" for Windows by defining PCRE_EXP_DECL as "import".
62    This is needed even though pcre_internal.h itself includes pcre.h, because it
63    does so after it has set PCRE_EXP_DECL to "export" if it is not already set. */
64    
65    #include "pcre.h"
66  #include "pcre_internal.h"  #include "pcre_internal.h"
67  #include "pcreposix.h"  #include "pcreposix.h"
68    
# Line 145  static const int eint[] = { Line 151  static const int eint[] = {
151    REG_BADPAT,  /* different names for subpatterns of the same number are not allowed */    REG_BADPAT,  /* different names for subpatterns of the same number are not allowed */
152    REG_BADPAT,  /* (*MARK) must have an argument */    REG_BADPAT,  /* (*MARK) must have an argument */
153    REG_INVARG,  /* this version of PCRE is not compiled with PCRE_UCP support */    REG_INVARG,  /* this version of PCRE is not compiled with PCRE_UCP support */
154      REG_BADPAT,  /* \c must be followed by an ASCII character */
155  };  };
156    
157  /* Table of texts corresponding to POSIX error codes */  /* Table of texts corresponding to POSIX error codes */
# Line 338  if ((eflags & REG_STARTEND) != 0) Line 345  if ((eflags & REG_STARTEND) != 0)
345  else  else
346    {    {
347    so = 0;    so = 0;
348    eo = strlen(string);    eo = (int)strlen(string);
349    }    }
350    
351  rc = pcre_exec((const pcre *)preg->re_pcre, NULL, string + so, (eo - so),  rc = pcre_exec((const pcre *)preg->re_pcre, NULL, string + so, (eo - so),
352    0, options, ovector, nmatch * 3);    0, options, ovector, (int)(nmatch * 3));
353    
354  if (rc == 0) rc = nmatch;    /* All captured slots were filled in */  if (rc == 0) rc = (int)nmatch;    /* All captured slots were filled in */
355    
356  /* Successful match */  /* Successful match */
357    

Legend:
Removed from v.521  
changed lines
  Added in v.574

  ViewVC Help
Powered by ViewVC 1.1.5