diff -rup makedumpfile.old/makedumpfile.c makedumpfile/makedumpfile.c --- makedumpfile.old/makedumpfile.c 2006-09-29 09:17:16.000000000 +0900 +++ makedumpfile/makedumpfile.c 2006-09-29 09:17:40.000000000 +0900 @@ -348,7 +348,7 @@ open_3rd_bitmap(struct DumpInfo *info) int fd; if ((info->name_3rd_bitmap - = (char *)g_malloc(sizeof(FILENAME_3RD_BITMAP))) == NULL) { + = (char *)malloc(sizeof(FILENAME_3RD_BITMAP))) == NULL) { ERRMSG("Can't allocate memory for the filename. %s\n", strerror(errno)); return FALSE; @@ -371,7 +371,7 @@ open_dump_bitmap(struct DumpInfo *info) int fd; if ((info->name_bitmap - = (char *)g_malloc(sizeof(FILENAME_BITMAP))) == NULL) { + = (char *)malloc(sizeof(FILENAME_BITMAP))) == NULL) { ERRMSG("Can't allocate memory for the filename. %s\n", strerror(errno)); return FALSE; @@ -546,7 +546,7 @@ get_elf_info(struct DumpInfo *info) /* * Get full ELF header info. */ - if ((tmp_elf_header = (char *)g_malloc0(info->offset_load_memory)) + if ((tmp_elf_header = (char *)malloc(info->offset_load_memory)) == NULL) { ERRMSG("Can't allocate memory for the ELF header. %s\n", strerror(errno)); @@ -567,7 +567,7 @@ get_elf_info(struct DumpInfo *info) load32 = (Elf32_Phdr *) &tmp_elf_header[sizeof(Elf32_Ehdr)+sizeof(Elf32_Phdr)]; if ((info->pt_load_segments = (struct pt_load_segment *) - g_malloc0(sizeof(struct pt_load_segment) * + calloc(1, sizeof(struct pt_load_segment) * info->num_load_memory)) == NULL) { ERRMSG("Can't allocate memory for the PT_LOAD. %s\n", strerror(errno)); @@ -580,7 +580,7 @@ get_elf_info(struct DumpInfo *info) load64 = (Elf64_Phdr *) &tmp_elf_header[sizeof(Elf64_Ehdr)+sizeof(Elf64_Phdr)]; if ((info->pt_load_segments = (struct pt_load_segment *) - g_malloc0(sizeof(struct pt_load_segment) * + calloc(1, sizeof(struct pt_load_segment) * info->num_load_memory)) == NULL) { ERRMSG("Can't allocate memory for the PT_LOAD. %s\n", strerror(errno)); @@ -597,11 +597,11 @@ get_elf_info(struct DumpInfo *info) if (info->flag_exclude_free) info->len_3rd_bitmap = info->len_bitmap >> 1; - g_free(tmp_elf_header); + free(tmp_elf_header); return TRUE; out: if (tmp_elf_header != NULL) - g_free(tmp_elf_header); + free(tmp_elf_header); return FALSE; } @@ -1096,7 +1096,7 @@ get_mm_flatmem(struct DumpInfo *info) } info->num_mem_map = 1; if ((info->mem_map_data = (struct mem_map_data *) - g_malloc0(sizeof(struct mem_map_data)*info->num_mem_map)) == NULL) { + malloc(sizeof(struct mem_map_data)*info->num_mem_map)) == NULL) { ERRMSG("Can't allocate memory for the mem_map_data. %s\n", strerror(errno)); return FALSE; @@ -1135,7 +1135,7 @@ section_mem_map_addr(struct DumpInfo *in if (!is_kvaddr(addr)) return NOT_KV_ADDR; - if ((mem_section = g_malloc0(SIZE(mem_section))) == NULL) { + if ((mem_section = malloc(SIZE(mem_section))) == NULL) { ERRMSG("Can't allocate memory for a struct mem_section. %s\n", strerror(errno)); return NOT_KV_ADDR; @@ -1146,7 +1146,7 @@ section_mem_map_addr(struct DumpInfo *in } map = ULONG(mem_section + OFFSET(mem_section.section_mem_map)); map &= SECTION_MAP_MASK; - g_free(mem_section); + free(mem_section); return map; } @@ -1181,7 +1181,7 @@ get_mm_sparsemem(struct DumpInfo *info) info->sections_per_root = _SECTIONS_PER_ROOT(); mem_section_size = SIZE(mem_section) * NR_SECTION_ROOTS(); } - if ((mem_sec = g_malloc0(mem_section_size)) == NULL) { + if ((mem_sec = malloc(mem_section_size)) == NULL) { ERRMSG("Can't allocate memory for the mem_section. %s\n", strerror(errno)); return FALSE; @@ -1192,7 +1192,7 @@ get_mm_sparsemem(struct DumpInfo *info) } info->num_mem_map = num_section; if ((info->mem_map_data = (struct mem_map_data *) - g_malloc0(sizeof(struct mem_map_data)*info->num_mem_map)) == NULL) { + malloc(sizeof(struct mem_map_data)*info->num_mem_map)) == NULL) { ERRMSG("Can't allocate memory for the mem_map_data. %s\n", strerror(errno)); return FALSE; @@ -1209,7 +1209,7 @@ get_mm_sparsemem(struct DumpInfo *info) pfn_end = info->max_mapnr; dump_mem_map(info, pfn_start, pfn_end, addr_mem_map, section_nr); } - g_free(mem_sec); + free(mem_sec); return TRUE; } @@ -1218,7 +1218,7 @@ get_mem_map_without_mm(struct DumpInfo * { info->num_mem_map = 1; if ((info->mem_map_data = (struct mem_map_data *) - g_malloc0(sizeof(struct mem_map_data)*info->num_mem_map)) == NULL) { + malloc(sizeof(struct mem_map_data)*info->num_mem_map)) == NULL) { ERRMSG("Can't allocate memory for the mem_map_data. %s\n", strerror(errno)); return FALSE; @@ -1448,17 +1448,17 @@ create_contig_bitmap(struct DumpInfo *in bitmap2.buf = NULL; bitmap2.offset = info->len_bitmap/2; - if ((bm2.buf = g_malloc0(BUFSIZE_BITMAP)) == NULL) { + if ((bm2.buf = calloc(1, BUFSIZE_BITMAP)) == NULL) { ERRMSG("Can't allocate memory for 2nd-bitmap buffer. %s\n", strerror(errno)); goto out; } - if ((bitmap1.buf = g_malloc0(BUFSIZE_BITMAP)) == NULL) { + if ((bitmap1.buf = calloc(1, BUFSIZE_BITMAP)) == NULL) { ERRMSG("Can't allocate memory for the 1st bitmap. %s\n", strerror(errno)); goto out; } - if ((bitmap2.buf = g_malloc0(BUFSIZE_BITMAP)) == NULL) { + if ((bitmap2.buf = calloc(1, BUFSIZE_BITMAP)) == NULL) { ERRMSG("Can't allocate memory for the 2nd bitmap. %s\n", strerror(errno)); goto out; @@ -1528,17 +1528,17 @@ create_contig_bitmap(struct DumpInfo *in info->num_load_dumpfile = num_load_dumpfile; - g_free(bm2.buf); - g_free(bitmap1.buf); - g_free(bitmap2.buf); + free(bm2.buf); + free(bitmap1.buf); + free(bitmap2.buf); return TRUE; out: if (bm2.buf != NULL) - g_free(bm2.buf); + free(bm2.buf); if (bitmap1.buf != NULL) - g_free(bitmap1.buf); + free(bitmap1.buf); if (bitmap2.buf != NULL) - g_free(bitmap2.buf); + free(bitmap2.buf); return FALSE; } @@ -1944,30 +1944,30 @@ create_dump_bitmap(struct DumpInfo *info bm3.buf = NULL; } - if ((bm1.buf = g_malloc0(BUFSIZE_BITMAP)) == NULL) { + if ((bm1.buf = calloc(1, BUFSIZE_BITMAP)) == NULL) { ERRMSG("Can't allocate memory for 1st-bitmap buffer. %s\n", strerror(errno)); goto out; } - if ((bm2.buf = g_malloc0(BUFSIZE_BITMAP)) == NULL) { + if ((bm2.buf = calloc(1, BUFSIZE_BITMAP)) == NULL) { ERRMSG("Can't allocate memory for 2nd-bitmap buffer. %s\n", strerror(errno)); goto out; } if (info->flag_exclude_free) { - if ((bm3.buf = g_malloc0(BUFSIZE_BITMAP)) == NULL) { + if ((bm3.buf = calloc(1, BUFSIZE_BITMAP)) == NULL) { ERRMSG("Can't allocate memory for 3rd-bitmap buffer. %s\n", strerror(errno)); goto out; } } if (info->dump_level > DL_EXCLUDE_ZERO && - (page_cache = g_malloc(SIZE(page)*PGMM_CACHED)) == NULL) { + (page_cache = malloc(SIZE(page)*PGMM_CACHED)) == NULL) { ERRMSG("Can't allocate memory for the pagedesc cache. %s\n", strerror(errno)); goto out; } - if ((buf = g_malloc(info->page_size)) == NULL) { + if ((buf = malloc(info->page_size)) == NULL) { ERRMSG("Can't allocate memory for the page. %s\n", strerror(errno)); goto out; @@ -2118,24 +2118,24 @@ create_dump_bitmap(struct DumpInfo *info goto out; if (page_cache != NULL) - g_free(page_cache); - g_free(buf); - g_free(bm1.buf); - g_free(bm2.buf); + free(page_cache); + free(buf); + free(bm1.buf); + free(bm2.buf); if (info->flag_exclude_free) - g_free(bm3.buf); + free(bm3.buf); return TRUE; out: if (page_cache != NULL) - g_free(page_cache); + free(page_cache); if (buf != NULL) - g_free(buf); + free(buf); if (bm1.buf != NULL) - g_free(bm1.buf); + free(bm1.buf); if (bm2.buf != NULL) - g_free(bm2.buf); + free(bm2.buf); if (bm3.buf != NULL) - g_free(bm3.buf); + free(bm3.buf); return FALSE; } @@ -2167,12 +2167,12 @@ write_elf_header(struct DumpInfo *info) bitmap2.buf = NULL; bitmap2.offset = info->len_bitmap/2; - if ((bitmap2.buf = g_malloc0(BUFSIZE_BITMAP)) == NULL) { + if ((bitmap2.buf = calloc(1, BUFSIZE_BITMAP)) == NULL) { ERRMSG("Can't allocate memory for the 2nd bitmap. %s\n", strerror(errno)); goto out; } - if ((header_memory = g_malloc0(size_hdr_memory)) == NULL) { + if ((header_memory = calloc(1, size_hdr_memory)) == NULL) { ERRMSG("Can't allocate memory for the ELF header. %s\n", strerror(errno)); goto out; @@ -2244,7 +2244,7 @@ write_elf_header(struct DumpInfo *info) * PT_LOAD header */ if (info->flag_elf & ELF32) { - if ((load32 = g_malloc0(size_Phdr)) == NULL) { + if ((load32 = malloc(size_Phdr)) == NULL) { ERRMSG("Can't allocate memory for PT_LOAD header. %s\n", strerror(errno)); goto out; @@ -2258,7 +2258,7 @@ write_elf_header(struct DumpInfo *info) load32->p_memsz = 0; load32->p_align = 0; } else { - if ((load64 = g_malloc0(size_Phdr)) == NULL) { + if ((load64 = malloc(size_Phdr)) == NULL) { ERRMSG("Can't allocate memory for PT_LOAD header. %s\n", strerror(errno)); goto out; @@ -2378,7 +2378,7 @@ write_elf_header(struct DumpInfo *info) /* * Write PT_NOTE segment. */ - if ((buf = g_malloc0(size_note)) == NULL) { + if ((buf = malloc(size_note)) == NULL) { ERRMSG("Can't allocate memory for the ELF header. %s\n", strerror(errno)); goto out; @@ -2405,25 +2405,25 @@ write_elf_header(struct DumpInfo *info) goto out; } - g_free(bitmap2.buf); - g_free(header_memory); + free(bitmap2.buf); + free(header_memory); if (info->flag_elf & ELF32) - g_free(load32); + free(load32); else - g_free(load64); - g_free(buf); + free(load64); + free(buf); return TRUE; out: if (bitmap2.buf != NULL) - g_free(bitmap2.buf); + free(bitmap2.buf); if (header_memory != NULL) - g_free(header_memory); + free(header_memory); if (load32 != NULL) - g_free(load32); + free(load32); if (load64 != NULL) - g_free(load64); + free(load64); if (buf != NULL) - g_free(buf); + free(buf); return FALSE; } @@ -2558,39 +2558,39 @@ write_pages(struct DumpInfo *info) bitmap2.buf = NULL; bitmap2.offset = info->len_bitmap/2; - if ((buf = g_malloc(info->page_size)) == NULL) { + if ((buf = malloc(info->page_size)) == NULL) { ERRMSG("Can't allocate memory for the page. %s\n", strerror(errno)); goto out; } - if ((buf_out = g_malloc(info->page_size)) == NULL) { + if ((buf_out = malloc(info->page_size)) == NULL) { ERRMSG("Can't allocate memory for the compression buffer. %s\n", strerror(errno)); goto out; } - if ((bm2.buf = g_malloc0(BUFSIZE_BITMAP)) == NULL) { + if ((bm2.buf = calloc(1, BUFSIZE_BITMAP)) == NULL) { ERRMSG("Can't allocate memory for 2nd-bitmap buffer. %s\n", strerror(errno)); goto out; } - if ((pdesc.buf = g_malloc(pdesc.cache_size + info->page_size)) + if ((pdesc.buf = malloc(pdesc.cache_size + info->page_size)) == NULL) { ERRMSG("Can't allocate memory for the page desc buffer. %s\n", strerror(errno)); goto out; } - if ((pdata.buf = g_malloc(pdata.cache_size + info->page_size)) + if ((pdata.buf = malloc(pdata.cache_size + info->page_size)) == NULL) { ERRMSG("Can't allocate memory for the page data buffer. %s\n", strerror(errno)); goto out; } - if ((bitmap1.buf = g_malloc0(BUFSIZE_BITMAP)) == NULL) { + if ((bitmap1.buf = calloc(1, BUFSIZE_BITMAP)) == NULL) { ERRMSG("Can't allocate memory for the 1st bitmap. %s\n", strerror(errno)); goto out; } - if ((bitmap2.buf = g_malloc0(BUFSIZE_BITMAP)) == NULL) { + if ((bitmap2.buf = calloc(1, BUFSIZE_BITMAP)) == NULL) { ERRMSG("Can't allocate memory for the 2nd bitmap. %s\n", strerror(errno)); goto out; @@ -2732,29 +2732,29 @@ write_pages(struct DumpInfo *info) */ print_progress(info->max_mapnr, info->max_mapnr); - g_free(buf); - g_free(buf_out); - g_free(bm2.buf); - g_free(pdesc.buf); - g_free(pdata.buf); - g_free(bitmap1.buf); - g_free(bitmap2.buf); + free(buf); + free(buf_out); + free(bm2.buf); + free(pdesc.buf); + free(pdata.buf); + free(bitmap1.buf); + free(bitmap2.buf); return TRUE; out: if (buf != NULL) - g_free(buf); + free(buf); if (buf_out != NULL) - g_free(buf_out); + free(buf_out); if (bm2.buf != NULL) - g_free(bm2.buf); + free(bm2.buf); if (pdesc.buf != NULL) - g_free(pdesc.buf); + free(pdesc.buf); if (pdata.buf != NULL) - g_free(pdata.buf); + free(pdata.buf); if (bitmap1.buf != NULL) - g_free(bitmap1.buf); + free(bitmap1.buf); if (bitmap2.buf != NULL) - g_free(bitmap2.buf); + free(bitmap2.buf); return FALSE; } @@ -2772,7 +2772,7 @@ int write_dump_bitmap(struct DumpInfo *i bm.offset = 0; bm.buf = NULL; - if ((bm.buf = g_malloc0(BUFSIZE_BITMAP)) == NULL) { + if ((bm.buf = calloc(1, BUFSIZE_BITMAP)) == NULL) { ERRMSG("Can't allocate memory for dump bitmap buffer. %s\n", strerror(errno)); goto out; @@ -2802,11 +2802,11 @@ int write_dump_bitmap(struct DumpInfo *i } buf_size -= BUFSIZE_BITMAP; } - g_free(bm.buf); + free(bm.buf); return TRUE; out: if (bm.buf != NULL) - g_free(bm.buf); + free(bm.buf); return FALSE; } @@ -2840,7 +2840,7 @@ close_3rd_bitmap(struct DumpInfo *info) if (close(info->fd_3rd_bitmap) < 0) ERRMSG("Can't close the bitmap file(%s). %s\n", info->name_3rd_bitmap, strerror(errno)); - g_free(info->name_3rd_bitmap); + free(info->name_3rd_bitmap); } void @@ -2849,7 +2849,7 @@ close_dump_bitmap(struct DumpInfo *info) if (close(info->fd_bitmap) < 0) ERRMSG("Can't close the bitmap file(%s). %s\n", info->name_bitmap, strerror(errno)); - g_free(info->name_bitmap); + free(info->name_bitmap); } void @@ -2913,12 +2913,12 @@ main(int argc, char *argv[]) int opt; struct DumpInfo *info = NULL; - if ((info = g_malloc0(sizeof(struct DumpInfo))) == NULL) { + if ((info = calloc(1, sizeof(struct DumpInfo))) == NULL) { ERRMSG("Can't allocate memory for the pagedesc cache. %s.\n", strerror(errno)); goto out; } - if ((info->dump_header = g_malloc0(sizeof(struct disk_dump_header))) + if ((info->dump_header = calloc(1, sizeof(struct disk_dump_header))) == NULL) { ERRMSG("Can't allocate memory for the dump header. %s\n", strerror(errno)); @@ -3052,11 +3052,11 @@ main(int argc, char *argv[]) } MSG("makedumpfile Completed.\n"); if (!info->flag_generate_config) { - g_free(info->pt_load_segments); - g_free(info->mem_map_data); + free(info->pt_load_segments); + free(info->mem_map_data); } - g_free(info->dump_header); - g_free(info); + free(info->dump_header); + free(info); return COMPLETED; out: @@ -3071,13 +3071,13 @@ out: if (info->fd_3rd_bitmap) close(info->fd_3rd_bitmap); if (info->pt_load_segments != NULL) - g_free(info->pt_load_segments); + free(info->pt_load_segments); if (info->mem_map_data != NULL) - g_free(info->mem_map_data); + free(info->mem_map_data); if (info->dump_header != NULL) - g_free(info->dump_header); + free(info->dump_header); if (info != NULL) - g_free(info); + free(info); if (retcd != COMPLETED) return retcd; else diff -rup makedumpfile.old/makedumpfile.h makedumpfile/makedumpfile.h --- makedumpfile.old/makedumpfile.h 2006-09-29 09:17:30.000000000 +0900 +++ makedumpfile/makedumpfile.h 2006-09-29 09:18:05.000000000 +0900 @@ -24,7 +24,6 @@ #include #include #include -#include #include #include "diskdump_mod.h" @@ -269,6 +268,10 @@ do { \ /* * common value */ +#define TRUE (1) +#define FALSE (0) +#define MAX(a,b) ((a) > (b) ? (a) : (b)) +#define MIN(a,b) ((a) < (b) ? (a) : (b)) #define MAX_NR_ZONES (4) /*