Merge lp:~colin-king/ecryptfs/minor-bugfixes into lp:ecryptfs

[Colin Ian King]

Just a couple of minor fixes found with the latest new version of CoverityScan

[Tyler Hicks (tyhicks)]

Looks good to me.

review: Approve

=== modified file 'src/utils/mount.ecryptfs.c'
--- src/utils/mount.ecryptfs.c	2014-02-28 14:32:05 +0000
+++ src/utils/mount.ecryptfs.c	2014-07-25 09:17:22 +0000
@@ -311,10 +311,10 @@
 				}
 			}
 		} else {
+			rc = ECANCELED;
 			if (strcmp(yesno,"no"))
 				rc = -EINVAL;
 			printf("Aborting mount.\n");
-			rc = ECANCELED;
 			goto out;
 		}
 	}
 
=== modified file 'tests/kernel/lp-509180/test.c'
--- tests/kernel/lp-509180/test.c	2014-07-10 21:53:29 +0000
+++ tests/kernel/lp-509180/test.c	2014-07-25 09:17:22 +0000
@@ -80,7 +80,7 @@
 {
 	const char *name = "user.ecryptfs";
 	unsigned char *value = NULL;
-	size_t nread, size = 0;
+	ssize_t nread, size = 0;
 	int rc = TEST_ERROR;
 
 	size = fgetxattr(fd, name, value, size);