← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/memory/root.cc

  • Committer: Mark Atwood
  • Date: 2011-08-04 16:21:21 UTC
  • mfrom: (2318.9.14 refactor3)
  • Revision ID: me@mark.atwood.name-20110804162121-6b9ay1b1de3yfgvl
merge lp:~olafvdspek/drizzle/refactor3

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/memory/root.cc
327
327
 */
328
328
char* Root::strdup(const char* str)
329
329
{
330
 
  return strmake(str, strlen(str));
 
330
  return strdup(str, strlen(str));
331
331
}
332
332
 
333
333
/**
341
341
 * even if the original string wasn't (one additional byte is allocated for
342
342
 * this purpose).
343
343
 */
344
 
char* Root::strmake(const char* str, size_t len)
 
344
char* Root::strdup(const char* str, size_t len)
345
345
{
346
346
  char* pos= (char*)alloc(len + 1);
347
347
  memcpy(pos, str, len);
349
349
  return pos;
350
350
}
351
351
 
352
 
char* Root::strmake(const std::string& v)
353
 
{
354
 
  return strmake(v.data(), v.size());
355
 
}
356
 
 
357
 
char* Root::strmake(const String& v)
358
 
{
359
 
  return strmake(v.ptr(), v.length());
 
352
char* Root::strdup(str_ref v)
 
353
{
 
354
  return strdup(v.data(), v.size());
360
355
}
361
356
 
362
357
/**