summaryrefslogtreecommitdiffstats
path: root/cmds
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2015-01-25 19:17:14 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-01-25 19:17:14 +0000
commit346329b7a70b594895be0aec5dc00f9f4108b533 (patch)
tree8bcacd13caf29286334a7d1816d91256185e2544 /cmds
parentc0e10c6f03eaa126aeb745e0b209ad0b219ade6e (diff)
parent3da5d235dab9469ccec567c4ebbb5206f4558a18 (diff)
downloadframeworks_native-346329b7a70b594895be0aec5dc00f9f4108b533.zip
frameworks_native-346329b7a70b594895be0aec5dc00f9f4108b533.tar.gz
frameworks_native-346329b7a70b594895be0aec5dc00f9f4108b533.tar.bz2
Merge "Move atrace from the obsolete bzero to memset."
Diffstat (limited to 'cmds')
-rw-r--r--cmds/atrace/atrace.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/cmds/atrace/atrace.cpp b/cmds/atrace/atrace.cpp
index 9e5c910..010d9ce 100644
--- a/cmds/atrace/atrace.cpp
+++ b/cmds/atrace/atrace.cpp
@@ -23,6 +23,7 @@
#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include <sys/sendfile.h>
#include <time.h>
#include <zlib.h>
@@ -648,7 +649,7 @@ static void dumpTrace()
uint8_t *in, *out;
int result, flush;
- bzero(&zs, sizeof(zs));
+ memset(&zs, 0, sizeof(zs));
result = deflateInit(&zs, Z_DEFAULT_COMPRESSION);
if (result != Z_OK) {
fprintf(stderr, "error initializing zlib: %d\n", result);