diff options
| author | Ophestra <cat@gensokyo.uk> | 2025-10-18 17:35:20 +0900 |
|---|---|---|
| committer | Ophestra <cat@gensokyo.uk> | 2025-10-18 17:35:20 +0900 |
| commit | f6f0cb56ae64a47dcb948134e19afbd241452fd9 (patch) | |
| tree | 76514137d848cd0d1bcc49f7640a0cae72e91534 /internal/app | |
| parent | d4284c109d593fa1413a162734b3db5134c66d19 (diff) | |
internal/app/hsu: remove wrapper method
This was added to reduce the size of diffs.
Signed-off-by: Ophestra <cat@gensokyo.uk>
Diffstat (limited to 'internal/app')
| -rw-r--r-- | internal/app/hsu.go | 8 | ||||
| -rw-r--r-- | internal/app/outcome.go | 2 | ||||
| -rw-r--r-- | internal/app/shim.go | 2 |
3 files changed, 5 insertions, 7 deletions
diff --git a/internal/app/hsu.go b/internal/app/hsu.go index 9f0408ac..e53d9f3d 100644 --- a/internal/app/hsu.go +++ b/internal/app/hsu.go @@ -35,7 +35,8 @@ func (h *Hsu) ensureDispatcher() { }) } -// ID returns the current user hsurc identifier. ErrHsuAccess is returned if the current user is not in hsurc. +// ID returns the current user hsurc identifier. +// [ErrHsuAccess] is returned if the current user is not in hsurc. func (h *Hsu) ID() (int, error) { h.ensureDispatcher() h.idOnce.Do(func() { @@ -71,10 +72,7 @@ func (h *Hsu) ID() (int, error) { } // MustID calls [Hsu.ID] and terminates on error. -func (h *Hsu) MustID() int { return h.MustIDMsg(nil) } - -// MustIDMsg implements MustID with a custom [container.Msg]. -func (h *Hsu) MustIDMsg(msg message.Msg) int { +func (h *Hsu) MustID(msg message.Msg) int { id, err := h.ID() if err == nil { return id diff --git a/internal/app/outcome.go b/internal/app/outcome.go index d9aad2a3..2f13c4f3 100644 --- a/internal/app/outcome.go +++ b/internal/app/outcome.go @@ -82,7 +82,7 @@ func newOutcomeState(k syscallDispatcher, msg message.Msg, id *state.ID, config Shim: &shimParams{PrivPID: k.getpid(), Verbose: msg.IsVerbose()}, ID: id, Identity: config.Identity, - UserID: hsu.MustIDMsg(msg), + UserID: hsu.MustID(msg), EnvPaths: copyPaths(k), Container: config.Container, } diff --git a/internal/app/shim.go b/internal/app/shim.go index 69028165..6be45746 100644 --- a/internal/app/shim.go +++ b/internal/app/shim.go @@ -36,7 +36,7 @@ type shimParams struct { // Limits are enforced on the priv side. WaitDelay time.Duration - // Verbosity pass through from [container.Msg]. + // Verbosity pass through from [message.Msg]. Verbose bool // Outcome setup ops, contains setup state. Populated by outcome.finalise. |