← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/my_getopt.cc

  • Committer: Brian Aker
  • Date: 2008-12-02 16:33:43 UTC
  • mfrom: (632.1.19 devel)
  • Revision ID: brian@tangent.org-20081202163343-007ifg17p0lvjga7
Merge from Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/my_getopt.cc
31
31
typedef void (*init_func_p)(const struct my_option *option, char **variable,
32
32
                            int64_t value);
33
33
 
34
 
static void default_reporter(enum loglevel level, const char *format, ...);
 
34
void default_reporter(enum loglevel level, const char *format, ...);
35
35
my_error_reporter my_getopt_error_reporter= &default_reporter;
36
36
 
37
37
static int findopt(char *optpat, uint32_t length,
80
80
 
81
81
bool my_getopt_skip_unknown= 0;
82
82
 
83
 
static void default_reporter(enum loglevel level,
84
 
                             const char *format, ...)
 
83
void default_reporter(enum loglevel level,
 
84
                      const char *format, ...)
85
85
{
86
86
  va_list args;
87
87
  va_start(args, format);
581
581
  {
582
582
    uint32_t len= (uint) (ptr - cur_arg);
583
583
    set_if_smaller(len, FN_REFLEN-1);
584
 
    strmake(key_name, cur_arg, len);
 
584
    strncpy(key_name, cur_arg, len);
585
585
    return ++ptr;
586
586
  }
587
587
  key_name[0]= 0;
1051
1051
*/
1052
1052
 
1053
1053
static void fini_one_value(const struct my_option *option, char **variable,
1054
 
                           int64_t value __attribute__ ((unused)))
 
1054
                           int64_t)
1055
1055
{
1056
1056
  switch ((option->var_type & GET_TYPE_MASK)) {
1057
1057
  case GET_STR_ALLOC: