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

Diff of /code/trunk/pcre_get.c

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

revision 852 by zherczeg, Thu Jan 5 19:18:12 2012 UTC revision 860 by zherczeg, Mon Jan 9 20:12:58 2012 UTC
# Line 139  pcre_get_stringtable_entries(const pcre Line 139  pcre_get_stringtable_entries(const pcre
139  #else  #else
140  PCRE_EXP_DEFN int PCRE_CALL_CONVENTION  PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
141  pcre16_get_stringtable_entries(const pcre16 *code, PCRE_SPTR16 stringname,  pcre16_get_stringtable_entries(const pcre16 *code, PCRE_SPTR16 stringname,
142    PCRE_SCHAR16 **firstptr, PCRE_SCHAR16 **lastptr)    PCRE_UCHAR16 **firstptr, PCRE_UCHAR16 **lastptr)
143  #endif  #endif
144  {  {
145  int rc;  int rc;
# Line 196  while (top > bot) Line 196  while (top > bot)
196      *firstptr = (char *)first;      *firstptr = (char *)first;
197      *lastptr = (char *)last;      *lastptr = (char *)last;
198  #else  #else
199      *firstptr = (PCRE_SCHAR16 *)first;      *firstptr = (PCRE_UCHAR16 *)first;
200      *lastptr = (PCRE_SCHAR16 *)last;      *lastptr = (PCRE_UCHAR16 *)last;
201  #endif  #endif
202      return entrysize;      return entrysize;
203      }      }
# Line 247  entrysize = pcre_get_stringtable_entries Line 247  entrysize = pcre_get_stringtable_entries
247  if ((re->options & PCRE_DUPNAMES) == 0 && (re->flags & PCRE_JCHANGED) == 0)  if ((re->options & PCRE_DUPNAMES) == 0 && (re->flags & PCRE_JCHANGED) == 0)
248    return pcre16_get_stringnumber(code, stringname);    return pcre16_get_stringnumber(code, stringname);
249  entrysize = pcre16_get_stringtable_entries(code, stringname,  entrysize = pcre16_get_stringtable_entries(code, stringname,
250    (PCRE_SCHAR16 **)&first, (PCRE_SCHAR16 **)&last);    (PCRE_UCHAR16 **)&first, (PCRE_UCHAR16 **)&last);
251  #endif  #endif
252  if (entrysize <= 0) return entrysize;  if (entrysize <= 0) return entrysize;
253  for (entry = (pcre_uchar *)first; entry <= (pcre_uchar *)last; entry += entrysize)  for (entry = (pcre_uchar *)first; entry <= (pcre_uchar *)last; entry += entrysize)
# Line 295  pcre_copy_substring(const char *subject, Line 295  pcre_copy_substring(const char *subject,
295  #else  #else
296  PCRE_EXP_DEFN int PCRE_CALL_CONVENTION  PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
297  pcre16_copy_substring(PCRE_SPTR16 subject, int *ovector, int stringcount,  pcre16_copy_substring(PCRE_SPTR16 subject, int *ovector, int stringcount,
298    int stringnumber, PCRE_SCHAR16 *buffer, int size)    int stringnumber, PCRE_UCHAR16 *buffer, int size)
299  #endif  #endif
300  {  {
301  int yield;  int yield;
# Line 348  pcre_copy_named_substring(const pcre *co Line 348  pcre_copy_named_substring(const pcre *co
348  PCRE_EXP_DEFN int PCRE_CALL_CONVENTION  PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
349  pcre16_copy_named_substring(const pcre16 *code, PCRE_SPTR16 subject,  pcre16_copy_named_substring(const pcre16 *code, PCRE_SPTR16 subject,
350    int *ovector, int stringcount, PCRE_SPTR16 stringname,    int *ovector, int stringcount, PCRE_SPTR16 stringname,
351    PCRE_SCHAR16 *buffer, int size)    PCRE_UCHAR16 *buffer, int size)
352  #endif  #endif
353  {  {
354  int n = get_first_set(code, stringname, ovector);  int n = get_first_set(code, stringname, ovector);

Legend:
Removed from v.852  
changed lines
  Added in v.860

  ViewVC Help
Powered by ViewVC 1.1.5