commit 1c0c52503dcedff1a75775bf8bfffe7ec77b722b
author Elliott Hughes <enh@google.com> Wed Sep 26 13:57:54 2012 -0700
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Sep 26 13:57:55 2012 -0700
tree 404e91a62aa5c8a93da642cb633acd7b3288077d
parent 2dbef6ae08eec8815863b89046653a1a73443a7c
parent 295b82bd691d413c07665c7e7607fe0e5d3485f5

Merge "Rename getline to fs_getline for fs_mgr"

fs_mgr/fs_mgr.c

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