← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/errmsg_print.cc

  • Committer: Brian Aker
  • Date: 2011-02-20 10:41:15 UTC
  • mto: This revision was merged to the branch mainline in revision 2187.
  • Revision ID: brian@tangent.org-20110220104115-4uyo618hvp9rv4h9
strerror_r fix

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/errmsg_print.cc
36
36
 
37
37
void sql_perror(const char *message)
38
38
{
 
39
  char *errmsg_ptr;
39
40
  char errmsg[STRERROR_MAX];
40
41
  errmsg[0]= 0;
41
 
  strerror_r(errno, errmsg, sizeof(errmsg));
 
42
 
 
43
#ifdef _GNU_SOURCE
 
44
      errmsg_ptr= strerror_r(errno, errmsg, sizeof(errmsg));
 
45
#else
 
46
      strerror_r(errno, errmsg, sizeof(errmsg));
 
47
      errmsg_ptr= errmsg;
 
48
#endif
 
49
 
42
50
  errmsg_printf(error::ERROR, "%s: %s\n", message, errmsg);
 
51
 
43
52
}
44
53
 
45
54
// @todo Cap the size of message.
52
61
// @todo Cap the size of message/extra.
53
62
void sql_perror(std::string message, const std::string &extra)
54
63
{
 
64
  char *errmsg_ptr;
55
65
  char errmsg[STRERROR_MAX];
56
66
  errmsg[0]= 0;
57
 
  strerror_r(errno, errmsg, sizeof(errmsg));
 
67
 
 
68
#ifdef _GNU_SOURCE
 
69
      errmsg_ptr= strerror_r(errno, errmsg, sizeof(errmsg));
 
70
#else
 
71
      strerror_r(errno, errmsg, sizeof(errmsg));
 
72
      errmsg_ptr= errmsg;
 
73
#endif
58
74
 
59
75
  if (not extra.empty())
60
76
  {