summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChih-hung Hsieh <chh@google.com>2016-03-04 19:38:44 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2016-03-04 19:38:44 +0000
commit5667da92fd874c30eff40eae488ae6e05dba9d31 (patch)
tree731f29c9a3f016689b009ec104be8a98e24866be
parent9be329ae3292cd3c90057bb8b945ac55ff35b2ca (diff)
parenta57463f20e867439c4ba112f70c8d35080b26635 (diff)
downloadextras-android-n-preview-1.tar.gz
Merge "Fix static analyzer warnings."android-n-preview-1
-rw-r--r--procmem/procmem.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/procmem/procmem.c b/procmem/procmem.c
index 28055d8e..17a72121 100644
--- a/procmem/procmem.c
+++ b/procmem/procmem.c
@@ -50,12 +50,12 @@ int main(int argc, char *argv[]) {
/* maps and such */
pm_map_t **maps; size_t num_maps;
- struct map_info **mis;
+ struct map_info **mis = NULL;
struct map_info *mi;
/* pagemap information */
uint64_t *pagemap; size_t num_pages;
- unsigned long address; uint64_t mapentry;
+ uint64_t mapentry;
uint64_t count, flags;
/* totals */
@@ -190,7 +190,6 @@ int main(int argc, char *argv[]) {
mi->shared_clean = mi->shared_dirty = mi->private_clean = mi->private_dirty = 0;
for (j = 0; j < num_pages; j++) {
- address = pm_map_start(mi->map) + j * ker->pagesize;
mapentry = pagemap[j];
if (PM_PAGEMAP_PRESENT(mapentry) && !PM_PAGEMAP_SWAPPED(mapentry)) {
@@ -298,6 +297,7 @@ int main(int argc, char *argv[]) {
);
}
+ free(mis);
return 0;
}