Skip to content

Commit

Permalink
am 1c0c525: Merge "Rename getline to fs_getline for fs_mgr"
Browse files Browse the repository at this point in the history
* commit '1c0c52503dcedff1a75775bf8bfffe7ec77b722b':
  Rename getline to fs_getline for fs_mgr
  • Loading branch information
enh-google authored and Android Git Automerger committed Sep 26, 2012
2 parents e2a3fe2 + 1c0c525 commit cfd7c2a
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions fs_mgr/fs_mgr.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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') {
Expand All @@ -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') {
Expand Down

0 comments on commit cfd7c2a

Please sign in to comment.