mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 15:07:45 +00:00
LibCore: Replace Result<T, E> use with ErrorOr<T> in Core::Account
This commit is contained in:
parent
01a6a4f7c4
commit
4eeab4cfc8
2 changed files with 10 additions and 13 deletions
|
@ -55,7 +55,7 @@ static Vector<gid_t> get_extra_gids(const passwd& pwd)
|
|||
return extra_gids;
|
||||
}
|
||||
|
||||
Result<Account, String> Account::from_passwd(const passwd& pwd, const spwd& spwd)
|
||||
ErrorOr<Account> Account::from_passwd(const passwd& pwd, const spwd& spwd)
|
||||
{
|
||||
Account account(pwd, spwd, get_extra_gids(pwd));
|
||||
endpwent();
|
||||
|
@ -107,15 +107,14 @@ Account Account::self(Read options)
|
|||
return Account(*pwd, *spwd, extra_gids);
|
||||
}
|
||||
|
||||
Result<Account, String> Account::from_name(const char* username, Read options)
|
||||
ErrorOr<Account> Account::from_name(const char* username, Read options)
|
||||
{
|
||||
errno = 0;
|
||||
auto* pwd = getpwnam(username);
|
||||
if (!pwd) {
|
||||
if (errno == 0)
|
||||
return String("No such user");
|
||||
|
||||
return String(strerror(errno));
|
||||
return Error::from_string_literal("No such user"sv);
|
||||
return Error::from_errno(errno);
|
||||
}
|
||||
spwd spwd_dummy = {};
|
||||
spwd_dummy.sp_namp = const_cast<char*>(username);
|
||||
|
@ -133,15 +132,14 @@ Result<Account, String> Account::from_name(const char* username, Read options)
|
|||
return from_passwd(*pwd, *spwd);
|
||||
}
|
||||
|
||||
Result<Account, String> Account::from_uid(uid_t uid, Read options)
|
||||
ErrorOr<Account> Account::from_uid(uid_t uid, Read options)
|
||||
{
|
||||
errno = 0;
|
||||
auto* pwd = getpwuid(uid);
|
||||
if (!pwd) {
|
||||
if (errno == 0)
|
||||
return String("No such user");
|
||||
|
||||
return String(strerror(errno));
|
||||
return Error::from_string_literal("No such user"sv);
|
||||
return Error::from_errno(errno);
|
||||
}
|
||||
spwd spwd_dummy = {};
|
||||
spwd_dummy.sp_namp = pwd->pw_name;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue