diff options
| author | Elliott Hughes <enh@google.com> | 2012-09-26 15:01:25 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-09-26 15:01:25 -0700 |
| commit | cfd7c2a05166a3ff27b2145b007834408d95a2e0 (patch) | |
| tree | 99e782b983e10dd5e3c523ef1632beb0a4a934aa /fs_mgr | |
| parent | e2a3fe235e6577b5956e86af3fc8b31845ef54ac (diff) | |
| parent | 1c0c52503dcedff1a75775bf8bfffe7ec77b722b (diff) | |
| download | system_core-cfd7c2a05166a3ff27b2145b007834408d95a2e0.zip system_core-cfd7c2a05166a3ff27b2145b007834408d95a2e0.tar.gz system_core-cfd7c2a05166a3ff27b2145b007834408d95a2e0.tar.bz2 | |
am 1c0c5250: Merge "Rename getline to fs_getline for fs_mgr"
* commit '1c0c52503dcedff1a75775bf8bfffe7ec77b722b':
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 60aed42..2661b02 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') { |