TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2024-12-18 05:58:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use const char*

Browse Source
This commit is contained in:
topjohnwu 2018-10-26 17:02:56 -04:00
parent 6add02702b
commit 6dc9ccad75
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
native/jni/init.c
View File

@ -370,7 +370,7 @@ int main(int argc, char *argv[]) {
if (cmd.skip_initramfs) { if (cmd.skip_initramfs) {
// Clear rootfs // Clear rootfs
excl_list = (char *[]) { "overlay", ".backup", "proc", "sys", "init.bak", NULL }; excl_list = (const char *[]) { "overlay", ".backup", "proc", "sys", "init.bak", NULL };
frm_rf(root); frm_rf(root);
} else { } else {
// Revert original init binary // Revert original init binary
@ -399,7 +399,7 @@ int main(int argc, char *argv[]) {
int system_root = open("/system_root", O_RDONLY | O_CLOEXEC); int system_root = open("/system_root", O_RDONLY | O_CLOEXEC);
// Clone rootfs except /system // Clone rootfs except /system
excl_list = (char *[]) { "system", NULL }; excl_list = (const char *[]) { "system", NULL };
clone_dir(system_root, root); clone_dir(system_root, root);
close(system_root); close(system_root);

2
native/jni/utils/file.c
View File

@ -15,7 +15,7 @@
#include "utils.h" #include "utils.h"
#include "selinux.h" #include "selinux.h"
char **excl_list = NULL; const char **excl_list = NULL;
static int is_excl(const char *name) { static int is_excl(const char *name) {
if (excl_list) if (excl_list)

2
native/jni/utils/include/utils.h
View File

@ -109,7 +109,7 @@ int __fsetxattr(int fd, const char *name, const void *value, size_t size, int fl
#define align(p, a) (((p) + (a) - 1) / (a) * (a)) #define align(p, a) (((p) + (a) - 1) / (a) * (a))
#define align_off(p, a) (align(p, a) - (p)) #define align_off(p, a) (align(p, a) - (p))
extern char **excl_list; extern const char **excl_list;
struct file_attr { struct file_attr {
struct stat st; struct stat st;