This patch gets rid of the following warnings.
fs/ntfs/attrib.c: In function `find_attr':
fs/ntfs/attrib.c:1187: warning: duplicate `const'
fs/ntfs/unistr.c: In function `ntfs_collate_names':
fs/ntfs/unistr.c:102: warning: duplicate `const'
fs/ntfs/unistr.c:102: warning: duplicate `const'
diff -Nru a/fs/ntfs/attrib.c b/fs/ntfs/attrib.c
--- a/fs/ntfs/attrib.c Mon Feb 17 14:16:15 2003
+++ b/fs/ntfs/attrib.c Mon Feb 17 14:16:15 2003
@@ -1183,7 +1183,8 @@
register int rc;
rc = memcmp(val, (u8*)a + le16_to_cpu(
- a->_ARA(value_offset)), min(val_len,
+ a->_ARA(value_offset)),
+ min_t(const u32, val_len,
le32_to_cpu(a->_ARA(value_length))));
/*
* If @val collates before the current attribute's
diff -Nru a/fs/ntfs/unistr.c b/fs/ntfs/unistr.c
--- a/fs/ntfs/unistr.c Mon Feb 17 14:16:15 2003
+++ b/fs/ntfs/unistr.c Mon Feb 17 14:16:15 2003
@@ -96,10 +96,10 @@
const int err_val, const IGNORE_CASE_BOOL ic,
const uchar_t *upcase, const u32 upcase_len)
{
- u32 cnt, min_len;
+ u32 cnt;
+ const u32 min_len = min_t(const u32, name1_len, name2_len);
uchar_t c1, c2;
- min_len = min(name1_len, name2_len);
for (cnt = 0; cnt < min_len; ++cnt) {
c1 = le16_to_cpu(*name1++);
c2 = le16_to_cpu(*name2++);
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Sun Feb 23 2003 - 22:00:19 EST