mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2025-06-11 18:20:43 +09:00
Everywhere: Add sv suffix to strings relying on StringView(char const*)
Each of these strings would previously rely on StringView's char const* constructor overload, which would call __builtin_strlen on the string. Since we now have operator ""sv, we can replace these with much simpler versions. This opens the door to being able to remove StringView(char const*). No functional changes.
This commit is contained in:
parent
e5f09ea170
commit
3f3f45580a
Notes:
sideshowbarker
2024-07-17 09:27:05 +09:00
Author: https://github.com/sin-ack
Commit: 3f3f45580a
Pull-request: https://github.com/SerenityOS/serenity/pull/14555
Reviewed-by: https://github.com/Dexesttp ✅
Reviewed-by: https://github.com/kleinesfilmroellchen
762 changed files with 8315 additions and 8316 deletions
|
@ -44,7 +44,7 @@ static int memfd_create(char const* name, unsigned int flags)
|
|||
|
||||
#define HANDLE_SYSCALL_RETURN_VALUE(syscall_name, rc, success_value) \
|
||||
if ((rc) < 0) { \
|
||||
return Error::from_syscall(syscall_name, rc); \
|
||||
return Error::from_syscall(syscall_name##sv, rc); \
|
||||
} \
|
||||
return success_value;
|
||||
|
||||
|
@ -75,7 +75,7 @@ ErrorOr<void> pledge(StringView promises, StringView execpromises)
|
|||
{ execpromises.characters_without_null_termination(), execpromises.length() },
|
||||
};
|
||||
int rc = syscall(SC_pledge, ¶ms);
|
||||
HANDLE_SYSCALL_RETURN_VALUE("pledge"sv, rc, {});
|
||||
HANDLE_SYSCALL_RETURN_VALUE("pledge", rc, {});
|
||||
}
|
||||
|
||||
ErrorOr<void> unveil(StringView path, StringView permissions)
|
||||
|
@ -85,7 +85,7 @@ ErrorOr<void> unveil(StringView path, StringView permissions)
|
|||
{ permissions.characters_without_null_termination(), permissions.length() },
|
||||
};
|
||||
int rc = syscall(SC_unveil, ¶ms);
|
||||
HANDLE_SYSCALL_RETURN_VALUE("unveil"sv, rc, {});
|
||||
HANDLE_SYSCALL_RETURN_VALUE("unveil", rc, {});
|
||||
}
|
||||
|
||||
ErrorOr<void> sendfd(int sockfd, int fd)
|
||||
|
@ -342,7 +342,7 @@ ErrorOr<int> openat(int fd, StringView path, int options, mode_t mode)
|
|||
#ifdef __serenity__
|
||||
Syscall::SC_open_params params { fd, { path.characters_without_null_termination(), path.length() }, options, mode };
|
||||
int rc = syscall(SC_open, ¶ms);
|
||||
HANDLE_SYSCALL_RETURN_VALUE("open"sv, rc, rc);
|
||||
HANDLE_SYSCALL_RETURN_VALUE("open", rc, rc);
|
||||
#else
|
||||
// NOTE: We have to ensure that the path is null-terminated.
|
||||
String path_string = path;
|
||||
|
@ -376,7 +376,7 @@ ErrorOr<struct stat> stat(StringView path)
|
|||
#ifdef __serenity__
|
||||
Syscall::SC_stat_params params { { path.characters_without_null_termination(), path.length() }, &st, AT_FDCWD, true };
|
||||
int rc = syscall(SC_stat, ¶ms);
|
||||
HANDLE_SYSCALL_RETURN_VALUE("stat"sv, rc, st);
|
||||
HANDLE_SYSCALL_RETURN_VALUE("stat", rc, st);
|
||||
#else
|
||||
String path_string = path;
|
||||
if (::stat(path_string.characters(), &st) < 0)
|
||||
|
@ -394,7 +394,7 @@ ErrorOr<struct stat> lstat(StringView path)
|
|||
#ifdef __serenity__
|
||||
Syscall::SC_stat_params params { { path.characters_without_null_termination(), path.length() }, &st, AT_FDCWD, false };
|
||||
int rc = syscall(SC_stat, ¶ms);
|
||||
HANDLE_SYSCALL_RETURN_VALUE("lstat"sv, rc, st);
|
||||
HANDLE_SYSCALL_RETURN_VALUE("lstat", rc, st);
|
||||
#else
|
||||
String path_string = path;
|
||||
if (::stat(path_string.characters(), &st) < 0)
|
||||
|
@ -532,7 +532,7 @@ ErrorOr<void> chmod(StringView pathname, mode_t mode)
|
|||
true
|
||||
};
|
||||
int rc = syscall(SC_chmod, ¶ms);
|
||||
HANDLE_SYSCALL_RETURN_VALUE("chmod"sv, rc, {});
|
||||
HANDLE_SYSCALL_RETURN_VALUE("chmod", rc, {});
|
||||
#else
|
||||
String path = pathname;
|
||||
if (::chmod(path.characters(), mode) < 0)
|
||||
|
@ -563,7 +563,7 @@ ErrorOr<void> lchown(StringView pathname, uid_t uid, gid_t gid)
|
|||
#ifdef __serenity__
|
||||
Syscall::SC_chown_params params = { { pathname.characters_without_null_termination(), pathname.length() }, uid, gid, AT_FDCWD, false };
|
||||
int rc = syscall(SC_chown, ¶ms);
|
||||
HANDLE_SYSCALL_RETURN_VALUE("chown"sv, rc, {});
|
||||
HANDLE_SYSCALL_RETURN_VALUE("chown", rc, {});
|
||||
#else
|
||||
String path = pathname;
|
||||
if (::chown(path.characters(), uid, gid) < 0)
|
||||
|
@ -580,7 +580,7 @@ ErrorOr<void> chown(StringView pathname, uid_t uid, gid_t gid)
|
|||
#ifdef __serenity__
|
||||
Syscall::SC_chown_params params = { { pathname.characters_without_null_termination(), pathname.length() }, uid, gid, AT_FDCWD, true };
|
||||
int rc = syscall(SC_chown, ¶ms);
|
||||
HANDLE_SYSCALL_RETURN_VALUE("chown"sv, rc, {});
|
||||
HANDLE_SYSCALL_RETURN_VALUE("chown", rc, {});
|
||||
#else
|
||||
String path = pathname;
|
||||
if (::lchown(path.characters(), uid, gid) < 0)
|
||||
|
@ -653,7 +653,7 @@ ErrorOr<void> clock_settime(clockid_t clock_id, struct timespec* ts)
|
|||
{
|
||||
#ifdef __serenity__
|
||||
int rc = syscall(SC_clock_settime, clock_id, ts);
|
||||
HANDLE_SYSCALL_RETURN_VALUE("clocksettime"sv, rc, {});
|
||||
HANDLE_SYSCALL_RETURN_VALUE("clocksettime", rc, {});
|
||||
#else
|
||||
if (::clock_settime(clock_id, ts) < 0)
|
||||
return Error::from_syscall("clocksettime"sv, -errno);
|
||||
|
@ -683,7 +683,7 @@ ErrorOr<off_t> lseek(int fd, off_t offset, int whence)
|
|||
{
|
||||
off_t rc = ::lseek(fd, offset, whence);
|
||||
if (rc < 0)
|
||||
return Error::from_syscall("lseek", -errno);
|
||||
return Error::from_syscall("lseek"sv, -errno);
|
||||
return rc;
|
||||
}
|
||||
|
||||
|
@ -693,7 +693,7 @@ ErrorOr<void> endgrent()
|
|||
swap(old_errno, errno);
|
||||
::endgrent();
|
||||
if (errno != 0)
|
||||
return Error::from_syscall("endgrent", -errno);
|
||||
return Error::from_syscall("endgrent"sv, -errno);
|
||||
errno = old_errno;
|
||||
return {};
|
||||
}
|
||||
|
@ -777,7 +777,7 @@ ErrorOr<void> symlink(StringView target, StringView link_path)
|
|||
.linkpath = { link_path.characters_without_null_termination(), link_path.length() },
|
||||
};
|
||||
int rc = syscall(SC_symlink, ¶ms);
|
||||
HANDLE_SYSCALL_RETURN_VALUE("symlink"sv, rc, {});
|
||||
HANDLE_SYSCALL_RETURN_VALUE("symlink", rc, {});
|
||||
#else
|
||||
String target_string = target;
|
||||
String link_path_string = link_path;
|
||||
|
@ -793,7 +793,7 @@ ErrorOr<void> mkdir(StringView path, mode_t mode)
|
|||
return Error::from_errno(EFAULT);
|
||||
#ifdef __serenity__
|
||||
int rc = syscall(SC_mkdir, path.characters_without_null_termination(), path.length(), mode);
|
||||
HANDLE_SYSCALL_RETURN_VALUE("mkdir"sv, rc, {});
|
||||
HANDLE_SYSCALL_RETURN_VALUE("mkdir", rc, {});
|
||||
#else
|
||||
String path_string = path;
|
||||
if (::mkdir(path_string.characters(), mode) < 0)
|
||||
|
@ -808,7 +808,7 @@ ErrorOr<void> chdir(StringView path)
|
|||
return Error::from_errno(EFAULT);
|
||||
#ifdef __serenity__
|
||||
int rc = syscall(SC_chdir, path.characters_without_null_termination(), path.length());
|
||||
HANDLE_SYSCALL_RETURN_VALUE("chdir"sv, rc, {});
|
||||
HANDLE_SYSCALL_RETURN_VALUE("chdir", rc, {});
|
||||
#else
|
||||
String path_string = path;
|
||||
if (::chdir(path_string.characters()) < 0)
|
||||
|
@ -823,7 +823,7 @@ ErrorOr<void> rmdir(StringView path)
|
|||
return Error::from_errno(EFAULT);
|
||||
#ifdef __serenity__
|
||||
int rc = syscall(SC_rmdir, path.characters_without_null_termination(), path.length());
|
||||
HANDLE_SYSCALL_RETURN_VALUE("rmdir"sv, rc, {});
|
||||
HANDLE_SYSCALL_RETURN_VALUE("rmdir", rc, {});
|
||||
#else
|
||||
String path_string = path;
|
||||
if (::rmdir(path_string.characters()) < 0)
|
||||
|
@ -859,7 +859,7 @@ ErrorOr<void> rename(StringView old_path, StringView new_path)
|
|||
.new_path = { new_path.characters_without_null_termination(), new_path.length() },
|
||||
};
|
||||
int rc = syscall(SC_rename, ¶ms);
|
||||
HANDLE_SYSCALL_RETURN_VALUE("rename"sv, rc, {});
|
||||
HANDLE_SYSCALL_RETURN_VALUE("rename", rc, {});
|
||||
#else
|
||||
String old_path_string = old_path;
|
||||
String new_path_string = new_path;
|
||||
|
@ -876,7 +876,7 @@ ErrorOr<void> unlink(StringView path)
|
|||
|
||||
#ifdef __serenity__
|
||||
int rc = syscall(SC_unlink, AT_FDCWD, path.characters_without_null_termination(), path.length(), 0);
|
||||
HANDLE_SYSCALL_RETURN_VALUE("unlink"sv, rc, {});
|
||||
HANDLE_SYSCALL_RETURN_VALUE("unlink", rc, {});
|
||||
#else
|
||||
String path_string = path;
|
||||
if (::unlink(path_string.characters()) < 0)
|
||||
|
@ -895,7 +895,7 @@ ErrorOr<void> utime(StringView path, Optional<struct utimbuf> maybe_buf)
|
|||
buf = &maybe_buf.value();
|
||||
#ifdef __serenity__
|
||||
int rc = syscall(SC_utime, path.characters_without_null_termination(), path.length(), buf);
|
||||
HANDLE_SYSCALL_RETURN_VALUE("utime"sv, rc, {});
|
||||
HANDLE_SYSCALL_RETURN_VALUE("utime", rc, {});
|
||||
#else
|
||||
String path_string = path;
|
||||
if (::utime(path_string.characters(), buf) < 0)
|
||||
|
@ -909,7 +909,7 @@ ErrorOr<struct utsname> uname()
|
|||
utsname uts;
|
||||
#ifdef __serenity__
|
||||
int rc = syscall(SC_uname, &uts);
|
||||
HANDLE_SYSCALL_RETURN_VALUE("uname"sv, rc, uts);
|
||||
HANDLE_SYSCALL_RETURN_VALUE("uname", rc, uts);
|
||||
#else
|
||||
if (::uname(&uts) < 0)
|
||||
return Error::from_syscall("uname"sv, -errno);
|
||||
|
@ -921,7 +921,7 @@ ErrorOr<void> adjtime(const struct timeval* delta, struct timeval* old_delta)
|
|||
{
|
||||
#ifdef __serenity__
|
||||
int rc = syscall(SC_adjtime, delta, old_delta);
|
||||
HANDLE_SYSCALL_RETURN_VALUE("adjtime"sv, rc, {});
|
||||
HANDLE_SYSCALL_RETURN_VALUE("adjtime", rc, {});
|
||||
#else
|
||||
if (::adjtime(delta, old_delta) < 0)
|
||||
return Error::from_syscall("adjtime"sv, -errno);
|
||||
|
@ -973,7 +973,7 @@ ErrorOr<void> exec(StringView filename, Span<StringView> arguments, SearchInPath
|
|||
auto const* path_ptr = getenv("PATH");
|
||||
StringView path { path_ptr, strlen(path_ptr) };
|
||||
if (path.is_empty())
|
||||
path = "/bin:/usr/bin";
|
||||
path = "/bin:/usr/bin"sv;
|
||||
auto parts = path.split_view(':');
|
||||
for (auto& part : parts) {
|
||||
auto candidate = String::formatted("{}/{}", part, filename);
|
||||
|
@ -1214,7 +1214,7 @@ ErrorOr<void> mknod(StringView pathname, mode_t mode, dev_t dev)
|
|||
#ifdef __serenity__
|
||||
Syscall::SC_mknod_params params { { pathname.characters_without_null_termination(), pathname.length() }, mode, dev };
|
||||
int rc = syscall(SC_mknod, ¶ms);
|
||||
HANDLE_SYSCALL_RETURN_VALUE("mknod"sv, rc, {});
|
||||
HANDLE_SYSCALL_RETURN_VALUE("mknod", rc, {});
|
||||
#else
|
||||
String path_string = pathname;
|
||||
if (::mknod(path_string.characters(), mode, dev) < 0)
|
||||
|
@ -1238,7 +1238,7 @@ ErrorOr<void> setenv(StringView name, StringView value, bool overwrite)
|
|||
auto const rc = ::setenv(name_string.characters(), value_string.characters(), overwrite);
|
||||
#endif
|
||||
if (rc < 0)
|
||||
return Error::from_syscall("setenv", -errno);
|
||||
return Error::from_syscall("setenv"sv, -errno);
|
||||
return {};
|
||||
}
|
||||
|
||||
|
@ -1246,7 +1246,7 @@ ErrorOr<int> posix_openpt(int flags)
|
|||
{
|
||||
int const rc = ::posix_openpt(flags);
|
||||
if (rc < 0)
|
||||
return Error::from_syscall("posix_openpt", -errno);
|
||||
return Error::from_syscall("posix_openpt"sv, -errno);
|
||||
return rc;
|
||||
}
|
||||
|
||||
|
@ -1254,7 +1254,7 @@ ErrorOr<void> grantpt(int fildes)
|
|||
{
|
||||
auto const rc = ::grantpt(fildes);
|
||||
if (rc < 0)
|
||||
return Error::from_syscall("grantpt", -errno);
|
||||
return Error::from_syscall("grantpt"sv, -errno);
|
||||
return {};
|
||||
}
|
||||
|
||||
|
@ -1262,7 +1262,7 @@ ErrorOr<void> unlockpt(int fildes)
|
|||
{
|
||||
auto const rc = ::unlockpt(fildes);
|
||||
if (rc < 0)
|
||||
return Error::from_syscall("unlockpt", -errno);
|
||||
return Error::from_syscall("unlockpt"sv, -errno);
|
||||
return {};
|
||||
}
|
||||
|
||||
|
@ -1273,7 +1273,7 @@ ErrorOr<void> access(StringView pathname, int mode)
|
|||
|
||||
#ifdef __serenity__
|
||||
int rc = ::syscall(Syscall::SC_access, pathname.characters_without_null_termination(), pathname.length(), mode);
|
||||
HANDLE_SYSCALL_RETURN_VALUE("access"sv, rc, {});
|
||||
HANDLE_SYSCALL_RETURN_VALUE("access", rc, {});
|
||||
#else
|
||||
String path_string = pathname;
|
||||
if (::access(path_string.characters(), mode) < 0)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue