diff options
author | Irina Tirdea <irina.tirdea@intel.com> | 2012-08-27 19:10:57 +0300 |
---|---|---|
committer | Irina Tirdea <irina.tirdea@intel.com> | 2012-09-12 19:48:51 +0300 |
commit | 295b82bd691d413c07665c7e7607fe0e5d3485f5 (patch) | |
tree | 8da152b68e33ee98c8e65d090a3d670102140f85 /fs_mgr | |
parent | 922b460cc790722ffc303b200f02958e4066a2de (diff) | |
download | system_core-295b82bd691d413c07665c7e7607fe0e5d3485f5.zip system_core-295b82bd691d413c07665c7e7607fe0e5d3485f5.tar.gz system_core-295b82bd691d413c07665c7e7607fe0e5d3485f5.tar.bz2 |
Rename getline to fs_getline for fs_mgr
fs_mgr defines its own version of getline and uses it
internally. This leads to a build error if getline is
also defined in bionic, since fs_mgr will see readline
as defined internally.
Rename getline in fs_mgr to a local name (fs_getline)
so that there will no longer be any conflicts.
This is needed it we want to add getline in bionic.
Change-Id: I3a32be71a645e122629802d98ff8f9ab9c419e86
Signed-off-by: Irina Tirdea <irina.tirdea@intel.com>
Diffstat (limited to 'fs_mgr')
-rw-r--r-- | fs_mgr/fs_mgr.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs_mgr/fs_mgr.c b/fs_mgr/fs_mgr.c index 0361ab8..e117a0b 100644 --- a/fs_mgr/fs_mgr.c +++ b/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_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_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_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') { |