From 03d3a29b70c85f083adf3c12cba60c0374f06d3e Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Wed, 27 Nov 2019 11:40:47 -0800 Subject: Rename some variables from 'target' to 'targetUser' Refer to the target User as 'targetUser' rather than simply 'target'. This will help avoid confusion when we add support for the filesystem keyring, since then the Mount will also be a "target". --- cmd/fscrypt/commands.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'cmd/fscrypt/commands.go') diff --git a/cmd/fscrypt/commands.go b/cmd/fscrypt/commands.go index d71b427..a3bfef2 100644 --- a/cmd/fscrypt/commands.go +++ b/cmd/fscrypt/commands.go @@ -138,11 +138,11 @@ func encryptAction(c *cli.Context) error { // keyring unless --skip-unlock is used. On failure, an error is returned, any // metadata creation is reverted, and the directory is unmodified. func encryptPath(path string) (err error) { - target, err := parseUserFlag(!skipUnlockFlag.Value) + targetUser, err := parseUserFlag(!skipUnlockFlag.Value) if err != nil { return } - ctx, err := actions.NewContextFromPath(path, target) + ctx, err := actions.NewContextFromPath(path, targetUser) if err != nil { return } @@ -293,12 +293,12 @@ func unlockAction(c *cli.Context) error { return expectedArgsErr(c, 1, false) } - target, err := parseUserFlag(true) + targetUser, err := parseUserFlag(true) if err != nil { return newExitError(c, err) } path := c.Args().Get(0) - ctx, err := actions.NewContextFromPath(path, target) + ctx, err := actions.NewContextFromPath(path, targetUser) if err != nil { return newExitError(c, err) } @@ -377,12 +377,12 @@ func purgeAction(c *cli.Context) error { } } - target, err := parseUserFlag(true) + targetUser, err := parseUserFlag(true) if err != nil { return newExitError(c, err) } mountpoint := c.Args().Get(0) - ctx, err := actions.NewContextFromMountpoint(mountpoint, target) + ctx, err := actions.NewContextFromMountpoint(mountpoint, targetUser) if err != nil { return newExitError(c, err) } @@ -527,12 +527,12 @@ func createProtectorAction(c *cli.Context) error { return expectedArgsErr(c, 1, false) } - target, err := parseUserFlag(false) + targetUser, err := parseUserFlag(false) if err != nil { return newExitError(c, err) } mountpoint := c.Args().Get(0) - ctx, err := actions.NewContextFromMountpoint(mountpoint, target) + ctx, err := actions.NewContextFromMountpoint(mountpoint, targetUser) if err != nil { return newExitError(c, err) } -- cgit v1.3