← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/strfunc.cc

  • Committer: Monty Taylor
  • Date: 2009-06-08 19:10:56 UTC
  • mto: This revision was merged to the branch mainline in revision 1060.
  • Revision ID: mordred@inaugust.com-20090608191056-ycp5b4rgb2hv1ufx
First pass at removing strconvert.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/strfunc.cc
54
54
      uint32_t var_len;
55
55
      int mblen= 1;
56
56
 
57
 
      if (cs && cs->mbminlen > 1)
58
 
      {
59
 
        for ( ; pos < end; pos+= mblen)
60
 
        {
61
 
          my_wc_t wc;
62
 
          if ((mblen= cs->cset->mb_wc(cs, &wc, (const unsigned char *) pos,
63
 
                                               (const unsigned char *) end)) < 1)
64
 
            mblen= 1; // Not to hang on a wrong multibyte sequence
65
 
          if (wc == (my_wc_t) field_separator)
66
 
            break;
67
 
        }
68
 
      }
69
 
      else
70
 
        for (; pos != end && *pos != field_separator; pos++) ;
 
57
      for (; pos != end && *pos != field_separator; pos++) 
 
58
      {}
71
59
      var_len= (uint32_t) (pos - start);
72
60
      uint32_t find= cs ? find_type2(lib, start, var_len, cs) :
73
61
                      find_type(lib, start, var_len, (bool) 0);