← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/my_getopt.cc

  • Committer: Stewart Smith
  • Date: 2009-03-18 00:29:24 UTC
  • mto: (942.1.10 mordred)
  • mto: This revision was merged to the branch mainline in revision 945.
  • Revision ID: stewart@flamingspork.com-20090318002924-gixoh4t5mhbw8qyz
make set_if_bigger typesafe for C and C++. Fix up everywhere.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/my_getopt.cc
580
580
  if ((ptr != NULL) && (end != NULL) && (end - ptr > 1))
581
581
  {
582
582
    uint32_t len= (uint32_t) (ptr - cur_arg);
583
 
    set_if_smaller(len, FN_REFLEN-1);
 
583
    set_if_smaller(len, (uint32_t)FN_REFLEN-1);
584
584
    strncpy(key_name, cur_arg, len);
585
585
    return ++ptr;
586
586
  }