← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/strfunc.cc

  • Committer: Andrey Hristov
  • Date: 2008-08-06 00:04:45 UTC
  • mto: (264.1.5 codestyle)
  • mto: This revision was merged to the branch mainline in revision 266.
  • Revision ID: ahristov@mysql.com-20080806000445-84urmltikgwk9v5d
Constify the usage of CHARSET_INFO almost to the last place in the code.
99% of the parameters are const CHARSET_INFO * const cs.
Wherever possible stack variables are also double consted.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/strfunc.cc
38
38
 
39
39
static const char field_separator=',';
40
40
 
41
 
uint64_t find_set(TYPELIB *lib, const char *str, uint length, CHARSET_INFO *cs,
42
 
                   char **err_pos, uint *err_len, bool *set_warning)
 
41
uint64_t find_set(TYPELIB *lib, const char *str, uint length,
 
42
                  const CHARSET_INFO * const cs,
 
43
                  char **err_pos, uint *err_len, bool *set_warning)
43
44
{
44
 
  CHARSET_INFO *strip= cs ? cs : &my_charset_latin1;
 
45
  const CHARSET_INFO * const strip= cs ? cs : &my_charset_latin1;
45
46
  const char *end= str + strip->cset->lengthsp(strip, str, length);
46
47
  uint64_t found= 0;
47
48
  *err_pos= 0;                  // No error yet
146
147
*/
147
148
 
148
149
uint find_type2(const TYPELIB *typelib, const char *x, uint length,
149
 
                CHARSET_INFO *cs)
 
150
                const CHARSET_INFO * const cs)
150
151
{
151
152
  int pos;
152
153
  const char *j;
254
255
*/
255
256
 
256
257
 
257
 
uint strconvert(CHARSET_INFO *from_cs, const char *from,
258
 
                CHARSET_INFO *to_cs, char *to, uint to_length, uint *errors)
 
258
uint strconvert(const CHARSET_INFO * const from_cs, const char *from,
 
259
                const CHARSET_INFO * const to_cs, char *to, uint to_length, uint *errors)
259
260
{
260
261
  int cnvres;
261
262
  my_wc_t wc;
326
327
*/
327
328
 
328
329
int find_string_in_array(LEX_STRING * const haystack, LEX_STRING * const needle,
329
 
                         CHARSET_INFO * const cs)
 
330
                         const CHARSET_INFO * const cs)
330
331
{
331
332
  const LEX_STRING *pos;
332
333
  for (pos= haystack; pos->str; pos++)