Merge "modify a minor error in mount_with_alternatives Test: when called with end_idx = null" am: 3080ce2fe4 am: d3435f5d31 am: 4d592aba52

am: 7bda65010f

Change-Id: I67f296774e14e1e08a3cfbf3370112dc0f957b0c
This commit is contained in:
forfun 2016-12-20 02:25:07 +00:00 committed by android-build-merger
commit 94c0d782d8

View file

@ -464,7 +464,7 @@ static int mount_with_alternatives(struct fstab *fstab, int start_idx, int *end_
if (!end_idx || !attempted_idx || start_idx >= fstab->num_entries) {
errno = EINVAL;
if (end_idx) *end_idx = start_idx;
if (attempted_idx) *end_idx = start_idx;
if (attempted_idx) *attempted_idx = start_idx;
return -1;
}