← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/readline.cc

  • Committer: Monty Taylor
  • Date: 2008-12-06 07:22:02 UTC
  • mto: (656.1.7 devel) (660.1.5 codestyle)
  • mto: This revision was merged to the branch mainline in revision 665.
  • Revision ID: monty@inaugust.com-20081206072202-2g25o9doqr1l8euu
OOOh doggie. Got rid of my_alloca.

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*) malloc(sizeof(*line_buff))))
 
35
  if (!(line_buff=(LINE_BUFFER*)
 
36
        my_malloc(sizeof(*line_buff),MYF(MY_WME | MY_ZEROFILL))))
36
37
    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
 
  {
77
 
    if (!(line_buff=(LINE_BUFFER*) malloc(sizeof(*line_buff))))
 
76
    if (!(line_buff=(LINE_BUFFER*)
 
77
          my_malloc(sizeof(*line_buff),MYF(MY_WME | MY_ZEROFILL))))
78
78
      return 0;
79
 
    memset(line_buff, 0, sizeof(*line_buff));
80
 
  }
81
79
  if (init_line_buffer_from_string(line_buff,str))
82
80
  {
83
81
    free(line_buff);
97
95
  buffer->file=file;
98
96
  buffer->bufread=size;
99
97
  buffer->max_size=max_buffer;
100
 
  if (!(buffer->buffer = (char*) malloc(buffer->bufread+1)))
 
98
  if (!(buffer->buffer = (char*) my_malloc(buffer->bufread+1,
 
99
                                           MYF(MY_WME | MY_FAE))))
101
100
    return 1;
102
101
  buffer->end_of_line=buffer->end=buffer->buffer;
103
102
  buffer->buffer[0]=0;                          /* For easy start test */
113
112
{
114
113
  uint old_length=(uint)(buffer->end - buffer->buffer);
115
114
  uint length= (uint) strlen(str);
116
 
  char * tmpptr= (char*)realloc(buffer->buffer, old_length+length+2);
117
 
  if (tmpptr == NULL)
 
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))))
118
118
    return 1;
119
 
  
120
 
  buffer->buffer= buffer->start_of_line= buffer->end_of_line= tmpptr;
121
119
  buffer->end= buffer->buffer + old_length;
122
120
  if (old_length)
123
121
    buffer->end[-1]=' ';
154
152
    if ((read_count*=IO_SIZE))
155
153
      break;
156
154
    buffer->bufread *= 2;
157
 
    if (!(buffer->buffer = (char*) realloc(buffer->buffer,
158
 
                                           buffer->bufread+1)))
 
155
    if (!(buffer->buffer = (char*) my_realloc(buffer->buffer,
 
156
                                              buffer->bufread+1,
 
157
                                              MYF(MY_WME | MY_FAE))))
159
158
      return (uint) -1;
160
159
    buffer->start_of_line=buffer->buffer+start_offset;
161
160
    buffer->end=buffer->buffer+bufbytes;