commit 215a25ec1a7291aa3d71641c24d2c277102598ce
author Nick Desaulniers <ndesaulniers@google.com> Tue Oct 08 07:45:30 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Oct 08 07:45:30 2019 -0700
tree fd5dfbf3ad19a3f4d3a595f3d716aaba5dc62871
parent af1af0b26d5414029be0fbb5f1c7818721ad2295
parent 447bd76e6e92e82623ade8fa36e49ea03f0c9674

Merge "[liblog] fix -Wreorder-init-list"
am: 5bbe4a1b26

Change-Id: Ib06905d5e7ba024347322849d262191ba1410cd4

liblog/logd_reader.cpp

diff --git a/liblog/logd_reader.cpp b/liblog/logd_reader.cpp
index 916a428..d7f2975 100644
--- a/liblog/logd_reader.cpp
+++ b/liblog/logd_reader.cpp
@@ -67,12 +67,12 @@
     .name = "logd",
     .available = logdAvailable,
     .version = logdVersion,
+    .close = logdClose,
     .read = logdRead,
     .poll = logdPoll,
-    .close = logdClose,
     .clear = logdClear,
-    .getSize = logdGetSize,
     .setSize = logdSetSize,
+    .getSize = logdGetSize,
     .getReadableSize = logdGetReadableSize,
     .getPrune = logdGetPrune,
     .setPrune = logdSetPrune,

liblog/pmsg_reader.cpp

diff --git a/liblog/pmsg_reader.cpp b/liblog/pmsg_reader.cpp
index 2db45a1..9c5bc95 100644
--- a/liblog/pmsg_reader.cpp
+++ b/liblog/pmsg_reader.cpp
@@ -40,9 +40,9 @@
     .name = "pmsg",
     .available = pmsgAvailable,
     .version = pmsgVersion,
+    .close = pmsgClose,
     .read = pmsgRead,
     .poll = NULL,
-    .close = pmsgClose,
     .clear = pmsgClear,
     .setSize = NULL,
     .getSize = NULL,