← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/default.cc

  • Committer: Monty Taylor
  • Date: 2008-12-01 17:53:42 UTC
  • mto: This revision was merged to the branch mainline in revision 637.
  • Revision ID: monty@bitters-20081201175342-hcvfaecqmljhv86g
Fixed Sun Studio warnings in mysys.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/default.cc
51
51
 
52
52
static const char *f_extensions[]= { ".cnf", 0 };
53
53
 
54
 
static int handle_default_option(void *in_ctx, const char *group_name,
55
 
                                 const char *option);
 
54
int handle_default_option(void *in_ctx, const char *group_name,
 
55
                          const char *option);
56
56
 
57
57
/*
58
58
   This structure defines the context that we pass to callback
153
153
    load_defaults() as otherwise we can't know the type of 'func_ctx'
154
154
  */
155
155
 
156
 
  if (my_defaults_group_suffix && func == handle_default_option)
 
156
  if (my_defaults_group_suffix && (func == handle_default_option))
157
157
  {
158
158
    /* Handle --defaults-group-suffix= */
159
159
    uint32_t i;
235
235
err:
236
236
  fprintf(stderr,"Fatal error in defaults handling. Program aborted\n");
237
237
  exit(1);
238
 
  return 0;                                     /* Keep compiler happy */
239
238
}
240
239
 
241
240
 
262
261
    1 - error occured
263
262
*/
264
263
 
265
 
static int handle_default_option(void *in_ctx, const char *group_name,
266
 
                                 const char *option)
 
264
int handle_default_option(void *in_ctx, const char *group_name,
 
265
                          const char *option)
267
266
{
268
267
  char *tmp;
269
268
  struct handle_option_ctx *ctx= (struct handle_option_ctx *) in_ctx;
468
467
 err:
469
468
  fprintf(stderr,"Fatal error in defaults handling. Program aborted\n");
470
469
  exit(1);
471
 
  return 0;                                     /* Keep compiler happy */
472
470
}
473
471
 
474
472