ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Rename getline to fs_getline for fs_mgr"

Browse source
This commit is contained in:
Elliott Hughes 2012-09-26 13:57:54 -07:00 • committed by Gerrit Code Review
commit 1c0c52503d
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
fs_mgr/fs_mgr.c
View file

@ -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') {