ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Remove fs_config_generate()"

Browse source 
am: 45f79b1c3b

Change-Id: I5bef71ab65fd45daa94fc16aebb2d8258ce9b275
This commit is contained in:
Tom Cherry 2019-06-20 14:25:53 -07:00 • committed by android-build-merger
commit b9ef822307
2 changed files with 0 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
libcutils/fs_config.cpp
View file

@ -379,21 +379,3 @@ void fs_config(const char* path, int dir, const char* target_out_path, unsigned*
*mode = (*mode & (~07777)) | pc->mode; *mode = (*mode & (~07777)) | pc->mode;
*capabilities = pc->capabilities; *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;
}

2
libcutils/include/private/fs_config.h
View file

@ -74,8 +74,6 @@ __BEGIN_DECLS
void fs_config(const char* path, int dir, const char* target_out_path, unsigned* uid, unsigned* gid, void fs_config(const char* path, int dir, const char* target_out_path, unsigned* uid, unsigned* gid,
unsigned* mode, uint64_t* capabilities); unsigned* mode, uint64_t* capabilities);
ssize_t fs_config_generate(char* buffer, size_t length, const struct fs_path_config* pc);
__END_DECLS __END_DECLS
#endif /* _LIBS_CUTILS_PRIVATE_FS_CONFIG_H */ #endif /* _LIBS_CUTILS_PRIVATE_FS_CONFIG_H */