diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2014-05-21 10:07:55 -0700 |
|---|---|---|
| committer | Mark Salyzyn <salyzyn@google.com> | 2014-05-21 10:07:55 -0700 |
| commit | 6cd488e95a658b23cf503febd9c5201837d45ec7 (patch) | |
| tree | d7c0485adb8c6108aadc40685d81b5cb40ff18bb /toolbox/lsof.c | |
| parent | f1b21c5c735e9150c8f29bdb52db2f3eb3ffc469 (diff) | |
| parent | faf845290bb78824502d007209134c8dbfa296a2 (diff) | |
| download | system_core-6cd488e95a658b23cf503febd9c5201837d45ec7.zip system_core-6cd488e95a658b23cf503febd9c5201837d45ec7.tar.gz system_core-6cd488e95a658b23cf503febd9c5201837d45ec7.tar.bz2 | |
resolved conflicts for merge of faf84529 to master
Change-Id: Idbb7fae527bad4ae1447f95662a9ec5d5294d771
Diffstat (limited to 'toolbox/lsof.c')
| -rw-r--r-- | toolbox/lsof.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/toolbox/lsof.c b/toolbox/lsof.c index af321af..bee981d 100644 --- a/toolbox/lsof.c +++ b/toolbox/lsof.c @@ -99,10 +99,7 @@ out: static void print_maps(struct pid_info_t* info) { FILE *maps; - char buffer[PATH_MAX + 100]; - size_t offset; - int major, minor; char device[10]; long int inode; char file[PATH_MAX]; |