From 5d1501ed1b2f0abe395ab119c7d9c5b055d10d92 Mon Sep 17 00:00:00 2001 From: PulkoMandy Date: Fri, 8 Jul 2022 10:36:33 +0200 Subject: [PATCH] reiserfs: enable -Werror Change-Id: I2f431efee7b5d75c33bf6355e2a9e61ed233465c Reviewed-on: https://review.haiku-os.org/c/haiku/+/5437 Tested-by: Commit checker robot Reviewed-by: Adrien Destugues --- build/jam/ArchitectureRules | 2 +- src/add-ons/kernel/file_systems/reiserfs/Iterators.cpp | 2 +- src/add-ons/kernel/file_systems/reiserfs/Settings.cpp | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/build/jam/ArchitectureRules b/build/jam/ArchitectureRules index ed0f0af9ae..d736988120 100644 --- a/build/jam/ArchitectureRules +++ b/build/jam/ArchitectureRules @@ -734,7 +734,7 @@ rule ArchitectureSetupWarnings architecture # EnableWerror src add-ons kernel file_systems ntfs ; EnableWerror src add-ons kernel file_systems packagefs ; # EnableWerror src add-ons kernel file_systems ramfs ; -# EnableWerror src add-ons kernel file_systems reiserfs ; + EnableWerror src add-ons kernel file_systems reiserfs ; EnableWerror src add-ons kernel file_systems udf ; EnableWerror src add-ons kernel file_systems userlandfs ; EnableWerror src add-ons kernel file_systems xfs ; diff --git a/src/add-ons/kernel/file_systems/reiserfs/Iterators.cpp b/src/add-ons/kernel/file_systems/reiserfs/Iterators.cpp index 1d76d87913..f5a99e674e 100644 --- a/src/add-ons/kernel/file_systems/reiserfs/Iterators.cpp +++ b/src/add-ons/kernel/file_systems/reiserfs/Iterators.cpp @@ -1324,7 +1324,7 @@ StreamReader::ReadAt(off_t position, void *buffer, size_t bufferSize, // compute the number of bytes that acually have to be read if (error == B_OK) { if (position < fStreamSize) { - if (position + bufferSize > fStreamSize) + if (position + (off_t)bufferSize > fStreamSize) bufferSize = fStreamSize - position; } else bufferSize = 0; diff --git a/src/add-ons/kernel/file_systems/reiserfs/Settings.cpp b/src/add-ons/kernel/file_systems/reiserfs/Settings.cpp index 13e1791a41..d806716ff2 100644 --- a/src/add-ons/kernel/file_systems/reiserfs/Settings.cpp +++ b/src/add-ons/kernel/file_systems/reiserfs/Settings.cpp @@ -142,6 +142,7 @@ Settings::HiddenEntryAt(int32 index) const void Settings::Dump() { +#if DEBUG PRINT(("Settings:\n")); PRINT((" default volume name: `%s'\n", GetDefaultVolumeName())); PRINT((" volume name: `%s'\n", GetVolumeName())); @@ -149,6 +150,7 @@ Settings::Dump() PRINT((" %" B_PRId32 " hidden entries:\n", fHiddenEntries.CountItems())); for (int32 i = 0; const char *entry = HiddenEntryAt(i); i++) PRINT((" `%s'\n", entry)); +#endif } // _Init