diff options
| author | Elliott Hughes <enh@google.com> | 2012-09-26 15:03:19 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-09-26 15:03:19 -0700 |
| commit | 07266528740d860ed42ea881214e44cd0411bd6a (patch) | |
| tree | dbd689764b7f77a500368f6c36f32e3c104eba5c /fs_mgr | |
| parent | cbc2136c28191b943d5ad8a272d6ba39c078946f (diff) | |
| parent | cfd7c2a05166a3ff27b2145b007834408d95a2e0 (diff) | |
| download | system_core-07266528740d860ed42ea881214e44cd0411bd6a.zip system_core-07266528740d860ed42ea881214e44cd0411bd6a.tar.gz system_core-07266528740d860ed42ea881214e44cd0411bd6a.tar.bz2 | |
am cfd7c2a0: am 1c0c5250: Merge "Rename getline to fs_getline for fs_mgr"
* commit 'cfd7c2a05166a3ff27b2145b007834408d95a2e0':
Rename getline to fs_getline for fs_mgr
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 538b5be..2bcc9c4 100644 --- a/fs_mgr/fs_mgr.c +++ b/fs_mgr/fs_mgr.c @@ -173,7 +173,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; @@ -247,7 +247,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') { @@ -274,7 +274,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') { |