← Back to branch summary

~jaypipes/drizzle/new-test-runner

« back to all changes in this revision

Viewing changes to client/readline.cc

  • Committer: Jay Pipes
  • Date: 2008-12-11 17:52:34 UTC
  • mfrom: (482.16.152 testable)
  • Revision ID: jpipes@serialcoder-20081211175234-uqsfvmgxejvmellq
merge with trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/readline.cc
32
32
LINE_BUFFER *batch_readline_init(uint32_t max_size,FILE *file)
33
33
{
34
34
  LINE_BUFFER *line_buff;
35
 
  if (!(line_buff=(LINE_BUFFER*)
36
 
        my_malloc(sizeof(*line_buff),MYF(MY_WME | MY_ZEROFILL))))
 
35
  if (!(line_buff=(LINE_BUFFER*) malloc(sizeof(*line_buff))))
37
36
    return 0;
 
37
  memset(line_buff, 0, sizeof(*line_buff));
38
38
  if (init_line_buffer(line_buff,fileno(file),IO_SIZE,max_size))
39
39
  {
40
40
    free(line_buff);
73
73
LINE_BUFFER *batch_readline_command(LINE_BUFFER *line_buff, char * str)
74
74
{
75
75
  if (!line_buff)
76
 
    if (!(line_buff=(LINE_BUFFER*)
77
 
          my_malloc(sizeof(*line_buff),MYF(MY_WME | MY_ZEROFILL))))
 
76
  {
 
77
    if (!(line_buff=(LINE_BUFFER*) malloc(sizeof(*line_buff))))
78
78
      return 0;
 
79
    memset(line_buff, 0, sizeof(*line_buff));
 
80
  }
79
81
  if (init_line_buffer_from_string(line_buff,str))
80
82
  {
81
83
    free(line_buff);
95
97
  buffer->file=file;
96
98
  buffer->bufread=size;
97
99
  buffer->max_size=max_buffer;
98
 
  if (!(buffer->buffer = (char*) my_malloc(buffer->bufread+1,
99
 
                                           MYF(MY_WME | MY_FAE))))
 
100
  if (!(buffer->buffer = (char*) malloc(buffer->bufread+1)))
100
101
    return 1;
101
102
  buffer->end_of_line=buffer->end=buffer->buffer;
102
103
  buffer->buffer[0]=0;                          /* For easy start test */
112
113
{
113
114
  uint old_length=(uint)(buffer->end - buffer->buffer);
114
115
  uint length= (uint) strlen(str);
115
 
  if (!(buffer->buffer= buffer->start_of_line= buffer->end_of_line=
116
 
        (char*) my_realloc((unsigned char*) buffer->buffer, old_length+length+2,
117
 
                           MYF(MY_FAE|MY_ALLOW_ZERO_PTR))))
 
116
  char * tmpptr= (char*)realloc(buffer->buffer, old_length+length+2);
 
117
  if (tmpptr == NULL)
118
118
    return 1;
 
119
  
 
120
  buffer->buffer= buffer->start_of_line= buffer->end_of_line= tmpptr;
119
121
  buffer->end= buffer->buffer + old_length;
120
122
  if (old_length)
121
123
    buffer->end[-1]=' ';
152
154
    if ((read_count*=IO_SIZE))
153
155
      break;
154
156
    buffer->bufread *= 2;
155
 
    if (!(buffer->buffer = (char*) my_realloc(buffer->buffer,
156
 
                                              buffer->bufread+1,
157
 
                                              MYF(MY_WME | MY_FAE))))
 
157
    if (!(buffer->buffer = (char*) realloc(buffer->buffer,
 
158
                                           buffer->bufread+1)))
158
159
      return (uint) -1;
159
160
    buffer->start_of_line=buffer->buffer+start_offset;
160
161
    buffer->end=buffer->buffer+bufbytes;