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

Merge "Trivial cleanup of recent changes."

Browse source
This commit is contained in:
Elliott Hughes 2015-02-03 16:07:41 +00:00 • committed by Gerrit Code Review
commit c7a6e489f4
3 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
init/Android.mk
View file

@ -17,7 +17,11 @@ LOCAL_SRC_FILES:= \
ueventd_parser.c \ ueventd_parser.c \
watchdogd.c watchdogd.c
LOCAL_CFLAGS += -Wno-unused-parameter LOCAL_CFLAGS += \
-std=gnu11 \
-Wall \
-Werror -Wno-error=deprecated-declarations \
-Wno-unused-parameter \
ifeq ($(strip $(INIT_BOOTCHART)),true) ifeq ($(strip $(INIT_BOOTCHART)),true)
LOCAL_SRC_FILES += bootchart.c LOCAL_SRC_FILES += bootchart.c

7
init/builtins.c
View file

@ -221,16 +221,15 @@ int do_execonce(int nargs, char **args)
*/ */
zap_stdio(); zap_stdio();
char *exec_args[100]; char *exec_args[100];
int i; size_t num_process_args = nargs;
int num_process_args = nargs;
memset(exec_args, 0, sizeof(exec_args)); memset(exec_args, 0, sizeof(exec_args));
if (num_process_args > ARRAY_SIZE(exec_args) - 1) { if (num_process_args > ARRAY_SIZE(exec_args) - 1) {
ERROR("exec called with %d args, limit is %d", num_process_args, ERROR("exec called with %zu args, limit is %zu", num_process_args,
ARRAY_SIZE(exec_args) - 1); ARRAY_SIZE(exec_args) - 1);
_exit(1); _exit(1);
} }
for (i = 1; i < num_process_args; i++) for (size_t i = 1; i < num_process_args; i++)
exec_args[i - 1] = args[i]; exec_args[i - 1] = args[i];
if (execv(exec_args[0], exec_args) == -1) { if (execv(exec_args[0], exec_args) == -1) {

2
init/readme.txt
View file

@ -123,7 +123,7 @@ boot
Triggers of this form occur when the property <name> is set Triggers of this form occur when the property <name> is set
to the specific value <value>. to the specific value <value>.
One can also test Mutliple properties to execute a group One can also test multiple properties to execute a group
of commands. For example: of commands. For example:
on property:test.a=1 && property:test.b=1 on property:test.a=1 && property:test.b=1