Merge commit '6722737ece4b8db3e30b53aef8f981f53db1621e^'

2 files changed, 5 insertions, 2 deletions

diff --git a/procps/pmap.c b/procps/pmap.c
index cfa94ed82..bb5f9e7c2 100644
--- a/procps/pmap.c
+++ b/procps/pmap.c
@@ -44,7 +44,7 @@ enum {
 
 static void print_smaprec(struct smaprec *currec, void *data)
 {
-        unsigned opt = (unsigned)data;
+        unsigned opt = (uintptr_t)data;
 
         printf("%0" AFMT "lx ", currec->smap_start);
 
@@ -74,7 +74,7 @@ static int procps_get_maps(pid_t pid, unsigned opt)
 
         memset(&total, 0, sizeof(total));
 
-        ret = procps_read_smaps(pid, &total, print_smaprec, (void*)opt);
+        ret = procps_read_smaps(pid, &total, print_smaprec, (void*)(uintptr_t)opt);
         if (ret)
                 return ret;
 
diff --git a/procps/smemcap.c b/procps/smemcap.c
index f951a5fb6..196c91f54 100644
--- a/procps/smemcap.c
+++ b/procps/smemcap.c
@@ -125,5 +125,8 @@ int smemcap_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
                 }
         }
 
+        if (ENABLE_FEATURE_CLEAN_UP)
+                closedir(d);
+
         return EXIT_SUCCESS;
 }