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

Commit d3e37d14 authored by Elliott Hughes's avatar Elliott Hughes
Browse files

Trivial cleanup of recent changes. 

A typo in the documentation for one, and a couple of signed/unsigned warnings
in the implementation of the other.

Change-Id: I8fb4b7448ac901c543dea7420aabcedf13ec1bd8
parent b101f879

init/Android.mk

+5 −1
Original line number Diff line number Diff line
@@ -17,7 +17,11 @@ LOCAL_SRC_FILES:= \ 
	ueventd_parser.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)

LOCAL_SRC_FILES += bootchart.c

init/builtins.c

+3 −4
Original line number Diff line number Diff line
@@ -221,16 +221,15 @@ int do_execonce(int nargs, char **args) 
         */

        zap_stdio();

        char *exec_args[100];

        int i;

        int num_process_args = nargs;

        size_t num_process_args = nargs;



        memset(exec_args, 0, sizeof(exec_args));

        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);

            _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];



        if (execv(exec_args[0], exec_args) == -1) {

init/readme.txt

+1 −1
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ boot 
   Triggers of this form occur when the property <name> is set

   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:



   on property:test.a=1 && property:test.b=1