RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 06:27:45 +00:00
Code Issues Activity Actions

LibEDID: Exclude display_product_{name, serial_number} from the Kernel

Browse source 
These APIs return Strings, which are OOM-infallibe, and as such, not
appropriate for Kernel use. Since these APIs are only used by userland
at the moment, we can just ifdef them out of the Kernel.
This commit is contained in:
Idan Horowitz 2022-02-15 23:07:48 +02:00 • committed by Andreas Kling
parent 13f5d1c037
commit 7923b3b884
2 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Userland/Libraries/LibEDID/EDID.cpp
View file

@ -1145,6 +1145,7 @@ ErrorOr<IterationDecision> Parser::for_each_display_descriptor(Function<Iteratio
return result; return result;
} }
#ifndef KERNEL
String Parser::display_product_name() const String Parser::display_product_name() const
{ {
String product_name; String product_name;
@ -1190,6 +1191,7 @@ String Parser::display_product_serial_number() const
} }
return product_name; return product_name;
} }
#endif
auto Parser::supported_resolutions() const -> ErrorOr<Vector<SupportedResolution>> auto Parser::supported_resolutions() const -> ErrorOr<Vector<SupportedResolution>>
{ {

2
Userland/Libraries/LibEDID/EDID.h
View file

@ -364,8 +364,10 @@ public:
ErrorOr<IterationDecision> for_each_detailed_timing(Function<IterationDecision(DetailedTiming const&, unsigned)>) const; ErrorOr<IterationDecision> for_each_detailed_timing(Function<IterationDecision(DetailedTiming const&, unsigned)>) const;
Optional<DetailedTiming> detailed_timing(size_t) const; Optional<DetailedTiming> detailed_timing(size_t) const;
#ifndef KERNEL
String display_product_name() const; String display_product_name() const;
String display_product_serial_number() const; String display_product_serial_number() const;
#endif
ErrorOr<IterationDecision> for_each_short_video_descriptor(Function<IterationDecision(unsigned, bool, VIC::Details const&)>) const; ErrorOr<IterationDecision> for_each_short_video_descriptor(Function<IterationDecision(unsigned, bool, VIC::Details const&)>) const;