Changes by: szaka
Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12434/ntfsprogs
Modified Files:
decrypt.c mkntfs.c ntfsresize.c
Log Message:
Replaced all occurances of ENOTSUP to EOPNOTSUPP to be in better harmony
with the kernel driver
Index: decrypt.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/decrypt.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- decrypt.c 28 Jul 2005 16:18:20 -0000 1.20
+++ decrypt.c 1 Aug 2005 22:10:40 -0000 1.21
@@ -320,7 +320,7 @@ decrypt_key_open_err:
fnCertFreeCertificateContext(pCert);
errno = EINVAL;
#else /* !defined(__CYGWIN__) */
- errno = ENOTSUP;
+ errno = EOPNOTSUPP;
#endif /* !defined(__CYGWIN__) */
return NULL;
}
@@ -722,7 +722,7 @@ ntfs_decrypt_data_key *ntfs_decrypt_data
"and say that you saw this message. We will "
"then implement support for DES.\n");
free(key);
- errno = ENOTSUP;
+ errno = EOPNOTSUPP;
return NULL;
}
if (key_size != wanted_key_size) {
Index: mkntfs.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/mkntfs.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- mkntfs.c 20 Jul 2005 19:06:49 -0000 1.62
+++ mkntfs.c 1 Aug 2005 22:10:40 -0000 1.63
@@ -1226,7 +1226,7 @@ static int insert_positioned_attr_in_mft
}
if (ic == IGNORE_CASE) {
Eprintf("FIXME: Hit unimplemented code path #1.\n");
- err = -ENOTSUP;
+ err = -EOPNOTSUPP;
goto err_out;
}
if (!ntfs_attr_lookup(type, uname, name_len, ic, 0, NULL, 0, ctx)) {
@@ -1243,12 +1243,12 @@ static int insert_positioned_attr_in_mft
Eprintf("Compressed attributes not supported yet.\n");
// FIXME: Compress attribute into a temporary buffer, set
// val accordingly and save the compressed size.
- err = -ENOTSUP;
+ err = -EOPNOTSUPP;
goto err_out;
}
if (flags & (ATTR_IS_ENCRYPTED || ATTR_IS_SPARSE)) {
Eprintf("Encrypted/sparse attributes not supported yet.\n");
- err = -ENOTSUP;
+ err = -EOPNOTSUPP;
goto err_out;
}
if (flags & ATTR_COMPRESSION_MASK) {
@@ -1299,7 +1299,7 @@ static int insert_positioned_attr_in_mft
// record.
// FIXME: the check for needing extension records should be
// earlier on as it is very quick: asize > m->bytes_allocated?
- err = -ENOTSUP;
+ err = -EOPNOTSUPP;
goto err_out;
}
#ifdef DEBUG
@@ -1341,7 +1341,7 @@ static int insert_positioned_attr_in_mft
a->compressed_size = cpu_to_le64(0);
// FIXME: Write out the compressed data.
// FIXME: err = build_mapping_pairs_compressed();
- err = -ENOTSUP;
+ err = -EOPNOTSUPP;
} else {
a->compression_unit = 0;
bw = ntfs_rlwrite(vol->dev, rl, val, val_len, &inited_size);
@@ -1411,7 +1411,7 @@ static int insert_non_resident_attr_in_m
}
if (ic == IGNORE_CASE) {
Eprintf("FIXME: Hit unimplemented code path #2.\n");
- err = -ENOTSUP;
+ err = -EOPNOTSUPP;
goto err_out;
}
if (!ntfs_attr_lookup(type, uname, name_len, ic, 0, NULL, 0, ctx)) {
@@ -1428,12 +1428,12 @@ static int insert_non_resident_attr_in_m
Eprintf("Compressed attributes not supported yet.\n");
// FIXME: Compress attribute into a temporary buffer, set
// val accordingly and save the compressed size.
- err = -ENOTSUP;
+ err = -EOPNOTSUPP;
goto err_out;
}
if (flags & (ATTR_IS_ENCRYPTED || ATTR_IS_SPARSE)) {
Eprintf("Encrypted/sparse attributes not supported yet.\n");
- err = -ENOTSUP;
+ err = -EOPNOTSUPP;
goto err_out;
}
if (val_len) {
@@ -1486,7 +1486,7 @@ static int insert_non_resident_attr_in_m
// record.
// FIXME: the check for needing extension records should be
// earlier on as it is very quick: asize > m->bytes_allocated?
- err = -ENOTSUP;
+ err = -EOPNOTSUPP;
goto err_out;
}
#ifdef DEBUG
@@ -1531,7 +1531,7 @@ static int insert_non_resident_attr_in_m
a->compressed_size = cpu_to_le64(0);
// FIXME: Write out the compressed data.
// FIXME: err = build_mapping_pairs_compressed();
- err = -ENOTSUP;
+ err = -EOPNOTSUPP;
} else {
a->compression_unit = 0;
bw = ntfs_rlwrite(vol->dev, rl, val, val_len, NULL);
@@ -1600,7 +1600,7 @@ static int insert_resident_attr_in_mft_r
}
if (ic == IGNORE_CASE) {
Eprintf("FIXME: Hit unimplemented code path #3.\n");
- err = -ENOTSUP;
+ err = -EOPNOTSUPP;
goto err_out;
}
if (!ntfs_attr_lookup(type, uname, name_len, ic, 0, val, val_len,
@@ -1632,7 +1632,7 @@ static int insert_resident_attr_in_mft_r
// record.
// FIXME: the check for needing extension records should be
// earlier on as it is very quick: asize > m->bytes_allocated?
- err = -ENOTSUP;
+ err = -EOPNOTSUPP;
goto err_out;
}
#ifdef DEBUG
@@ -2121,7 +2121,7 @@ static int upgrade_to_large_index(MFT_RE
}
if (ic == IGNORE_CASE) {
Eprintf("FIXME: Hit unimplemented code path #4.\n");
- err = -ENOTSUP;
+ err = -EOPNOTSUPP;
if (uname)
free(uname);
goto err_out;
Index: ntfsresize.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsresize.c,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- ntfsresize.c 1 Aug 2005 20:33:26 -0000 1.83
+++ ntfsresize.c 1 Aug 2005 22:10:41 -0000 1.84
@@ -2184,7 +2184,7 @@ static ntfs_volume *mount_volume(void)
printf(corrupt_volume_msg);
else if (err == EPERM)
printf(hibernated_volume_msg);
- else if (err == EOPNOTSUPP) /* NOTE: same as ENOTSUP !!! */
+ else if (err == EOPNOTSUPP)
printf(unclean_journal_msg);
exit(1);
}
|