From b8934dd456998732e3c570f4402fe09e59252701 Mon Sep 17 00:00:00 2001 From: Dees_Troy Date: Wed, 7 Aug 2013 16:52:09 +0000 Subject: Fix conflict with getline in 4.3 tree Change-Id: I5accf8731829229d153a657c9290a7be83f87a03 --- crypto/fs_mgr/fs_mgr.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'crypto') diff --git a/crypto/fs_mgr/fs_mgr.c b/crypto/fs_mgr/fs_mgr.c index bebb25261..02f3ac57b 100644 --- a/crypto/fs_mgr/fs_mgr.c +++ b/crypto/fs_mgr/fs_mgr.c @@ -167,7 +167,7 @@ out: * then return an empty buffer. This effectively ignores lines that are too long. * On EOF, return null. */ -static char *getline(char *buf, int size, FILE *file) +static char *fs_mgr_getline(char *buf, int size, FILE *file) { int cnt = 0; int eof = 0; @@ -241,7 +241,7 @@ static struct fstab_rec *read_fstab(char *fstab_path) } entries = 0; - while (getline(line, sizeof(line), fstab_file)) { + while (fs_mgr_getline(line, sizeof(line), fstab_file)) { /* if the last character is a newline, shorten the string by 1 byte */ len = strlen(line); if (line[len - 1] == '\n') { @@ -268,7 +268,7 @@ static struct fstab_rec *read_fstab(char *fstab_path) fseek(fstab_file, 0, SEEK_SET); cnt = 0; - while (getline(line, sizeof(line), fstab_file)) { + while (fs_mgr_getline(line, sizeof(line), fstab_file)) { /* if the last character is a newline, shorten the string by 1 byte */ len = strlen(line); if (line[len - 1] == '\n') { -- cgit v1.2.3