Changes by: antona
Update of /cvsroot/linux-ntfs/linux-ntfs/ntfstools
In directory usw-pr-cvs1:/tmp/cvs-serv5724/ntfstools
Modified Files:
Makefile.am Makefile.in dumplog.c mkntfs.c ntfsdump_logfile.c
ntfsfix.c ntfsinfo.c ntfslabel.c upcase.c
Log Message:
Global replacement of __[su]{8,16,32,64} with [su]{8,16,32,64} and layout.h define it.
Index: Makefile.am
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/Makefile.am,v
retrieving revision 1.22
retrieving revision 1.23
diff -U2 -r1.22 -r1.23
--- Makefile.am 1 Jul 2002 13:30:28 -0000 1.22
+++ Makefile.am 2 Jul 2002 23:47:11 -0000 1.23
@@ -8,5 +8,5 @@
bin_PROGRAMS = ntfsfix ntfsinfo # ntfsdump_logfile dumplog
sbin_PROGRAMS = mkntfs ntfslabel # ntfsundelete
-man_MANS = mkntfs.8 ntfsfix.8 ntfslabel.8 ntfsinfo.8 ntfsundelete.8
+man_MANS = mkntfs.8 ntfsfix.8 ntfslabel.8 ntfsinfo.8 #ntfsundelete.8
linux_ntfsincludedir = -I$(top_srcdir)/include
@@ -31,7 +31,7 @@
ntfsinfo_LDFLAGS = $(all_libraries)
-ntfsundelete_SOURCES = ntfsundelete.c
-ntfsundelete_LDADD = $(top_srcdir)/libntfs/libntfs.la
-ntfsundelete_LDFLAGS = $(all_libraries)
+#ntfsundelete_SOURCES = ntfsundelete.c
+#ntfsundelete_LDADD = $(top_srcdir)/libntfs/libntfs.la
+#ntfsundelete_LDFLAGS = $(all_libraries)
# We don't distribute these as they are not really of any use to anyone except
Index: Makefile.in
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/Makefile.in,v
retrieving revision 1.28
retrieving revision 1.29
diff -U2 -r1.28 -r1.29
--- Makefile.in 1 Jul 2002 13:30:28 -0000 1.28
+++ Makefile.in 2 Jul 2002 23:47:11 -0000 1.29
@@ -94,5 +94,5 @@
bin_PROGRAMS = ntfsfix ntfsinfo # ntfsdump_logfile dumplog
sbin_PROGRAMS = mkntfs ntfslabel # ntfsundelete
-man_MANS = mkntfs.8 ntfsfix.8 ntfslabel.8 ntfsinfo.8 ntfsundelete.8
+man_MANS = mkntfs.8 ntfsfix.8 ntfslabel.8 ntfsinfo.8 #ntfsundelete.8
linux_ntfsincludedir = -I$(top_srcdir)/include
@@ -116,15 +116,9 @@
ntfsinfo_LDADD = $(top_srcdir)/libntfs/libntfs.la
ntfsinfo_LDFLAGS = $(all_libraries)
-
-ntfsundelete_SOURCES = ntfsundelete.c
-ntfsundelete_HEADERS = ntfsundelete.h
-ntfsundelete_LDADD = $(top_srcdir)/libntfs/libntfs.la
-ntfsundelete_LDFLAGS = $(all_libraries)
-
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../config.h
-CONFIG_CLEAN_FILES = mkntfs.8 ntfsfix.8 ntfslabel.8 ntfsinfo.8 ntfsundelete.8
+CONFIG_CLEAN_FILES = mkntfs.8 ntfsfix.8 ntfslabel.8 ntfsinfo.8
bin_PROGRAMS = ntfsfix$(EXEEXT) ntfsinfo$(EXEEXT)
-sbin_PROGRAMS = mkntfs$(EXEEXT) ntfslabel$(EXEEXT) # ntfsundelete$(EXEEXT)
+sbin_PROGRAMS = mkntfs$(EXEEXT) ntfslabel$(EXEEXT)
PROGRAMS = $(bin_PROGRAMS) $(sbin_PROGRAMS)
@@ -136,6 +130,4 @@
ntfsinfo_OBJECTS = ntfsinfo.$(OBJEXT)
ntfsinfo_DEPENDENCIES = $(top_srcdir)/libntfs/libntfs.la
-ntfsundelete_OBJECTS = ntfsundelete.$(OBJEXT)
-ntfsundelete_DEPENDENCIES = $(top_srcdir)/libntfs/libntfs.la
mkntfs_OBJECTS = attrdef.$(OBJEXT) upcase.$(OBJEXT) boot.$(OBJEXT) \
sd.$(OBJEXT) mkntfs.$(OBJEXT)
@@ -152,5 +144,5 @@
NROFF = nroff
DIST_COMMON = Makefile.am Makefile.in mkntfs.8.in ntfsfix.8.in \
-ntfsinfo.8.in ntfslabel.8.in ntfsundelete.8.in
+ntfsinfo.8.in ntfslabel.8.in
@@ -160,8 +152,7 @@
GZIP_ENV = --best
DEP_FILES = .deps/attrdef.P .deps/boot.P .deps/mkntfs.P .deps/ntfsfix.P \
-.deps/ntfsinfo.P .deps/ntfslabel.P .deps/sd.P .deps/upcase.P .deps/ntfsundelete.P
-SOURCES = $(ntfsfix_SOURCES) $(ntfsinfo_SOURCES) $(mkntfs_SOURCES) $(ntfslabel_SOURCES) $(ntfsundelete_SOURCES)
-OBJECTS = $(ntfsfix_OBJECTS) $(ntfsinfo_OBJECTS) $(mkntfs_OBJECTS) $(ntfslabel_OBJECTS) $(ntfsundelete_OBJECTS)
-HEADERS = $(ntfsundelete_HEADERS)
+.deps/ntfsinfo.P .deps/ntfslabel.P .deps/sd.P .deps/upcase.P
+SOURCES = $(ntfsfix_SOURCES) $(ntfsinfo_SOURCES) $(mkntfs_SOURCES) $(ntfslabel_SOURCES)
+OBJECTS = $(ntfsfix_OBJECTS) $(ntfsinfo_OBJECTS) $(mkntfs_OBJECTS) $(ntfslabel_OBJECTS)
all: all-redirect
@@ -183,6 +174,4 @@
ntfsinfo.8: $(top_builddir)/config.status ntfsinfo.8.in
cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-ntfsundelete.8: $(top_builddir)/config.status ntfsundelete.8.in
- cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
mostlyclean-binPROGRAMS:
@@ -282,8 +271,4 @@
$(LINK) $(ntfsinfo_LDFLAGS) $(ntfsinfo_OBJECTS) $(ntfsinfo_LDADD) $(LIBS)
-ntfsundelete$(EXEEXT): $(ntfsundelete_OBJECTS) $(ntfsundelete_DEPENDENCIES)
- @rm -f ntfsundelete$(EXEEXT)
- $(LINK) $(ntfsundelete_LDFLAGS) $(ntfsundelete_OBJECTS) $(ntfsundelete_LDADD) $(LIBS)
-
mkntfs$(EXEEXT): $(mkntfs_OBJECTS) $(mkntfs_DEPENDENCIES)
@rm -f mkntfs$(EXEEXT)
@@ -497,4 +482,8 @@
mostlyclean distclean maintainer-clean
+
+#ntfsundelete_SOURCES = ntfsundelete.c
+#ntfsundelete_LDADD = $(top_srcdir)/libntfs/libntfs.la
+#ntfsundelete_LDFLAGS = $(all_libraries)
# We don't distribute these as they are not really of any use to anyone except
Index: dumplog.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/dumplog.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -U2 -r1.6 -r1.7
--- dumplog.c 21 Apr 2002 01:26:39 -0000 1.6
+++ dumplog.c 2 Jul 2002 23:47:11 -0000 1.7
@@ -44,5 +44,5 @@
int main(int argc, char **argv)
{
- __s64 l, br;
+ s64 l, br;
unsigned char *lfd = NULL;
RESTART_PAGE_HEADER *rph;
@@ -112,5 +112,5 @@
/* Check restart area. */
if (!is_rstr_recordp(lfd)) {
- __s64 _l;
+ s64 _l;
for (_l = 0LL; _l < l; _l++)
Index: mkntfs.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/mkntfs.c,v
retrieving revision 1.74
retrieving revision 1.75
diff -U2 -r1.74 -r1.75
--- mkntfs.c 27 Apr 2002 19:49:10 -0000 1.74
+++ mkntfs.c 2 Jul 2002 23:47:11 -0000 1.75
@@ -112,5 +112,5 @@
extern void init_system_file_sd(int sys_file_no, char **sd_val,
int *sd_val_len);
-extern void init_upcase_table(uchar_t *uc, __u32 uc_len);
+extern void init_upcase_table(uchar_t *uc, u32 uc_len);
/* Page size on ia32. Can change to 8192 on Alpha. */
@@ -165,5 +165,5 @@
int attr_defs_len; /* in bytes */
uchar_t *upcase; /* filename, upcase table. */
- __u32 upcase_len; /* Determined automatically. */
+ u32 upcase_len; /* Determined automatically. */
char quiet; /* -q, quiet execution. */
char verbose; /* -v, verbose execution, given twice,
@@ -303,8 +303,8 @@
* will be set to the error code.
*/
-__s64 ntfs_rlwrite(int fd, const run_list *rl, const char *val,
- const __s64 val_len, __s64 *inited_size)
+s64 ntfs_rlwrite(int fd, const run_list *rl, const char *val,
+ const s64 val_len, s64 *inited_size)
{
- __s64 bytes_written, total, length, delta;
+ s64 bytes_written, total, length, delta;
int retry, i;
@@ -444,5 +444,5 @@
}
-void dump_resident_attr_val(ATTR_TYPES type, char *val, __u32 val_len)
+void dump_resident_attr_val(ATTR_TYPES type, char *val, u32 val_len)
{
const char *don_t_know = "Don't know what to do with this attribute "
@@ -616,5 +616,5 @@
void dump_non_resident_attr(ATTR_RECORD *a)
{
- __s64 l;
+ s64 l;
int i;
@@ -803,5 +803,5 @@
}
/* Set the update sequence number to 1. */
- *(__u16*)((char*)m + ((sizeof(MFT_RECORD) + 1) & ~1)) = cpu_to_le16(1);
+ *(u16*)((char*)m + ((sizeof(MFT_RECORD) + 1) & ~1)) = cpu_to_le16(1);
m->lsn = cpu_to_le64(0LL);
m->sequence_number = cpu_to_le16(1);
@@ -837,5 +837,5 @@
long long l = n;
int i;
- __s8 j;
+ s8 j;
i = 0;
@@ -894,5 +894,5 @@
long long l = n;
int i;
- __s8 j;
+ s8 j;
// printf("n = l = 0x%Lx\n", l);
@@ -935,5 +935,5 @@
{
int i;
- __s8 len_len, lcn_len;
+ s8 len_len, lcn_len;
char *dest_max;
LCN prev_lcn;
@@ -990,7 +990,7 @@
* the input parameters were faulty.
*/
-int make_room_for_attribute(MFT_RECORD *m, char *pos, const __u32 size)
+int make_room_for_attribute(MFT_RECORD *m, char *pos, const u32 size)
{
- __u32 biu;
+ u32 biu;
if (!size)
@@ -1029,5 +1029,5 @@
/* Return 0 on success and -errno on error. */
int resize_resident_attribute_value(MFT_RECORD *m, ATTR_RECORD *a,
- const __u32 new_vsize)
+ const u32 new_vsize)
{
int new_alen, new_muse;
@@ -1085,5 +1085,5 @@
* necessary.
*/
-run_list *allocate_scattered_clusters(__s64 clusters)
+run_list *allocate_scattered_clusters(s64 clusters)
{
run_list *rl = NULL, *rlt;
@@ -1092,5 +1092,5 @@
int rlpos = 0;
int rlsize = 0;
- __s64 prev_run_len = 0LL;
+ s64 prev_run_len = 0LL;
char bit;
@@ -1163,13 +1163,13 @@
*/
int insert_positioned_attr_in_mft_record(MFT_RECORD *m, const ATTR_TYPES type,
- const char *name, __u32 name_len, const IGNORE_CASE_BOOL ic,
+ const char *name, u32 name_len, const IGNORE_CASE_BOOL ic,
const ATTR_FLAGS flags, const run_list *rl,
- const char *val, const __s64 val_len)
+ const char *val, const s64 val_len)
{
ntfs_attr_search_ctx *ctx;
ATTR_RECORD *a;
- __u16 hdr_size;
+ u16 hdr_size;
int asize, mpa_size, err, i;
- __s64 bw = 0, inited_size;
+ s64 bw = 0, inited_size;
VCN highest_vcn;
uchar_t *uname;
@@ -1339,13 +1339,13 @@
/* Return 0 on success and -errno on error. */
int insert_non_resident_attr_in_mft_record(MFT_RECORD *m, const ATTR_TYPES type,
- const char *name, __u32 name_len, const IGNORE_CASE_BOOL ic,
- const ATTR_FLAGS flags, const char *val, const __s64 val_len)
+ const char *name, u32 name_len, const IGNORE_CASE_BOOL ic,
+ const ATTR_FLAGS flags, const char *val, const s64 val_len)
{
ntfs_attr_search_ctx *ctx;
ATTR_RECORD *a;
- __u16 hdr_size;
+ u16 hdr_size;
int asize, mpa_size, err, i;
run_list *rl = NULL;
- __s64 bw = 0;
+ s64 bw = 0;
uchar_t *uname;
/*
@@ -1520,7 +1520,7 @@
/* Return 0 on success and -errno on error. */
int insert_resident_attr_in_mft_record(MFT_RECORD *m, const ATTR_TYPES type,
- const char *name, __u32 name_len, const IGNORE_CASE_BOOL ic,
+ const char *name, u32 name_len, const IGNORE_CASE_BOOL ic,
const ATTR_FLAGS flags, const RESIDENT_ATTR_FLAGS res_flags,
- const char *val, const __u32 val_len)
+ const char *val, const u32 val_len)
{
ntfs_attr_search_ctx *ctx;
@@ -1618,7 +1618,7 @@
}
-__s64 time2ntfs(__s64 time)
+s64 time2ntfs(s64 time)
{
- return cpu_to_le64((time + (__s64)(369 * 365 + 89) * 24 * 3600)
+ return cpu_to_le64((time + (s64)(369 * 365 + 89) * 24 * 3600)
* 10000000);
}
@@ -1660,7 +1660,7 @@
/* Return 0 on success or -errno on error. */
int add_attr_file_name(MFT_RECORD *m, const MFT_REF parent_dir,
- const __s64 allocated_size, const __s64 data_size,
- const FILE_ATTR_FLAGS flags, const __u16 packed_ea_size,
- const __u32 reparse_point_tag, const char *file_name,
+ const s64 allocated_size, const s64 data_size,
+ const FILE_ATTR_FLAGS flags, const u16 packed_ea_size,
+ const u32 reparse_point_tag, const char *file_name,
const FILE_NAME_TYPE_FLAGS file_name_type)
{
@@ -1741,5 +1741,5 @@
* Return 0 on success or -errno on error.
*/
-int add_attr_sd(MFT_RECORD *m, const char *sd, const __s64 sd_len)
+int add_attr_sd(MFT_RECORD *m, const char *sd, const s64 sd_len)
{
int err;
@@ -1761,7 +1761,7 @@
/* Return 0 on success or -errno on error. */
-int add_attr_data(MFT_RECORD *m, const char *name, const __u32 name_len,
+int add_attr_data(MFT_RECORD *m, const char *name, const u32 name_len,
const IGNORE_CASE_BOOL ic, const ATTR_FLAGS flags,
- const char *val, const __s64 val_len)
+ const char *val, const s64 val_len)
{
int err;
@@ -1800,7 +1800,7 @@
*/
int add_attr_data_positioned(MFT_RECORD *m, const char *name,
- const __u32 name_len, const IGNORE_CASE_BOOL ic,
+ const u32 name_len, const IGNORE_CASE_BOOL ic,
const ATTR_FLAGS flags, const run_list *rl,
- const char *val, const __s64 val_len)
+ const char *val, const s64 val_len)
{
int err;
@@ -1858,5 +1858,5 @@
/* Return 0 on success or -errno on error. */
int add_attr_vol_info(MFT_RECORD *m, const VOLUME_FLAGS flags,
- const __u8 major_ver, const __u8 minor_ver)
+ const u8 major_ver, const u8 minor_ver)
{
VOLUME_INFORMATION vi;
@@ -1875,8 +1875,8 @@
/* Return 0 on success or -errno on error. */
-int add_attr_index_root(MFT_RECORD *m, const char *name, const __u32 name_len,
+int add_attr_index_root(MFT_RECORD *m, const char *name, const u32 name_len,
const IGNORE_CASE_BOOL ic, const ATTR_TYPES indexed_attr_type,
const COLLATION_RULES collation_rule,
- const __u32 index_block_size)
+ const u32 index_block_size)
{
INDEX_ROOT *r;
@@ -1951,7 +1951,7 @@
/* Return 0 on success or -errno on error. */
-int add_attr_index_alloc(MFT_RECORD *m, const char *name, const __u32 name_len,
+int add_attr_index_alloc(MFT_RECORD *m, const char *name, const u32 name_len,
const IGNORE_CASE_BOOL ic, const char *index_alloc_val,
- const __u32 index_alloc_val_len)
+ const u32 index_alloc_val_len)
{
int err;
@@ -1966,7 +1966,7 @@
/* Return 0 on success or -errno on error. */
-int add_attr_bitmap(MFT_RECORD *m, const char *name, const __u32 name_len,
+int add_attr_bitmap(MFT_RECORD *m, const char *name, const u32 name_len,
const IGNORE_CASE_BOOL ic, const char *bitmap,
- const __u32 bitmap_len)
+ const u32 bitmap_len)
{
int err;
@@ -1994,6 +1994,6 @@
*/
int add_attr_bitmap_positioned(MFT_RECORD *m, const char *name,
- const __u32 name_len, const IGNORE_CASE_BOOL ic,
- const run_list *rl, const char *bitmap, const __u32 bitmap_len)
+ const u32 name_len, const IGNORE_CASE_BOOL ic,
+ const run_list *rl, const char *bitmap, const u32 bitmap_len)
{
int err;
@@ -2015,5 +2015,5 @@
*/
int upgrade_to_large_index(MFT_RECORD *m, const char *name,
- __u32 name_len, const IGNORE_CASE_BOOL ic,
+ u32 name_len, const IGNORE_CASE_BOOL ic,
INDEX_ALLOCATION **index)
{
@@ -2095,5 +2095,5 @@
}
/* Set USN to 1. */
- *(__u16*)((char*)ia_val + le16_to_cpu(ia_val->usa_ofs)) =
+ *(u16*)((char*)ia_val + le16_to_cpu(ia_val->usa_ofs)) =
cpu_to_le16(1);
ia_val->lsn = cpu_to_le64(0);
@@ -2173,7 +2173,7 @@
*/
int make_room_for_index_entry_in_index_block(INDEX_BLOCK *index,
- INDEX_ENTRY *pos, __u32 size)
+ INDEX_ENTRY *pos, u32 size)
{
- __u32 biu;
+ u32 biu;
if (!size)
@@ -2225,5 +2225,5 @@
*/
int insert_file_link_in_dir_index(INDEX_BLOCK *index, MFT_REF file_ref,
- FILE_NAME_ATTR *file_name, __u32 file_name_size)
+ FILE_NAME_ATTR *file_name, u32 file_name_size)
{
int err, i;
@@ -2357,7 +2357,7 @@
int create_hardlink(INDEX_BLOCK *index, const MFT_REF ref_parent,
MFT_RECORD *m_file, const MFT_REF ref_file,
- const __s64 allocated_size, const __s64 data_size,
- const FILE_ATTR_FLAGS flags, const __u16 packed_ea_size,
- const __u32 reparse_point_tag, const char *file_name,
+ const s64 allocated_size, const s64 data_size,
+ const FILE_ATTR_FLAGS flags, const u16 packed_ea_size,
+ const u32 reparse_point_tag, const char *file_name,
const FILE_NAME_TYPE_FLAGS file_name_type)
{
@@ -2595,6 +2595,6 @@
}
-#define MAKE_MFT_REF(_ref, _seqno) cpu_to_le64((((__u64)(_seqno)) << 48) \
- | ((__u64)(_ref)))
+#define MAKE_MFT_REF(_ref, _seqno) cpu_to_le64((((u64)(_seqno)) << 48) \
+ | ((u64)(_ref)))
static inline int valid_offset(int f, long long ofs)
@@ -2703,5 +2703,5 @@
"sectors.\n");
if (opt.sector_size)
- opt.nr_sectors = ((__s64)sbuf.st_blocks << 9) /
+ opt.nr_sectors = ((s64)sbuf.st_blocks << 9) /
opt.sector_size;
else {
@@ -2892,5 +2892,5 @@
*/
for (i = opt.nr_clusters; i < lcn_bitmap_byte_size << 3; i++)
- ntfs_set_bit(lcn_bitmap, (__u64)i, 1);
+ ntfs_set_bit(lcn_bitmap, (u64)i, 1);
/*
* Determine mft_size: 16 mft records or 1 cluster, which ever is
@@ -2929,5 +2929,5 @@
rl_mft_bmp[1].length = 0LL;
/* Allocate cluster for mft bitmap. */
- ntfs_set_bit(lcn_bitmap, (__s64)j, 1);
+ ntfs_set_bit(lcn_bitmap, (s64)j, 1);
/* If user didn't specify the mft lcn, determine it now. */
if (!opt.mft_lcn) {
@@ -3188,5 +3188,5 @@
*/
for (i = 0; i < 16; i++) {
- __u32 file_attrs;
+ u32 file_attrs;
m = (MFT_RECORD*)(buf + i * vol->mft_record_size);
@@ -3394,5 +3394,5 @@
bs = (NTFS_BOOT_SECTOR*)buf2;
bs->bpb.bytes_per_sector = cpu_to_le16(opt.sector_size);
- bs->bpb.sectors_per_cluster = (__u8)(vol->cluster_size /
+ bs->bpb.sectors_per_cluster = (u8)(vol->cluster_size /
opt.sector_size);
bs->bpb.media_type = 0xf8; /* hard disk */
@@ -3433,6 +3433,6 @@
bs->clusters_per_index_record);
/* Generate a 64-bit random number for the serial number. */
- bs->volume_serial_number = scpu_to_le64(((__s64)random() << 32) |
- ((__s64)random() & 0xffffffff));
+ bs->volume_serial_number = scpu_to_le64(((s64)random() << 32) |
+ ((s64)random() & 0xffffffff));
/*
* Leave zero for now as NT4 leaves it zero, too. If want it later, see
@@ -3656,5 +3656,5 @@
for (i = 0; i < rl_mftmirr[0].length * vol->cluster_size /
vol->mft_record_size; i++) {
- __u16 usn, *usnp;
+ u16 usn, *usnp;
m = (MFT_RECORD*)(buf + i * vol->mft_record_size);
/*
@@ -3664,5 +3664,5 @@
* $MFT, rather than just equivalent meaning content.
*/
- usnp = (__u16*)((char*)m + le16_to_cpu(m->usa_ofs));
+ usnp = (u16*)((char*)m + le16_to_cpu(m->usa_ofs));
usn = le16_to_cpup(usnp);
if (usn-- <= 1)
Index: ntfsdump_logfile.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/ntfsdump_logfile.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -U2 -r1.20 -r1.21
--- ntfsdump_logfile.c 29 Apr 2002 01:53:55 -0000 1.20
+++ ntfsdump_logfile.c 2 Jul 2002 23:47:11 -0000 1.21
@@ -62,5 +62,5 @@
MFT_RECORD *m = NULL;
ATTR_RECORD *a;
- __s64 l;
+ s64 l;
unsigned char *lfd = NULL;
ntfs_volume *vol = NULL;
@@ -159,5 +159,5 @@
/* Check restart area. */
if (!is_rstr_recordp(lfd)) {
- __s64 _l;
+ s64 _l;
for (_l = 0LL; _l < l; _l++)
Index: ntfsfix.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/ntfsfix.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -U2 -r1.33 -r1.34
--- ntfsfix.c 5 Jun 2002 20:32:53 -0000 1.33
+++ ntfsfix.c 2 Jul 2002 23:47:11 -0000 1.34
@@ -63,5 +63,5 @@
int main(int argc, char **argv)
{
- __s64 l, br;
+ s64 l, br;
const char *EXEC_NAME = "NtfsFix";
const char *OK = "OK";
@@ -74,5 +74,5 @@
unsigned long mnt_flags;
int i;
- __u16 flags;
+ u16 flags;
BOOL done, force = FALSE;
@@ -138,6 +138,6 @@
/* Load data from $MFT and $MFTMirr and compare the contents. */
- m = (__u8*)malloc(vol->mftmirr_size << vol->mft_record_size_bits);
- m2 = (__u8*)malloc(vol->mftmirr_size << vol->mft_record_size_bits);
+ m = (u8*)malloc(vol->mftmirr_size << vol->mft_record_size_bits);
+ m2 = (u8*)malloc(vol->mftmirr_size << vol->mft_record_size_bits);
if (!m || !m2) {
perror("Failed to allocate memory");
@@ -222,8 +222,8 @@
goto error_exit;
}
- if (memcmp((__u8*)m + i * vol->mft_record_size, (__u8*)m2 +
+ if (memcmp((u8*)m + i * vol->mft_record_size, (u8*)m2 +
i * vol->mft_record_size,
ntfs_get_mft_record_data_size((MFT_RECORD*)(
- (__u8*)m + i * vol->mft_record_size)))) {
+ (u8*)m + i * vol->mft_record_size)))) {
if (!done) {
done = TRUE;
Index: ntfsinfo.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/ntfsinfo.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -U2 -r1.9 -r1.10
--- ntfsinfo.c 1 Jul 2002 23:18:37 -0000 1.9
+++ ntfsinfo.c 2 Jul 2002 23:47:11 -0000 1.10
@@ -43,5 +43,5 @@
-#define NTFS_TIME_OFFSET ((__u64)(369*365 + 89) * 24 * 3600 * 10000000)
+#define NTFS_TIME_OFFSET ((u64)(369*365 + 89) * 24 * 3600 * 10000000)
int main(int argc, char **argv)
@@ -109,8 +109,9 @@
-__s64 ntfs2time(__s64 time)
+s64 ntfs2time(s64 time)
{
+ s64 t;
printf("Original Time: %Li\n",time);
- __s64 t = time - NTFS_TIME_OFFSET;
+ t = time - NTFS_TIME_OFFSET;
t = t / 10000000;
return t;
Index: ntfslabel.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/ntfslabel.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -U2 -r1.13 -r1.14
--- ntfslabel.c 29 Apr 2002 01:53:55 -0000 1.13
+++ ntfslabel.c 2 Jul 2002 23:47:11 -0000 1.14
@@ -81,5 +81,5 @@
*/
int resize_resident_attribute_value(MFT_RECORD *m, ATTR_RECORD *a,
- const __u32 new_vsize)
+ const u32 new_vsize)
{
int new_alen, new_muse;
Index: upcase.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/upcase.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -U2 -r1.3 -r1.4
--- upcase.c 15 Apr 2002 20:04:31 -0000 1.3
+++ upcase.c 2 Jul 2002 23:47:11 -0000 1.4
@@ -27,5 +27,5 @@
#include "types.h"
-void init_upcase_table(uchar_t *uc, __u32 uc_len)
+void init_upcase_table(uchar_t *uc, u32 uc_len)
{
static int uc_run_table[][3] = { /* Start, End, Add */
|
