← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/csv/transparent_file.cc

Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/csv/transparent_file.cc
14
14
  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
15
15
 
16
16
 
17
 
#include <drizzled/server_includes.h>
 
17
#include "config.h"
 
18
#include <cstdlib>
 
19
#include "mysys/my_sys.h"
18
20
#include "transparent_file.h"
19
21
 
20
22
Transparent_file::Transparent_file() : lower_bound(0), buff_size(IO_SIZE)
21
23
{
22
 
  buff= (unsigned char *) malloc(buff_size*sizeof(unsigned char));
 
24
  buff= static_cast<unsigned char *>(malloc(buff_size*sizeof(unsigned char)));
23
25
}
24
26
 
25
27
Transparent_file::~Transparent_file()
26
28
{
27
 
  free((unsigned char*)buff);
 
29
  free(buff);
28
30
}
29
31
 
30
 
void Transparent_file::init_buff(File filedes_arg)
 
32
void Transparent_file::init_buff(int filedes_arg)
31
33
{
32
34
  filedes= filedes_arg;
33
35
  /* read the beginning of the file */