eCryptfs

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

  1. minor-bugfixes
  2. Merge into trunk
Proposed by Colin Ian King
Status: Merged
Approved by: Tyler Hicks
Approved revision: 834
Merged at revision: 833
Proposed branch: lp:~colin-king/ecryptfs/minor-bugfixes
Merge into: lp:ecryptfs
Diff against target: 28 lines (+2/-2)
2 files modified
src/utils/mount.ecryptfs.c (+1/-1)
tests/kernel/lp-509180/test.c (+1/-1)
To merge this branch: bzr merge lp:~colin-king/ecryptfs/minor-bugfixes
Reviewer Review Type Date Requested Status
Tyler Hicks Approve
Review via email: mp+228258@code.launchpad.net

Description of the change

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

To post a comment you must log in.
Revision history for this message
Tyler Hicks (tyhicks) wrote :

Looks good to me.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/utils/mount.ecryptfs.c'
2--- src/utils/mount.ecryptfs.c 2014-02-28 14:32:05 +0000
3+++ src/utils/mount.ecryptfs.c 2014-07-25 09:17:22 +0000
4@@ -311,10 +311,10 @@
5 }
6 }
7 } else {
8+ rc = ECANCELED;
9 if (strcmp(yesno,"no"))
10 rc = -EINVAL;
11 printf("Aborting mount.\n");
12- rc = ECANCELED;
13 goto out;
14 }
15 }
16
17=== modified file 'tests/kernel/lp-509180/test.c'
18--- tests/kernel/lp-509180/test.c 2014-07-10 21:53:29 +0000
19+++ tests/kernel/lp-509180/test.c 2014-07-25 09:17:22 +0000
20@@ -80,7 +80,7 @@
21 {
22 const char *name = "user.ecryptfs";
23 unsigned char *value = NULL;
24- size_t nread, size = 0;
25+ ssize_t nread, size = 0;
26 int rc = TEST_ERROR;
27
28 size = fgetxattr(fd, name, value, size);

Subscribers

People subscribed via source and target branches