commit 791ddd337080f66bcdb5a43608923cc046fefc20
author Mark Salyzyn <salyzyn@google.com> Wed Feb 10 07:41:12 2016 -0800
committer Mark Salyzyn <salyzyn@google.com> Wed Feb 10 08:11:11 2016 -0800
tree 4d064f83e632f21a4f2feddb4d9bd9b6b4f24da9
parent c658aee7d6dc56b1b3b1722412029830e966ba71

dumpstate: Continued build breakage

- drop assignment length in scanf
- drop -std=gnu99 as invalid for C++

Change-Id: I924d2561069b3c289cb9deb475f732c46bb5a67e

cmds/dumpstate/Android.mk

diff --git a/cmds/dumpstate/Android.mk b/cmds/dumpstate/Android.mk
index b0cecdd..4d00d53 100644
--- a/cmds/dumpstate/Android.mk
+++ b/cmds/dumpstate/Android.mk
@@ -16,7 +16,7 @@
 
 LOCAL_SHARED_LIBRARIES := libcutils liblog libselinux
 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
 
 include $(BUILD_EXECUTABLE)

cmds/dumpstate/utils.cpp

diff --git a/cmds/dumpstate/utils.cpp b/cmds/dumpstate/utils.cpp
index 0b1fa43..e37fe78 100644
--- a/cmds/dumpstate/utils.cpp
+++ b/cmds/dumpstate/utils.cpp
@@ -294,10 +294,10 @@
     // field 42 is iotime
     unsigned long long utime = 0, stime = 0, iotime = 0;
     if (sscanf(buffer,
-               "%*llu %*s %*s %*lld %*lld %*lld %*lld %*lld %*lld %*lld %*lld "
-               "%*lld %*lld %llu %llu %*lld %*lld %*lld %*lld %*lld %*lld "
-               "%*lld %*lld %*lld %*lld %*lld %*lld %*lld %*lld %*lld %*lld "
-               "%*lld %*lld %*lld %*lld %*lld %*lld %*lld %*lld %*lld %llu ",
+               "%*u %*s %*s %*d %*d %*d %*d %*d %*d %*d %*d "
+               "%*d %*d %llu %llu %*d %*d %*d %*d %*d %*d "
+               "%*d %*d %*d %*d %*d %*d %*d %*d %*d %*d "
+               "%*d %*d %*d %*d %*d %*d %*d %*d %*d %llu ",
                &utime, &stime, &iotime) != 3) {
         return;
     }