From 104eaabf01bed0ef8dd7a00f6db76659d341e22b Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Tue, 7 Apr 2026 14:53:06 -0400 Subject: [PATCH] Storage Kit: Move most MIME sniffer headers into src/. There's no reason to keep these in the private headers directory that I can see. --- headers/build/private/storage/sniffer/DisjList.h | 1 - headers/build/private/storage/sniffer/Err.h | 1 - headers/build/private/storage/sniffer/Parser.h | 1 - headers/build/private/storage/sniffer/Pattern.h | 1 - .../build/private/storage/sniffer/PatternList.h | 1 - headers/build/private/storage/sniffer/RPattern.h | 1 - .../build/private/storage/sniffer/RPatternList.h | 1 - headers/build/private/storage/sniffer/Range.h | 1 - headers/build/private/storage/sniffer/Rule.h | 1 - src/kits/storage/MimeType.cpp | 5 +++-- src/kits/storage/mime/SnifferRules.cpp | 5 +++-- src/kits/storage/sniffer/CharStream.cpp | 5 ++--- src/kits/storage/sniffer/DisjList.cpp | 2 +- .../kits}/storage/sniffer/DisjList.h | 0 src/kits/storage/sniffer/Err.cpp | 3 ++- .../private => src/kits}/storage/sniffer/Err.h | 0 src/kits/storage/sniffer/Parser.cpp | 14 +++++++------- .../private => src/kits}/storage/sniffer/Parser.h | 7 ++++--- src/kits/storage/sniffer/Pattern.cpp | 5 +++-- .../private => src/kits}/storage/sniffer/Pattern.h | 2 +- src/kits/storage/sniffer/PatternList.cpp | 7 ++++--- .../kits}/storage/sniffer/PatternList.h | 5 +++-- src/kits/storage/sniffer/RPattern.cpp | 9 +++++---- .../kits}/storage/sniffer/RPattern.h | 2 +- src/kits/storage/sniffer/RPatternList.cpp | 7 ++++--- .../kits}/storage/sniffer/RPatternList.h | 3 ++- src/kits/storage/sniffer/Range.cpp | 7 ++++--- .../private => src/kits}/storage/sniffer/Range.h | 0 src/kits/storage/sniffer/Rule.cpp | 7 ++++--- .../private => src/kits}/storage/sniffer/Rule.h | 0 src/servers/registrar/RosterSettingsCharStream.cpp | 1 - src/tests/kits/storage/Jamfile | 1 + src/tests/kits/storage/MimeSnifferTest.cpp | 7 ++++--- 33 files changed, 58 insertions(+), 55 deletions(-) delete mode 100644 headers/build/private/storage/sniffer/DisjList.h delete mode 100644 headers/build/private/storage/sniffer/Err.h delete mode 100644 headers/build/private/storage/sniffer/Parser.h delete mode 100644 headers/build/private/storage/sniffer/Pattern.h delete mode 100644 headers/build/private/storage/sniffer/PatternList.h delete mode 100644 headers/build/private/storage/sniffer/RPattern.h delete mode 100644 headers/build/private/storage/sniffer/RPatternList.h delete mode 100644 headers/build/private/storage/sniffer/Range.h delete mode 100644 headers/build/private/storage/sniffer/Rule.h rename {headers/private => src/kits}/storage/sniffer/DisjList.h (100%) rename {headers/private => src/kits}/storage/sniffer/Err.h (100%) rename {headers/private => src/kits}/storage/sniffer/Parser.h (99%) rename {headers/private => src/kits}/storage/sniffer/Pattern.h (98%) rename {headers/private => src/kits}/storage/sniffer/PatternList.h (94%) rename {headers/private => src/kits}/storage/sniffer/RPattern.h (97%) rename {headers/private => src/kits}/storage/sniffer/RPatternList.h (97%) rename {headers/private => src/kits}/storage/sniffer/Range.h (100%) rename {headers/private => src/kits}/storage/sniffer/Rule.h (100%) diff --git a/headers/build/private/storage/sniffer/DisjList.h b/headers/build/private/storage/sniffer/DisjList.h deleted file mode 100644 index 695dea1593..0000000000 --- a/headers/build/private/storage/sniffer/DisjList.h +++ /dev/null @@ -1 +0,0 @@ -#include <../../../private/storage/sniffer/DisjList.h> diff --git a/headers/build/private/storage/sniffer/Err.h b/headers/build/private/storage/sniffer/Err.h deleted file mode 100644 index 9b0c0965a4..0000000000 --- a/headers/build/private/storage/sniffer/Err.h +++ /dev/null @@ -1 +0,0 @@ -#include <../../../private/storage/sniffer/Err.h> diff --git a/headers/build/private/storage/sniffer/Parser.h b/headers/build/private/storage/sniffer/Parser.h deleted file mode 100644 index acda7de966..0000000000 --- a/headers/build/private/storage/sniffer/Parser.h +++ /dev/null @@ -1 +0,0 @@ -#include <../../../private/storage/sniffer/Parser.h> diff --git a/headers/build/private/storage/sniffer/Pattern.h b/headers/build/private/storage/sniffer/Pattern.h deleted file mode 100644 index 798d6eb68f..0000000000 --- a/headers/build/private/storage/sniffer/Pattern.h +++ /dev/null @@ -1 +0,0 @@ -#include <../../../private/storage/sniffer/Pattern.h> diff --git a/headers/build/private/storage/sniffer/PatternList.h b/headers/build/private/storage/sniffer/PatternList.h deleted file mode 100644 index 67ff2e55cf..0000000000 --- a/headers/build/private/storage/sniffer/PatternList.h +++ /dev/null @@ -1 +0,0 @@ -#include <../../../private/storage/sniffer/PatternList.h> diff --git a/headers/build/private/storage/sniffer/RPattern.h b/headers/build/private/storage/sniffer/RPattern.h deleted file mode 100644 index 1547c8f931..0000000000 --- a/headers/build/private/storage/sniffer/RPattern.h +++ /dev/null @@ -1 +0,0 @@ -#include <../../../private/storage/sniffer/RPattern.h> diff --git a/headers/build/private/storage/sniffer/RPatternList.h b/headers/build/private/storage/sniffer/RPatternList.h deleted file mode 100644 index b2a6b6ff46..0000000000 --- a/headers/build/private/storage/sniffer/RPatternList.h +++ /dev/null @@ -1 +0,0 @@ -#include <../../../private/storage/sniffer/RPatternList.h> diff --git a/headers/build/private/storage/sniffer/Range.h b/headers/build/private/storage/sniffer/Range.h deleted file mode 100644 index 3d05e0b2d8..0000000000 --- a/headers/build/private/storage/sniffer/Range.h +++ /dev/null @@ -1 +0,0 @@ -#include <../../../private/storage/sniffer/Range.h> diff --git a/headers/build/private/storage/sniffer/Rule.h b/headers/build/private/storage/sniffer/Rule.h deleted file mode 100644 index 7635c40a9f..0000000000 --- a/headers/build/private/storage/sniffer/Rule.h +++ /dev/null @@ -1 +0,0 @@ -#include <../../../private/storage/sniffer/Rule.h> diff --git a/src/kits/storage/MimeType.cpp b/src/kits/storage/MimeType.cpp index 822eb7dea3..73afb68343 100644 --- a/src/kits/storage/MimeType.cpp +++ b/src/kits/storage/MimeType.cpp @@ -14,8 +14,6 @@ #include #include #include -#include -#include #include #include @@ -25,6 +23,9 @@ #include #include +#include "sniffer/Rule.h" +#include "sniffer/Parser.h" + using namespace BPrivate; diff --git a/src/kits/storage/mime/SnifferRules.cpp b/src/kits/storage/mime/SnifferRules.cpp index de9ade3122..8009aefd45 100644 --- a/src/kits/storage/mime/SnifferRules.cpp +++ b/src/kits/storage/mime/SnifferRules.cpp @@ -25,12 +25,13 @@ #include #include #include -#include -#include #include #include #include +#include "../sniffer/Parser.h" +#include "../sniffer/Rule.h" + #define DBG(x) x //#define DBG(x) diff --git a/src/kits/storage/sniffer/CharStream.cpp b/src/kits/storage/sniffer/CharStream.cpp index eb916fc8d6..d46a1efbe8 100644 --- a/src/kits/storage/sniffer/CharStream.cpp +++ b/src/kits/storage/sniffer/CharStream.cpp @@ -1,6 +1,5 @@ -#include "sniffer/CharStream.h" - -#include +#include +#include "Err.h" using namespace BPrivate::Storage::Sniffer; diff --git a/src/kits/storage/sniffer/DisjList.cpp b/src/kits/storage/sniffer/DisjList.cpp index c428ec7837..39808b4572 100644 --- a/src/kits/storage/sniffer/DisjList.cpp +++ b/src/kits/storage/sniffer/DisjList.cpp @@ -7,7 +7,7 @@ MIME sniffer Disjunction List class implementation */ -#include +#include "DisjList.h" using namespace BPrivate::Storage::Sniffer; diff --git a/headers/private/storage/sniffer/DisjList.h b/src/kits/storage/sniffer/DisjList.h similarity index 100% rename from headers/private/storage/sniffer/DisjList.h rename to src/kits/storage/sniffer/DisjList.h diff --git a/src/kits/storage/sniffer/Err.cpp b/src/kits/storage/sniffer/Err.cpp index 4013884378..3215e7b0d7 100644 --- a/src/kits/storage/sniffer/Err.cpp +++ b/src/kits/storage/sniffer/Err.cpp @@ -7,10 +7,11 @@ MIME sniffer Error class implementation */ -#include #include #include +#include "Err.h" + using namespace BPrivate::Storage::Sniffer; //------------------------------------------------------------------------------ diff --git a/headers/private/storage/sniffer/Err.h b/src/kits/storage/sniffer/Err.h similarity index 100% rename from headers/private/storage/sniffer/Err.h rename to src/kits/storage/sniffer/Err.h diff --git a/src/kits/storage/sniffer/Parser.cpp b/src/kits/storage/sniffer/Parser.cpp index 65f6d984ae..190583e542 100644 --- a/src/kits/storage/sniffer/Parser.cpp +++ b/src/kits/storage/sniffer/Parser.cpp @@ -7,13 +7,13 @@ MIME sniffer rule parser implementation */ -#include -#include -#include -#include -#include -#include -#include +#include "Parser.h" +#include "Pattern.h" +#include "PatternList.h" +#include "Range.h" +#include "RPattern.h" +#include "RPatternList.h" +#include "Rule.h" #include #include diff --git a/headers/private/storage/sniffer/Parser.h b/src/kits/storage/sniffer/Parser.h similarity index 99% rename from headers/private/storage/sniffer/Parser.h rename to src/kits/storage/sniffer/Parser.h index 53765b88ad..8d0571f32d 100644 --- a/headers/private/storage/sniffer/Parser.h +++ b/src/kits/storage/sniffer/Parser.h @@ -11,13 +11,14 @@ #include #include -#include -#include -#include #include #include #include +#include "Err.h" +#include "Range.h" +#include "Rule.h" + class BString; //! MIME Sniffer related classes diff --git a/src/kits/storage/sniffer/Pattern.cpp b/src/kits/storage/sniffer/Pattern.cpp index ecb21b313b..f213c1ab18 100644 --- a/src/kits/storage/sniffer/Pattern.cpp +++ b/src/kits/storage/sniffer/Pattern.cpp @@ -7,14 +7,15 @@ MIME sniffer pattern implementation */ -#include -#include #include #include // for SEEK_* defines #include #include +#include "Err.h" +#include "Pattern.h" + using namespace BPrivate::Storage::Sniffer; Pattern::Pattern(const std::string &string, const std::string &mask) diff --git a/headers/private/storage/sniffer/Pattern.h b/src/kits/storage/sniffer/Pattern.h similarity index 98% rename from headers/private/storage/sniffer/Pattern.h rename to src/kits/storage/sniffer/Pattern.h index d4a52b2c0c..8c2ac7cff3 100644 --- a/headers/private/storage/sniffer/Pattern.h +++ b/src/kits/storage/sniffer/Pattern.h @@ -11,7 +11,7 @@ #include #include -#include +#include "Range.h" class BPositionIO; diff --git a/src/kits/storage/sniffer/PatternList.cpp b/src/kits/storage/sniffer/PatternList.cpp index 317937b84f..19534deb76 100644 --- a/src/kits/storage/sniffer/PatternList.cpp +++ b/src/kits/storage/sniffer/PatternList.cpp @@ -7,12 +7,13 @@ MIME sniffer pattern list implementation */ -#include -#include -#include #include #include +#include "Err.h" +#include "Pattern.h" +#include "PatternList.h" + using namespace BPrivate::Storage::Sniffer; PatternList::PatternList(Range range) diff --git a/headers/private/storage/sniffer/PatternList.h b/src/kits/storage/sniffer/PatternList.h similarity index 94% rename from headers/private/storage/sniffer/PatternList.h rename to src/kits/storage/sniffer/PatternList.h index 40779f0917..26168832c0 100644 --- a/headers/private/storage/sniffer/PatternList.h +++ b/src/kits/storage/sniffer/PatternList.h @@ -9,10 +9,11 @@ #ifndef _SNIFFER_PATTERN_LIST_H #define _SNIFFER_PATTERN_LIST_H -#include -#include #include +#include "DisjList.h" +#include "Range.h" + class BPositionIO; namespace BPrivate { diff --git a/src/kits/storage/sniffer/RPattern.cpp b/src/kits/storage/sniffer/RPattern.cpp index 94b92b62d2..5c6c96ee0d 100644 --- a/src/kits/storage/sniffer/RPattern.cpp +++ b/src/kits/storage/sniffer/RPattern.cpp @@ -7,12 +7,13 @@ MIME sniffer rpattern implementation */ -#include -#include -#include -#include #include +#include "Err.h" +#include "Pattern.h" +#include "Range.h" +#include "RPattern.h" + using namespace BPrivate::Storage::Sniffer; RPattern::RPattern(Range range, Pattern *pattern) diff --git a/headers/private/storage/sniffer/RPattern.h b/src/kits/storage/sniffer/RPattern.h similarity index 97% rename from headers/private/storage/sniffer/RPattern.h rename to src/kits/storage/sniffer/RPattern.h index aa4a2b2e2d..56aa4df7ed 100644 --- a/headers/private/storage/sniffer/RPattern.h +++ b/src/kits/storage/sniffer/RPattern.h @@ -9,7 +9,7 @@ #ifndef _SNIFFER_R_PATTERN_H #define _SNIFFER_R_PATTERN_H -#include +#include "Range.h" class BPositionIO; diff --git a/src/kits/storage/sniffer/RPatternList.cpp b/src/kits/storage/sniffer/RPatternList.cpp index 5c57d05214..a209a90600 100644 --- a/src/kits/storage/sniffer/RPatternList.cpp +++ b/src/kits/storage/sniffer/RPatternList.cpp @@ -7,12 +7,13 @@ MIME sniffer rpattern list implementation */ -#include -#include -#include #include #include +#include "Err.h" +#include "RPattern.h" +#include "RPatternList.h" + using namespace BPrivate::Storage::Sniffer; RPatternList::RPatternList() diff --git a/headers/private/storage/sniffer/RPatternList.h b/src/kits/storage/sniffer/RPatternList.h similarity index 97% rename from headers/private/storage/sniffer/RPatternList.h rename to src/kits/storage/sniffer/RPatternList.h index aa53ec56cf..2db36657a0 100644 --- a/headers/private/storage/sniffer/RPatternList.h +++ b/src/kits/storage/sniffer/RPatternList.h @@ -9,9 +9,10 @@ #ifndef _SNIFFER_R_PATTERN_LIST_H #define _SNIFFER_R_PATTERN_LIST_H -#include #include +#include "DisjList.h" + class BPositionIO; namespace BPrivate { diff --git a/src/kits/storage/sniffer/Range.cpp b/src/kits/storage/sniffer/Range.cpp index d078305534..7a032600c4 100644 --- a/src/kits/storage/sniffer/Range.cpp +++ b/src/kits/storage/sniffer/Range.cpp @@ -7,11 +7,12 @@ MIME sniffer range implementation */ -#include -#include -#include #include +#include "Err.h" +#include "Range.h" +#include "Parser.h" + using namespace BPrivate::Storage::Sniffer; Range::Range(int32 start, int32 end) diff --git a/headers/private/storage/sniffer/Range.h b/src/kits/storage/sniffer/Range.h similarity index 100% rename from headers/private/storage/sniffer/Range.h rename to src/kits/storage/sniffer/Range.h diff --git a/src/kits/storage/sniffer/Rule.cpp b/src/kits/storage/sniffer/Rule.cpp index 76fb1a7019..87182a79a2 100644 --- a/src/kits/storage/sniffer/Rule.cpp +++ b/src/kits/storage/sniffer/Rule.cpp @@ -7,12 +7,13 @@ MIME sniffer rule implementation */ -#include -#include -#include #include #include +#include "Err.h" +#include "DisjList.h" +#include "Rule.h" + using namespace BPrivate::Storage::Sniffer; /*! \brief Creates an unitialized Sniffer::Rule object. To initialize it, you diff --git a/headers/private/storage/sniffer/Rule.h b/src/kits/storage/sniffer/Rule.h similarity index 100% rename from headers/private/storage/sniffer/Rule.h rename to src/kits/storage/sniffer/Rule.h diff --git a/src/servers/registrar/RosterSettingsCharStream.cpp b/src/servers/registrar/RosterSettingsCharStream.cpp index 497e13c591..ed84680a32 100644 --- a/src/servers/registrar/RosterSettingsCharStream.cpp +++ b/src/servers/registrar/RosterSettingsCharStream.cpp @@ -9,7 +9,6 @@ #include "RosterSettingsCharStream.h" -#include #include #include diff --git a/src/tests/kits/storage/Jamfile b/src/tests/kits/storage/Jamfile index 6f3ee95c64..1908eecf0b 100644 --- a/src/tests/kits/storage/Jamfile +++ b/src/tests/kits/storage/Jamfile @@ -3,6 +3,7 @@ SubDir HAIKU_TOP src tests kits storage ; AddSubDirSupportedPlatforms libbe_test ; UsePrivateHeaders storage ; +SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src kits storage ] ; UnitTestLib libstoragetest.so : StorageKitTestAddon.cpp diff --git a/src/tests/kits/storage/MimeSnifferTest.cpp b/src/tests/kits/storage/MimeSnifferTest.cpp index 68ee26f1b0..290374ec67 100644 --- a/src/tests/kits/storage/MimeSnifferTest.cpp +++ b/src/tests/kits/storage/MimeSnifferTest.cpp @@ -5,16 +5,17 @@ #include #include #include -#include -#include #include #include #include // BString #include #include - #include + +#include "sniffer/Rule.h" +#include "sniffer/Parser.h" + using std::cout; using std::endl;