← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/my_getopt.cc

  • Committer: Monty Taylor
  • Date: 2008-12-07 23:42:51 UTC
  • mto: This revision was merged to the branch mainline in revision 670.
  • Revision ID: monty@inaugust.com-20081207234251-yxtbg06jpylwej29
Finally removed all of the my_malloc stuff.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/my_getopt.cc
642
642
    case GET_STR_ALLOC:
643
643
      if ((*((char**) result_pos)))
644
644
        free((*(char**) result_pos));
645
 
      if (!(*((char**) result_pos)= my_strdup(argument, MYF(MY_WME))))
 
645
      if (!(*((char**) result_pos)= strdup(argument)))
646
646
        return EXIT_OUT_OF_MEMORY;
647
647
      break;
648
648
    case GET_ENUM:
1031
1031
    if ((char*) (intptr_t) value)
1032
1032
    {
1033
1033
      free((*(char**) variable));
1034
 
      *((char**) variable)= my_strdup((char*) (intptr_t) value, MYF(MY_WME));
 
1034
      *((char**) variable)= strdup((char*) (intptr_t) value);
1035
1035
    }
1036
1036
    break;
1037
1037
  default: /* dummy default to avoid compiler warnings */