Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 295b82bd authored by Irina Tirdea's avatar Irina Tirdea
Browse files

Rename getline to fs_getline for fs_mgr 



fs_mgr defines its own version of getline and uses it
internally. This leads to a build error if getline is
also defined in bionic, since fs_mgr will see readline
as defined internally.

Rename getline in fs_mgr to a local name (fs_getline)
so that there will no longer be any conflicts.

This is needed it we want to add getline in bionic.

Change-Id: I3a32be71a645e122629802d98ff8f9ab9c419e86
Signed-off-by: default avatarIrina Tirdea <irina.tirdea@intel.com>
parent 922b460c

fs_mgr/fs_mgr.c

+3 −3
Original line number Diff line number Diff line
@@ -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') {