← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/utf8/utf8.h

Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/utf8/utf8.h
113
113
static inline uint32_t char_length(const std::string &in_string)
114
114
{
115
115
  uint32_t length= 0;
 
116
  int seq_length= 0;
116
117
  std::string::const_iterator iter= in_string.begin();
117
118
  while (iter < in_string.end())
118
119
  {
119
120
    length++;
120
 
    iter += sequence_length(*iter);
 
121
    seq_length= sequence_length(*iter);
 
122
    iter += (seq_length > 0) ? seq_length : 1;
121
123
  }
122
124
  return length;
123
125
}