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".

1 files changed, 8 insertions, 8 deletions

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)
 	}