Skip to content
Browse files

am 1c0c525: Merge "Rename getline to fs_getline for fs_mgr"

* commit '1c0c52503dcedff1a75775bf8bfffe7ec77b722b':
  Rename getline to fs_getline for fs_mgr
  • Loading branch information...
2 parents e2a3fe2 + 1c0c525 commit cfd7c2a05166a3ff27b2145b007834408d95a2e0 @enh enh committed with Android Git Automerger
Showing with 3 additions and 3 deletions.
  1. +3 −3 fs_mgr/fs_mgr.c
View
6 fs_mgr/fs_mgr.c
@@ -167,7 +167,7 @@ static int parse_flags(char *flags, struct flag_list *fl, char **key_loc,
* 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') {

0 comments on commit cfd7c2a

Please sign in to comment.
Something went wrong with that request. Please try again.