← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/my_once.cc

  • Committer: Monty Taylor
  • Date: 2008-11-07 00:35:38 UTC
  • mto: (575.1.8 devel)
  • mto: This revision was merged to the branch mainline in revision 579.
  • Revision ID: monty@inaugust.com-20081107003538-x48mj66gkbrdjcuc
Made mysys and mystrings c++. Fixed the resulting bugs the compiler found.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/my_once.cc
75
75
char *my_once_strdup(const char *src,myf myflags)
76
76
{
77
77
  size_t len= strlen(src)+1;
78
 
  unsigned char *dst= my_once_alloc(len, myflags);
 
78
  void *dst= my_once_alloc(len, myflags);
79
79
  if (dst)
80
80
    memcpy(dst, src, len);
81
81
  return (char*) dst;
84
84
 
85
85
void *my_once_memdup(const void *src, size_t len, myf myflags)
86
86
{
87
 
  unsigned char *dst= my_once_alloc(len, myflags);
 
87
  void *dst= my_once_alloc(len, myflags);
88
88
  if (dst)
89
89
    memcpy(dst, src, len);
90
90
  return dst;