]> granicus.if.org Git - psmisc/commitdiff
Merge branch 'memory-cleanup' into 'master'
authorCraig Small <csmall@enc.com.au>
Fri, 24 Mar 2017 23:11:44 +0000 (23:11 +0000)
committerCraig Small <csmall@enc.com.au>
Fri, 24 Mar 2017 23:11:44 +0000 (23:11 +0000)
Memory cleanup

See merge request !9

1  2 
src/killall.c
src/peekfd.c
src/pstree.c

diff --cc src/killall.c
Simple merge
diff --cc src/peekfd.c
index 3cce29e474cc0f17b21802a362c6df233267a04c,d2e637e8b6a15f2ee07450f47d93b1cd5c158b2b..32723b594470d9591891636ef6c7879f5c635212
@@@ -147,9 -152,7 +152,8 @@@ int main(int argc, char **argv
        int optc;
      int target_pid = 0;
      int numfds = 0;
-     int *fds = NULL;
      int i;
 +    unsigned long j;
  
      struct option options[] = {
        {"eight-bit-clean", 0, NULL, '8'},
diff --cc src/pstree.c
Simple merge