← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to libdrizzle/local_infile.c

  • Committer: Brian Aker
  • Date: 2008-09-16 09:41:23 UTC
  • Revision ID: brian@gir.lan-20080916094123-2ws792vn896n2g53
Fixed uint/ushort issue in libdrizzle

Show diffs side-by-side

added added

removed removed

Lines of Context:
libdrizzle/local_infile.c
62
62
bool handle_local_infile(DRIZZLE *drizzle, const char *net_filename)
63
63
{
64
64
  bool result= true;
65
 
  uint packet_length=MY_ALIGN(drizzle->net.max_packet-16,IO_SIZE);
 
65
  uint32_t packet_length=MY_ALIGN(drizzle->net.max_packet-16,IO_SIZE);
66
66
  NET *net= &drizzle->net;
67
67
  int readcount;
68
68
  void *li_ptr;          /* pass state to local_infile functions */
209
209
    < 0    Error
210
210
*/
211
211
 
212
 
static int default_local_infile_read(void *ptr, char *buf, uint buf_len)
 
212
static int default_local_infile_read(void *ptr, char *buf, uint32_t buf_len)
213
213
{
214
214
  int count;
215
215
  default_local_infile_data*data = (default_local_infile_data *) ptr;
263
263
*/
264
264
 
265
265
static int
266
 
default_local_infile_error(void *ptr, char *error_msg, uint error_msg_len)
 
266
default_local_infile_error(void *ptr, char *error_msg, uint32_t error_msg_len)
267
267
{
268
268
  default_local_infile_data *data = (default_local_infile_data *) ptr;
269
269
  if (data)          /* If not error on open */
281
281
drizzle_set_local_infile_handler(DRIZZLE *drizzle,
282
282
                               int (*local_infile_init)(void **, const char *,
283
283
                               void *),
284
 
                               int (*local_infile_read)(void *, char *, uint),
 
284
                               int (*local_infile_read)(void *, char *, uint32_t),
285
285
                               void (*local_infile_end)(void *),
286
 
                               int (*local_infile_error)(void *, char *, uint),
 
286
                               int (*local_infile_error)(void *, char *, uint32_t),
287
287
                               void *userdata)
288
288
{
289
289
  drizzle->options.local_infile_init=  local_infile_init;