diff options
author | Elliott Hughes <enh@google.com> | 2013-12-12 20:58:20 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-12-12 20:58:20 +0000 |
commit | e35f7fedabf9346d299abe10af25eaf88207a133 (patch) | |
tree | 726c7909b83e77003e7626644beb638a831667bd | |
parent | 907516b85ac4e604393e8573bda8d77fe7f6ccdc (diff) | |
parent | 10e29de62eb805045437cc9b6ec5a39a464cee67 (diff) | |
download | extras-e35f7fedabf9346d299abe10af25eaf88207a133.tar.gz |
Merge "procmem: Use size_t instead of int to remove a potential bug."
-rw-r--r-- | procmem/procmem.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/procmem/procmem.c b/procmem/procmem.c index a9ac68d2..dac00a03 100644 --- a/procmem/procmem.c +++ b/procmem/procmem.c @@ -47,13 +47,13 @@ int main(int argc, char *argv[]) { pm_process_t *proc; /* maps and such */ - pm_map_t **maps; int num_maps; + pm_map_t **maps; size_t num_maps; struct map_info **mis; struct map_info *mi; /* pagemap information */ - uint64_t *pagemap; int num_pages; + uint64_t *pagemap; size_t num_pages; unsigned long address; uint64_t mapentry; uint64_t count, flags; @@ -70,7 +70,7 @@ int main(int argc, char *argv[]) { int hide_zeros; /* temporary variables */ - int i, j; + size_t i, j; char *endptr; int error; @@ -82,7 +82,7 @@ int main(int argc, char *argv[]) { ws = WS_OFF; compfn = NULL; hide_zeros = 0; - for (i = 1; i < argc - 1; i++) { + for (i = 1; i < (size_t)(argc - 1); i++) { if (!strcmp(argv[i], "-w")) { ws = WS_ONLY; continue; } if (!strcmp(argv[i], "-W")) { ws = WS_RESET; continue; } if (!strcmp(argv[i], "-m")) { compfn = NULL; continue; } |