|
From: Richard R. <fl...@us...> - 2005-08-16 13:25:26
|
Changes by: flatcap Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13290 Modified Files: ntfsrm.c utils.c utils.h Log Message: change utils_dump_mem to take a void ptr update the comments a bit Index: ntfsrm.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsrm.c,v retrieving revision 1.54 retrieving revision 1.55 diff -u -p -r1.54 -r1.55 --- ntfsrm.c 14 Aug 2005 22:22:06 -0000 1.54 +++ ntfsrm.c 16 Aug 2005 13:25:15 -0000 1.55 @@ -802,7 +802,7 @@ static void ntfs_ie_dump (INDEX_ENTRY *i printf ("________________________________________________"); printf ("\n"); - utils_dump_mem ((u8*)ie, 0, ie->length, DM_DEFAULTS); + utils_dump_mem (ie, 0, ie->length, DM_DEFAULTS); printf ("MFT Ref: 0x%llx\n", ie->indexed_file); printf ("length: %d\n", ie->length); @@ -1429,7 +1429,7 @@ static struct ntfs_dt * ntfs_dt_alloc (s printf ("IE (%d)\n", ie->length); else printf ("IE %lld (%d)\n", MREF (ie->key.file_name.parent_directory), ie->length); - utils_dump_mem ((u8*)ie, 0, ie->length, DM_DEFAULTS); + utils_dump_mem (ie, 0, ie->length, DM_DEFAULTS); printf ("\n"); } #endif @@ -1460,7 +1460,7 @@ static struct ntfs_dt * ntfs_dt_alloc (s printf ("IE (%d)\n", ie->length); else printf ("IE %lld (%d)\n", MREF (ie->key.file_name.parent_directory), ie->length); - utils_dump_mem ((u8*)ie, 0, ie->length, DM_DEFAULTS); + utils_dump_mem (ie, 0, ie->length, DM_DEFAULTS); printf ("\n"); } #endif @@ -2174,9 +2174,9 @@ static int ntfs_mft_remove_attr (struct // inode->mrec mft = inode->mrec; - //utils_dump_mem ((u8*)mft, 0, mft->bytes_in_use, DM_DEFAULTS); printf ("\n"); + //utils_dump_mem (mft, 0, mft->bytes_in_use, DM_DEFAULTS); printf ("\n"); - //utils_dump_mem ((u8*)attrXX, 0, attrXX->length, DM_DEFAULTS); printf ("\n"); + //utils_dump_mem (attrXX, 0, attrXX->length, DM_DEFAULTS); printf ("\n"); //printf ("mrec = %p, attr = %p, diff = %d (0x%02X)\n", mft, attrXX, (u8*)attrXX - (u8*)mft, (u8*)attrXX - (u8*)mft); // memmove @@ -2196,7 +2196,7 @@ static int ntfs_mft_remove_attr (struct #endif memmove (dst, src, len); - //utils_dump_mem ((u8*)mft, 0, mft->bytes_in_use, DM_DEFAULTS); printf ("\n"); + //utils_dump_mem (mft, 0, mft->bytes_in_use, DM_DEFAULTS); printf ("\n"); NInoSetDirty(inode); return 0; @@ -2353,7 +2353,7 @@ static int ntfs_mft_resize_resident (ntf memset ((u8*)mrec + mrec->bytes_in_use, 0, mft_size - mrec->bytes_in_use); mft_usage += (attr_new - attr_orig); - //utils_dump_mem ((u8*) mrec, 0, mft_size, DM_DEFAULTS); + //utils_dump_mem (mrec, 0, mft_size, DM_DEFAULTS); res = 0; done: ntfs_attr_put_search_ctx (ctx); @@ -3346,7 +3346,7 @@ static int ntfs_dir_truncate (ntfs_volum } //utils_dump_mem (dir->index->data, 0, dir->index->data_len, DM_DEFAULTS); printf ("\n"); - //utils_dump_mem ((u8*)ie, 0, ie->length, DM_DEFAULTS); printf ("\n"); + //utils_dump_mem (ie, 0, ie->length, DM_DEFAULTS); printf ("\n"); ntfs_dt_root_replace (dir->index, 0, dir->index->children[0], ie); //utils_dump_mem (dir->index->data, 0, dir->index->data_len, DM_DEFAULTS); printf ("\n"); //printf ("root dt %d, vcn = %lld\n", dir->index->changed, dir->index->vcn); @@ -4159,7 +4159,7 @@ static int ntfs_file_remove (ntfs_volume //ntfs_dt_print (top, 0); del_ie = del->children[del_num]; - //utils_dump_mem ((u8*)del_ie, 0, del_ie->length, DM_DEFAULTS); + //utils_dump_mem (del_ie, 0, del_ie->length, DM_DEFAULTS); //printf ("\n"); /* @@ -4186,11 +4186,11 @@ static int ntfs_file_remove (ntfs_volume //printf ("\n"); suc_ie = ntfs_ie_copy (suc->children[suc_num]); - //utils_dump_mem ((u8*)suc_ie, 0, suc_ie->length, DM_BLUE|DM_GREEN|DM_INDENT); + //utils_dump_mem (suc_ie, 0, suc_ie->length, DM_BLUE|DM_GREEN|DM_INDENT); //printf ("\n"); suc_ie = ntfs_ie_set_vcn (suc_ie, vcn); - //utils_dump_mem ((u8*)suc_ie, 0, suc_ie->length, DM_BLUE|DM_GREEN|DM_INDENT); + //utils_dump_mem (suc_ie, 0, suc_ie->length, DM_BLUE|DM_GREEN|DM_INDENT); //printf ("\n"); file = &del_ie->key.file_name; printf ("\trep name: "); ntfs_name_print (file->file_name, file->file_name_length); printf ("\n"); @@ -4303,11 +4303,11 @@ static int ntfs_file_remove (ntfs_volume par_ie = par->children[par_num]; vcn = ntfs_ie_get_vcn (par_ie); //printf ("\toffset = %d\n", (u8*)par_ie - par->data); printf ("\tflags = %d\n", par_ie->flags); printf ("\tvcn = %lld\n", vcn); printf ("\tlength = %d\n", par_ie->length); - //utils_dump_mem ((u8*)par_ie, 0, par_ie->length, DM_DEFAULTS); + //utils_dump_mem (par_ie, 0, par_ie->length, DM_DEFAULTS); //printf ("\n"); //printf ("\toffset = %d\n", (u8*)par_ie - par->data); printf ("\tflags = %d\n", par_ie->flags); printf ("\tvcn = %lld\n", vcn); printf ("\tlength = %d\n", par_ie->length); - //utils_dump_mem ((u8*)par_ie, 0, par_ie->length, DM_DEFAULTS); + //utils_dump_mem (par_ie, 0, par_ie->length, DM_DEFAULTS); //printf ("\n"); file = &par->children[par_num] ->key.file_name; printf ("\tpar name: "); ntfs_name_print (file->file_name, file->file_name_length); printf ("\n"); @@ -4348,7 +4348,7 @@ static int ntfs_file_remove (ntfs_volume goto done; //printf ("\n"); - //utils_dump_mem ((u8*)add_ie, 0, add_ie->length, DM_BLUE|DM_GREEN|DM_INDENT); + //utils_dump_mem (add_ie, 0, add_ie->length, DM_BLUE|DM_GREEN|DM_INDENT); ded = par->sub_nodes[par_num]; par->sub_nodes[par_num] = NULL; Index: utils.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/utils.c,v retrieving revision 1.40 retrieving revision 1.41 diff -u -p -r1.40 -r1.41 --- utils.c 14 Aug 2005 15:56:31 -0000 1.40 +++ utils.c 16 Aug 2005 13:25:16 -0000 1.41 @@ -746,14 +746,19 @@ int utils_is_metadata (ntfs_inode *inode * @buf: Buffer to be displayed * @start: Offset into @buf to start from * @length: Number of bytes to display - * @ascii: Whether or not to display the ascii values + * @flags: Options to change the style of the output * * Display a block of memory in a tradition hex-dump manner. * Optionally the ascii part can be turned off. + * + * The flags, described fully in utils.h, default to 0 (DM_DEFAULTS). + * Examples are: DM_INDENT (indent the output by one tab); DM_RED (colour the + * output); DM_NO_ASCII (only print the hex values). */ -void utils_dump_mem (u8 *buf, int start, int length, int flags) +void utils_dump_mem (void *buf, int start, int length, int flags) { int off, i, s, e, col; + u8 *mem = buf; s = start & ~15; // round down e = (start + length + 15) & ~15; // round up @@ -781,7 +786,7 @@ void utils_dump_mem (u8 *buf, int start, if ((i == 8) && (!(flags & DM_NO_DIVIDER))) printf (" -"); if (((off+i) >= start) && ((off+i) < (start+length))) - printf (" %02X", buf[off+i]); + printf (" %02X", mem[off+i]); else printf (" "); } @@ -790,8 +795,8 @@ void utils_dump_mem (u8 *buf, int start, for (i = 0; i < 16; i++) { if (((off+i) < start) || ((off+i) >= (start+length))) printf (" "); - else if (isprint (buf[off + i])) - printf ("%c", buf[off + i]); + else if (isprint (mem[off + i])) + printf ("%c", mem[off + i]); else printf ("."); } Index: utils.h =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/utils.h,v retrieving revision 1.24 retrieving revision 1.25 diff -u -p -r1.24 -r1.25 --- utils.h 20 Jul 2005 19:06:51 -0000 1.24 +++ utils.h 16 Aug 2005 13:25:16 -0000 1.25 @@ -92,7 +92,7 @@ int utils_attr_get_name (ntfs_volume *vo int utils_cluster_in_use (ntfs_volume *vol, long long lcn); int utils_mftrec_in_use (ntfs_volume *vol, MFT_REF mref); int utils_is_metadata (ntfs_inode *inode); -void utils_dump_mem (u8 *buf, int start, int length, int ascii); +void utils_dump_mem (void *buf, int start, int length, int ascii); ATTR_RECORD * find_attribute (const ATTR_TYPES type, ntfs_attr_search_ctx *ctx); ATTR_RECORD * find_first_attribute (const ATTR_TYPES type, MFT_RECORD *mft); |
