~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/discover.cc

  • Committer: Brian Aker
  • Date: 2008-11-04 15:39:09 UTC
  • mfrom: (575.1.2 devel)
  • Revision ID: brian@tangent.org-20081104153909-c72hn65udxs1ccal
Merge of Monty's work

Show diffs side-by-side

added added

removed removed

Lines of Context:
39
39
  @retval
40
40
    3    Could not allocate data for read.  Could not read file
41
41
*/
42
 
int readfrm(const char *name, uchar **frmdata, size_t *len)
 
42
int readfrm(const char *name, unsigned char **frmdata, size_t *len)
43
43
{
44
44
  int    error;
45
45
  char   index_file[FN_REFLEN];
46
46
  File   file;
47
47
  size_t read_len;
48
 
  uchar *read_data;
 
48
  unsigned char *read_data;
49
49
  struct stat state;  
50
50
  
51
51
  *frmdata= NULL;      // In case of errors
53
53
  error= 1;
54
54
  if ((file=my_open(fn_format(index_file,name,"",reg_ext,
55
55
                              MY_UNPACK_FILENAME|MY_APPEND_EXT),
56
 
                    O_RDONLY | O_SHARE,
 
56
                    O_RDONLY,
57
57
                    MYF(0))) < 0)  
58
58
    goto err_end; 
59
59
  
70
70
    goto err;
71
71
 
72
72
  // Setup return data
73
 
  *frmdata= (uchar*) read_data;
 
73
  *frmdata= (unsigned char*) read_data;
74
74
  *len= read_len;
75
75
  error= 0;
76
76
  
77
77
 err:
78
78
  if (file > 0)
79
 
    VOID(my_close(file,MYF(MY_WME)));
 
79
    my_close(file,MYF(MY_WME));
80
80
  
81
81
 err_end:                     /* Here when no file */
82
82
  return(error);
96
96
  @retval
97
97
    2    Could not write file
98
98
*/
99
 
int writefrm(const char *name, const uchar *frmdata, size_t len)
 
99
int writefrm(const char *name, const unsigned char *frmdata, size_t len)
100
100
{
101
101
  File file;
102
102
  char   index_file[FN_REFLEN];
109
109
  {
110
110
    if (my_write(file, frmdata, len,MYF(MY_WME | MY_NABP)))
111
111
      error= 2;
112
 
    VOID(my_close(file,MYF(0)));
 
112
    my_close(file,MYF(0));
113
113
  }
114
114
  return(error);
115
115
} /* writefrm */