← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/readline.cc

  • Committer: Brian Aker
  • Date: 2009-02-21 00:18:15 UTC
  • Revision ID: brian@tangent.org-20090221001815-x20e8h71e984lvs1
Completion (?) of uint conversion.

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/readline.cc
111
111
*/
112
112
static bool init_line_buffer_from_string(LINE_BUFFER *buffer,char * str)
113
113
{
114
 
  uint32_t old_length=(uint)(buffer->end - buffer->buffer);
115
 
  uint32_t length= (uint) strlen(str);
 
114
  uint32_t old_length=(uint32_t)(buffer->end - buffer->buffer);
 
115
  uint32_t length= (uint32_t) strlen(str);
116
116
  char * tmpptr= (char*)realloc(buffer->buffer, old_length+length+2);
117
117
  if (tmpptr == NULL)
118
118
    return 1;
140
140
static size_t fill_buffer(LINE_BUFFER *buffer)
141
141
{
142
142
  size_t read_count;
143
 
  uint32_t bufbytes= (uint) (buffer->end - buffer->start_of_line);
 
143
  uint32_t bufbytes= (uint32_t) (buffer->end - buffer->start_of_line);
144
144
 
145
145
  if (buffer->eof)
146
146
    return 0;                                   /* Everything read */
149
149
 
150
150
  for (;;)
151
151
  {
152
 
    uint32_t start_offset=(uint) (buffer->start_of_line - buffer->buffer);
 
152
    uint32_t start_offset=(uint32_t) (buffer->start_of_line - buffer->buffer);
153
153
    read_count=(buffer->bufread - bufbytes)/IO_SIZE;
154
154
    if ((read_count*=IO_SIZE))
155
155
      break;
156
156
    buffer->bufread *= 2;
157
157
    if (!(buffer->buffer = (char*) realloc(buffer->buffer,
158
158
                                           buffer->bufread+1)))
159
 
      return (uint) -1;
 
159
      return (uint32_t) -1;
160
160
    buffer->start_of_line=buffer->buffer+start_offset;
161
161
    buffer->end=buffer->buffer+bufbytes;
162
162
  }
164
164
  /* Shift stuff down. */
165
165
  if (buffer->start_of_line != buffer->buffer)
166
166
  {
167
 
    memmove(buffer->buffer, buffer->start_of_line, (uint) bufbytes);
 
167
    memmove(buffer->buffer, buffer->start_of_line, (uint32_t) bufbytes);
168
168
    buffer->end=buffer->buffer+bufbytes;
169
169
  }
170
170
 
201
201
      pos++;
202
202
    if (pos == buffer->end)
203
203
    {
204
 
      if ((uint) (pos - buffer->start_of_line) < buffer->max_size)
 
204
      if ((uint32_t) (pos - buffer->start_of_line) < buffer->max_size)
205
205
      {
206
206
        if (!(length=fill_buffer(buffer)) || length == (size_t) -1)
207
207
          return(0);