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

Commit c61895ac authored by Mark Salyzyn's avatar Mark Salyzyn
Browse files

logd: turn on -Werror 

- Deal with some -Wunused / -Wunused-variable issues

Change-Id: Ic86cd7b0680868ad0536198b71a34cb19134fc21
parent 3cb54987

logd/Android.mk

+1 −1
Original line number Original line Diff line number Diff line
@@ -25,7 +25,7 @@ LOCAL_SHARED_LIBRARIES := \ 
    libcutils \

    libcutils \

    libutils

    libutils





LOCAL_MODULE_TAGS := optional

LOCAL_CFLAGS := -Werror





include $(BUILD_EXECUTABLE)

include $(BUILD_EXECUTABLE)

logd/CommandListener.cpp

+0 −1
Original line number Original line Diff line number Diff line
@@ -208,7 +208,6 @@ int CommandListener::GetStatisticsCmd::runCommand(SocketClient *cli, 
                                         int argc, char **argv) {

                                         int argc, char **argv) {

    setname();

    setname();

    uid_t uid = cli->getUid();

    uid_t uid = cli->getUid();

    gid_t gid = cli->getGid();

    if (clientHasLogCredentials(cli)) {

    if (clientHasLogCredentials(cli)) {

        uid = AID_ROOT;

        uid = AID_ROOT;

    }

    }

logd/tests/logd_test.cpp

+1 −3
Original line number Original line Diff line number Diff line
@@ -196,8 +196,6 @@ TEST(logd, statistics) { 




    cp = strstr(cp, "Minimum time between log events per dgram_qlen:");

    cp = strstr(cp, "Minimum time between log events per dgram_qlen:");





    char *log_events_per_span = cp;



    if (cp) {

    if (cp) {

        while (*cp && (*cp != '\n')) {

        while (*cp && (*cp != '\n')) {

            ++cp;

            ++cp;
@@ -462,7 +460,7 @@ TEST(logd, both) { 
            dump_log_msg("user", &msg, 3, -1);

            dump_log_msg("user", &msg, 3, -1);

        }

        }





        alarm(0);

        alarm(old_alarm);

        sigaction(SIGALRM, &old_sigaction, NULL);

        sigaction(SIGALRM, &old_sigaction, NULL);





        close(fd);

        close(fd);