← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/my_error.c

  • Committer: Brian Aker
  • Date: 2008-07-07 16:58:11 UTC
  • mfrom: (77.1.25 codestyle)
  • Revision ID: brian@tangent.org-20080707165811-jfqxacc3436dut4n
Merge from Monty's tree

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/my_error.c
83
83
  /* get the error message string. Default, if NULL or empty string (""). */
84
84
  if (! (format= (meh_p && (nr >= meh_p->meh_first)) ?
85
85
         meh_p->meh_errmsgs[nr - meh_p->meh_first] : NULL) || ! *format)
86
 
    (void) my_snprintf (ebuff, sizeof(ebuff), "Unknown error %d", nr);
 
86
    (void) snprintf (ebuff, sizeof(ebuff), "Unknown error %d", nr);
87
87
  else
88
88
  {
89
89
    va_start(args,MyFlags);
90
 
    (void) my_vsnprintf (ebuff, sizeof(ebuff), format, args);
 
90
    (void) vsnprintf (ebuff, sizeof(ebuff), format, args);
91
91
    va_end(args);
92
92
  }
93
93
  (*error_handler_hook)(nr, ebuff, MyFlags);
115
115
                    error, MyFlags, errno, format));
116
116
 
117
117
  va_start(args,MyFlags);
118
 
  (void) my_vsnprintf (ebuff, sizeof(ebuff), format, args);
 
118
  (void) vsnprintf (ebuff, sizeof(ebuff), format, args);
119
119
  va_end(args);
120
120
  (*error_handler_hook)(error, ebuff, MyFlags);
121
121
  DBUG_VOID_RETURN;