mirrors/ntfs-3g
0
0
Fork 0
mirror of https://git.code.sf.net/p/ntfs-3g/ntfs-3g.git synced 2024-12-03 23:13:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Renamed reserved fields in ntfsrecover the same way as in logfile.h

Browse Source 
Prepare merging ntfsrecover.h into logfile.h by naming reserved fields
the same way.
This commit is contained in:
Jean-Pierre André 2016-04-06 10:54:51 +02:00
parent 234cae2a1b
commit 60ba821ece
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ntfsprogs/ntfsrecover.c
View File

@ -2156,9 +2156,9 @@ static void showlogr(CONTEXT *ctx, int k, const LOG_RECORD *logr)
printf("log_record_flags %04x\n",
(int)le16_to_cpu(logr->log_record_flags));
printf("reserved1 %04x %04x %04x\n",
(int)le16_to_cpu(logr->reserved1[0]),
(int)le16_to_cpu(logr->reserved1[1]),
(int)le16_to_cpu(logr->reserved1[2]));
(int)le16_to_cpu(logr->reserved_or_alignment[0]),
(int)le16_to_cpu(logr->reserved_or_alignment[1]),
(int)le16_to_cpu(logr->reserved_or_alignment[2]));
detaillogr(ctx, logr);
}
if (optt) {
@ -2387,9 +2387,9 @@ static void showheadrcrd(u32 blk, const RECORD_PAGE_HEADER *rph)
printf("next_record_offset %04x\n",
(int)le16_to_cpu(rph->next_record_offset));
printf("reserved4 %04x %04x %04x\n",
(int)le16_to_cpu(rph->reserved4[0]),
(int)le16_to_cpu(rph->reserved4[1]),
(int)le16_to_cpu(rph->reserved4[2]));
(int)le16_to_cpu(rph->reserved[0]),
(int)le16_to_cpu(rph->reserved[1]),
(int)le16_to_cpu(rph->reserved[2]));
diff = sle64_to_cpu(rph->last_end_lsn) - synced_lsn;
printf("last_end_lsn %016llx (synced%s%ld)\n",
(long long)sle64_to_cpu(rph->last_end_lsn),
@ -4068,7 +4068,7 @@ static BOOL checkstructs(void)
(int)sizeof(RESTART_PAGE_HEADER));
ok = FALSE;
}
if (sizeof(RESTART_AREA) != 44) {
if (sizeof(RESTART_AREA) != 48) {
fprintf(stderr,
"* error : bad sizeof(RESTART_AREA) %d\n",
(int)sizeof(RESTART_AREA));

5
ntfsprogs/ntfsrecover.h
View File

@ -157,6 +157,7 @@ typedef struct { /* size 44 */
le16 log_record_header_length;
le16 log_page_data_offset;
le32 restart_log_open_count;
le32 reserved;
} __attribute__((__packed__)) RESTART_AREA;
typedef struct { /* size 160 */
@ -208,7 +209,7 @@ typedef struct { /* size 40 */
le16 page_count;
le16 page_position;
le16 next_record_offset;
le16 reserved4[3];
le16 reserved[3];
leLSN last_end_lsn;
} __attribute__((__packed__)) RECORD_PAGE_HEADER;
@ -228,7 +229,7 @@ typedef struct { /* size 80 */
LOG_RECORD_TYPE record_type;
le32 transaction_id;
LOG_RECORD_FLAGS log_record_flags;
le16 reserved1[3];
le16 reserved_or_alignment[3];
le16 redo_operation;
le16 undo_operation;
le16 redo_offset;