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

Commit 16072e7e authored by Mark Salyzyn's avatar Mark Salyzyn Committed by Gerrit Code Review
Browse files

Merge "dumpstate: Continued build breakage"

parents c658aee7 791ddd33

cmds/dumpstate/Android.mk

+1 −1
Original line number Original line Diff line number Diff line
@@ -16,7 +16,7 @@ LOCAL_MODULE := dumpstate 




LOCAL_SHARED_LIBRARIES := libcutils liblog libselinux

LOCAL_SHARED_LIBRARIES := libcutils liblog libselinux

LOCAL_HAL_STATIC_LIBRARIES := libdumpstate

LOCAL_HAL_STATIC_LIBRARIES := libdumpstate

LOCAL_CFLAGS += -Wall -Werror -Wno-unused-parameter -std=gnu99

LOCAL_CFLAGS += -Wall -Werror -Wno-unused-parameter

LOCAL_INIT_RC := dumpstate.rc

LOCAL_INIT_RC := dumpstate.rc





include $(BUILD_EXECUTABLE)
 
include $(BUILD_EXECUTABLE)

cmds/dumpstate/utils.cpp

+4 −4
Original line number Original line Diff line number Diff line
@@ -294,10 +294,10 @@ void show_showtime(int pid, const char *name) { 
    // field 42 is iotime

    // field 42 is iotime

    unsigned long long utime = 0, stime = 0, iotime = 0;

    unsigned long long utime = 0, stime = 0, iotime = 0;

    if (sscanf(buffer,

    if (sscanf(buffer,

               "%*llu %*s %*s %*lld %*lld %*lld %*lld %*lld %*lld %*lld %*lld "

               "%*u %*s %*s %*d %*d %*d %*d %*d %*d %*d %*d "

               "%*lld %*lld %llu %llu %*lld %*lld %*lld %*lld %*lld %*lld "

               "%*d %*d %llu %llu %*d %*d %*d %*d %*d %*d "

               "%*lld %*lld %*lld %*lld %*lld %*lld %*lld %*lld %*lld %*lld "

               "%*d %*d %*d %*d %*d %*d %*d %*d %*d %*d "

               "%*lld %*lld %*lld %*lld %*lld %*lld %*lld %*lld %*lld %llu ",

               "%*d %*d %*d %*d %*d %*d %*d %*d %*d %llu ",

               &utime, &stime, &iotime) != 3) {

               &utime, &stime, &iotime) != 3) {

        return;

        return;

    }

    }