RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-08-02 03:57:45 +00:00
Code Issues Activity Actions

Userland: Remove unecessary uses of __serenity__ macro

Browse source
This commit is contained in:
Andrew Kaster 2022-10-09 15:38:06 -06:00 • committed by Linus Groh
parent 828441852f
commit 539fb08551
10 changed files with 4 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Userland/Utilities/adjtime.cpp
View file

@ -13,9 +13,7 @@
ErrorOr<int> serenity_main(Main::Arguments arguments)
{
#ifdef __serenity__
TRY(Core::System::pledge("stdio settime"));
#endif
Core::ArgsParser args_parser;
Optional<double> delta;
@ -34,9 +32,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
TRY(Core::System::adjtime(&delta_timeval, nullptr));
}
#ifdef __serenity__
TRY(Core::System::pledge("stdio"));
#endif
timeval remaining_delta_timeval;
TRY(Core::System::adjtime(nullptr, &remaining_delta_timeval));

4
Userland/Utilities/gml-format.cpp
View file

@ -48,9 +48,7 @@ ErrorOr<bool> format_file(StringView path, bool inplace)
ErrorOr<int> serenity_main(Main::Arguments args)
{
#ifdef __serenity__
TRY(Core::System::pledge("stdio rpath wpath cpath"));
#endif
bool inplace = false;
Vector<String> files;
@ -61,10 +59,8 @@ ErrorOr<int> serenity_main(Main::Arguments args)
args_parser.add_positional_argument(files, "File(s) to process", "path", Core::ArgsParser::Required::No);
args_parser.parse(args);
#ifdef __serenity__
if (!inplace)
TRY(Core::System::pledge("stdio rpath"));
#endif
if (files.is_empty())
files.append("-");

2
Userland/Utilities/js.cpp
View file

@ -1505,9 +1505,7 @@ private:
ErrorOr<int> serenity_main(Main::Arguments arguments)
{
#ifdef __serenity__
TRY(Core::System::pledge("stdio rpath wpath cpath tty sigaction"));
#endif
bool gc_on_every_allocation = false;
bool disable_syntax_highlight = false;

14
Userland/Utilities/ntpquery.cpp
View file

@ -90,15 +90,9 @@ static String format_ntp_timestamp(NtpTimestamp ntp_timestamp)
buffer[written] = '\0';
return buffer;
}
#ifdef __serenity__
ErrorOr<int> serenity_main(Main::Arguments arguments)
#else
int main(int argc, char** argv)
#endif
{
#ifdef __serenity__
TRY(Core::System::pledge("stdio inet unix settime"));
#endif
bool adjust_time = false;
bool set_time = false;
@ -119,22 +113,16 @@ int main(int argc, char** argv)
args_parser.add_option(set_time, "Immediately set system time (requires root)", "set", 's');
args_parser.add_option(verbose, "Verbose output", "verbose", 'v');
args_parser.add_positional_argument(host, "NTP server", "host", Core::ArgsParser::Required::No);
#ifdef __serenity__
args_parser.parse(arguments);
#else
args_parser.parse(argc, argv);
#endif
if (adjust_time && set_time) {
warnln("-a and -s are mutually exclusive");
return 1;
}
#ifdef __serenity__
if (!adjust_time && !set_time) {
TRY(Core::System::pledge("stdio inet unix"));
}
#endif
auto* hostent = gethostbyname(host);
if (!hostent) {
@ -142,10 +130,8 @@ int main(int argc, char** argv)
return 1;
}
#ifdef __serenity__
TRY(Core::System::pledge((adjust_time || set_time) ? "stdio inet settime"sv : "stdio inet"sv));
TRY(Core::System::unveil(nullptr, nullptr));
#endif
int fd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
if (fd < 0) {