← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/archive/archive_reader.c

  • Committer: Brian Aker
  • Date: 2008-12-09 17:33:02 UTC
  • mfrom: (656.1.54 devel)
  • Revision ID: brian@tangent.org-20081209173302-aptngvc7efxnatnt
Merge from Monty.

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
      if (ptr == NULL)
 
165
      {
 
166
        printf("Could not allocate enough memory\n");
 
167
        goto end;
 
168
      }
164
169
      azread_frm(&reader_handle, ptr);
165
170
      azwrite_frm(&writer_handle, ptr, reader_handle.frm_length);
166
171
      free(ptr);
169
174
    if (reader_handle.comment_length)
170
175
    {
171
176
      char *ptr;
172
 
      ptr= (char *)my_malloc(sizeof(char) * reader_handle.comment_length, MYF(0));
 
177
      ptr= (char *)malloc(sizeof(char) * reader_handle.comment_length);
173
178
      azread_comment(&reader_handle, ptr);
174
179
      azwrite_comment(&writer_handle, ptr, reader_handle.comment_length);
175
180
      free(ptr);
205
210
    File frm_file;
206
211
    char *ptr;
207
212
    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));
 
213
    ptr= (char *)malloc(sizeof(char) * reader_handle.frm_length);
 
214
    if (ptr == NULL)
 
215
    {
 
216
      printf("Could not allocate enough memory\n");
 
217
      goto end;
 
218
    }
209
219
    azread_frm(&reader_handle, ptr);
210
220
    my_write(frm_file, (unsigned char*) ptr, reader_handle.frm_length, MYF(0));
211
221
    my_close(frm_file, MYF(0));