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

Commit 55fe01db authored by Tom Cherry's avatar Tom Cherry
Browse files

Remove fs_config_generate() 

We replaced creating the binary fs_config files with a python script
(/build/make/tools/fs_config/fs_config_generator.py), so there are no
more users of this function, nor do we plan for there to be.

Test: build
Change-Id: I49ec7e3d22c206bc250cbda6f66a4a59e47030e9
parent 7f34035f

libcutils/fs_config.cpp

+0 −18
Original line number Diff line number Diff line
@@ -379,21 +379,3 @@ void fs_config(const char* path, int dir, const char* target_out_path, unsigned* 
    *mode = (*mode & (~07777)) | pc->mode;

    *capabilities = pc->capabilities;

}
 


ssize_t fs_config_generate(char* buffer, size_t length, const struct fs_path_config* pc) {

    struct fs_path_config_from_file* p = (struct fs_path_config_from_file*)buffer;

    size_t len = ALIGN(sizeof(*p) + strlen(pc->prefix) + 1, sizeof(uint64_t));



    if ((length < len) || (len > UINT16_MAX)) {

        return -ENOSPC;

    }

    memset(p, 0, len);

    uint16_t host_len = len;

    p->len = get2LE((const uint8_t*)&host_len);

    p->mode = get2LE((const uint8_t*)&(pc->mode));

    p->uid = get2LE((const uint8_t*)&(pc->uid));

    p->gid = get2LE((const uint8_t*)&(pc->gid));

    p->capabilities = get8LE((const uint8_t*)&(pc->capabilities));

    strcpy(p->prefix, pc->prefix);

    return len;

}

libcutils/include/private/fs_config.h

+0 −2
Original line number Diff line number Diff line
@@ -74,8 +74,6 @@ __BEGIN_DECLS 
void fs_config(const char* path, int dir, const char* target_out_path, unsigned* uid, unsigned* gid,

               unsigned* mode, uint64_t* capabilities);



ssize_t fs_config_generate(char* buffer, size_t length, const struct fs_path_config* pc);



__END_DECLS



#endif /* _LIBS_CUTILS_PRIVATE_FS_CONFIG_H */