summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland Levillain <rpl@google.com>2022-05-19 16:41:14 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-05-19 16:41:14 +0000
commit9f25a79f0532bf26e5fd8e5244c6e879da6ed414 (patch)
tree6b25944c9955b43a1a94dbc7c41c25d273b13d5c
parent090cb5952bab050da27003badb2d27e279e62115 (diff)
parenta2e756fe3854953cdad7d8f645a6cd4fbea20acc (diff)
downloaddalvik-9f25a79f0532bf26e5fd8e5244c6e879da6ed414.tar.gz
Merge "Silence a compiler warning about an unused variable in `hprof-conv`." am: 5a81c499a5 am: f95cfdb1df am: 90198b99b8 am: a2e756fe38
Original change: https://android-review.googlesource.com/c/platform/dalvik/+/2101215 Change-Id: Ibc6bec7354ce9a4fb1410496d0dd6c118e149ae0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--tools/hprof-conv/HprofConv.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/hprof-conv/HprofConv.c b/tools/hprof-conv/HprofConv.c
index cc90176f9..c8847c944 100644
--- a/tools/hprof-conv/HprofConv.c
+++ b/tools/hprof-conv/HprofConv.c
@@ -663,7 +663,8 @@ static int filterData(FILE* in, FILE* out, int flags)
unsigned char* buf = ebGetBuffer(pBuf);
unsigned char type;
- unsigned int timestamp, length;
+ unsigned int timestamp ATTRIBUTE_UNUSED;
+ unsigned int length;
type = buf[0];
timestamp = get4BE(buf + 1);