~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/archive/archive_reader.c

  • Committer: Monty Taylor
  • Date: 2008-08-09 02:24:34 UTC
  • mto: (266.1.8 codestyle)
  • mto: This revision was merged to the branch mainline in revision 279.
  • Revision ID: monty@inaugust.com-20080809022434-97na8pnugghskxip
Removed mystringslt conv lib and replaced it with a noinst lib.

Show diffs side-by-side

added added

removed removed

Lines of Context:
166
166
      ptr= (char *)my_malloc(sizeof(char) * reader_handle.frm_length, MYF(0));
167
167
      azread_frm(&reader_handle, ptr);
168
168
      azwrite_frm(&writer_handle, ptr, reader_handle.frm_length);
169
 
      free(ptr);
 
169
      my_free(ptr, MYF(0));
170
170
    }
171
171
 
172
172
    if (reader_handle.comment_length)
175
175
      ptr= (char *)my_malloc(sizeof(char) * reader_handle.comment_length, MYF(0));
176
176
      azread_comment(&reader_handle, ptr);
177
177
      azwrite_comment(&writer_handle, ptr, reader_handle.comment_length);
178
 
      free(ptr);
 
178
      my_free(ptr, MYF(0));
179
179
    }
180
180
 
181
181
    while ((read= azread_row(&reader_handle, &error)))
210
210
    frm_file= my_open(argv[1], O_CREAT|O_RDWR|O_BINARY, MYF(0));
211
211
    ptr= (char *)my_malloc(sizeof(char) * reader_handle.frm_length, MYF(0));
212
212
    azread_frm(&reader_handle, ptr);
213
 
    my_write(frm_file, (unsigned char*) ptr, reader_handle.frm_length, MYF(0));
 
213
    my_write(frm_file, (uchar*) ptr, reader_handle.frm_length, MYF(0));
214
214
    my_close(frm_file, MYF(0));
215
 
    free(ptr);
 
215
    my_free(ptr, MYF(0));
216
216
  }
217
217
 
218
218
end: