← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/archive/archive_reader.c

  • Committer: Monty Taylor
  • Date: 2008-12-07 22:57:38 UTC
  • mto: This revision was merged to the branch mainline in revision 670.
  • Revision ID: monty@inaugust.com-20081207225738-y20u8hgd4m4uq60h
Removed my_malloc stuff from storage/

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/archive/archive_reader.c
160
160
    if (reader_handle.frm_length)
161
161
    {
162
162
      char *ptr;
163
 
      ptr= (char *)my_malloc(sizeof(char) * reader_handle.frm_length, MYF(0));
 
163
      ptr= (char *)malloc(sizeof(char) * reader_handle.frm_length);
164
164
      azread_frm(&reader_handle, ptr);
165
165
      azwrite_frm(&writer_handle, ptr, reader_handle.frm_length);
166
166
      free(ptr);
169
169
    if (reader_handle.comment_length)
170
170
    {
171
171
      char *ptr;
172
 
      ptr= (char *)my_malloc(sizeof(char) * reader_handle.comment_length, MYF(0));
 
172
      ptr= (char *)malloc(sizeof(char) * reader_handle.comment_length);
173
173
      azread_comment(&reader_handle, ptr);
174
174
      azwrite_comment(&writer_handle, ptr, reader_handle.comment_length);
175
175
      free(ptr);
205
205
    File frm_file;
206
206
    char *ptr;
207
207
    frm_file= my_open(argv[1], O_CREAT|O_RDWR, MYF(0));
208
 
    ptr= (char *)my_malloc(sizeof(char) * reader_handle.frm_length, MYF(0));
 
208
    ptr= (char *)malloc(sizeof(char) * reader_handle.frm_length);
209
209
    azread_frm(&reader_handle, ptr);
210
210
    my_write(frm_file, (unsigned char*) ptr, reader_handle.frm_length, MYF(0));
211
211
    my_close(frm_file, MYF(0));