← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/default.cc

Merge Nathan

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/default.cc
39
39
#include <drizzled/configmake.h>
40
40
#include <drizzled/gettext.h>
41
41
 
 
42
#include <dirent.h>
 
43
 
42
44
#include <stdio.h>
43
 
#include <dirent.h>
 
45
#include <algorithm>
 
46
 
 
47
using namespace std;
 
48
 
44
49
 
45
50
const char *my_defaults_file=0;
46
51
const char *my_defaults_group_suffix=0;
733
738
      for ( ; my_isspace(&my_charset_utf8_general_ci,end[-1]) ; end--) ;
734
739
      end[0]=0;
735
740
 
736
 
      strncpy(curr_gr, ptr, cmin((size_t) (end-ptr)+1, sizeof(curr_gr)-1));
737
 
      curr_gr[cmin((size_t)(end-ptr)+1, sizeof(curr_gr)-1)] = '\0';
 
741
      strncpy(curr_gr, ptr, min((size_t) (end-ptr)+1, sizeof(curr_gr)-1));
 
742
      curr_gr[min((size_t)(end-ptr)+1, sizeof(curr_gr)-1)] = '\0';
738
743
 
739
744
      /* signal that a new group is found */
740
745
      opt_handler(handler_ctx, curr_gr, NULL);