--- ../2010-03-05-10.53/vg-twain_32_dsm.txt.x	2010-03-19 00:12:27.000000000 -0700
+++ vg-twain_32_dsm.txt.x	2010-03-19 00:12:27.000000000 -0700
@@ -1,11 +1,11 @@
- Warning: invalid file descriptor 95111272 in syscall close()
- Warning: invalid file descriptor 95115816 in syscall close()
- Warning: invalid file descriptor 71846944 in syscall close()
- Warning: invalid file descriptor 72086096 in syscall close()
+ Warning: invalid file descriptor 73146408 in syscall close()
+ Warning: invalid file descriptor 73146808 in syscall close()
+ Warning: invalid file descriptor 72043480 in syscall close()
+ Warning: invalid file descriptor 72046488 in syscall close()
  
  HEAP SUMMARY:
      in use at exit: NNN bytes in BBBB blocks
-   total heap usage: 37,380 allocs, 31,176 frees, NNNNN bytes allocated
+   total heap usage: 41,338 allocs, 34,887 frees, NNNNN bytes allocated
  
  NNN bytes in BBBB blocks are definitely lost 
     at  malloc (vg_replace_malloc.c)
@@ -1043,52 +1043,6 @@
    fun:run_test
    fun:main
 }
- NNN bytes in BBBB blocks are definitely lost 
-    at  calloc (vg_replace_malloc.c)
-    by  ???
-    by  ???
-    by  ???
-    by  ???
-    by  ???
-    by  ???
-    by  ???
-    by  ???
-    by  ???
-    by  ???
-    by  ???
-    by  ???
-    by  ???
-    by  detect_sane_devices (sane_main.c)
-    by  SANE_GetIdentity (sane_main.c)
-    by  SANE_SourceControlHandler (sane_main.c)
-    by  DS_Entry (sane_main.c)
-    by  ???
-    by  ???
- 
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   fun:calloc
-   obj:*
-   obj:*
-   obj:*
-   obj:*
-   obj:*
-   obj:*
-   obj:*
-   obj:*
-   obj:*
-   obj:*
-   obj:*
-   obj:*
-   obj:*
-   fun:detect_sane_devices
-   fun:SANE_GetIdentity
-   fun:SANE_SourceControlHandler
-   fun:DS_Entry
-   obj:*
-   obj:*
-}
  36 (12 direct, 24 indirect)NNN bytes in BBBB blocks are definitely lost 
     at  malloc (vg_replace_malloc.c)
     by  ???
@@ -2029,7 +1983,7 @@
    fun:run_test
    fun:main
 }
- 7,244 (24 direct, 7,220 indirect)NNN bytes in BBBB blocks are definitely lost 
+ 9,828 (24 direct, 9,804 indirect)NNN bytes in BBBB blocks are definitely lost 
     at  calloc (vg_replace_malloc.c)
     by  ???
     by  ???
@@ -2041,15 +1995,15 @@
     by  ???
     by  ???
     by  ???
+    by  ???
+    by  ???
+    by  ???
     by  detect_sane_devices (sane_main.c)
     by  SANE_GetIdentity (sane_main.c)
     by  SANE_SourceControlHandler (sane_main.c)
     by  DS_Entry (sane_main.c)
     by  ???
     by  ???
-    by  ???
-    by  ???
-    by  ???
  
 {
    <insert_a_suppression_name_here>
@@ -2065,15 +2019,15 @@
    obj:*
    obj:*
    obj:*
+   obj:*
+   obj:*
+   obj:*
    fun:detect_sane_devices
    fun:SANE_GetIdentity
    fun:SANE_SourceControlHandler
    fun:DS_Entry
    obj:*
    obj:*
-   obj:*
-   obj:*
-   obj:*
 }
  11,568 (8 direct, 11,560 indirect)NNN bytes in BBBB blocks are definitely lost 
     at  malloc (vg_replace_malloc.c)
@@ -2111,7 +2065,7 @@
    fun:run_test
    fun:main
 }
- 34,696 (44 direct, 34,652 indirect)NNN bytes in BBBB blocks are definitely lost 
+ 12,516 (12,256 direct, 260 indirect)NNN bytes in BBBB blocks are definitely lost 
     at  calloc (vg_replace_malloc.c)
     by  ???
     by  ???
@@ -2119,10 +2073,6 @@
     by  ???
     by  ???
     by  ???
-    by  ???
-    by  ???
-    by  ???
-    by  ???
     by  detect_sane_devices (sane_main.c)
     by  SANE_GetIdentity (sane_main.c)
     by  SANE_SourceControlHandler (sane_main.c)
@@ -2132,6 +2082,10 @@
     by  ???
     by  ???
     by  ???
+    by  test_sources (dsm.c)
+    by  func_dsm (dsm.c)
+    by  run_test (test.h:541)
+    by  main (test.h:591)
  
 {
    <insert_a_suppression_name_here>
@@ -2143,10 +2097,6 @@
    obj:*
    obj:*
    obj:*
-   obj:*
-   obj:*
-   obj:*
-   obj:*
    fun:detect_sane_devices
    fun:SANE_GetIdentity
    fun:SANE_SourceControlHandler
@@ -2156,8 +2106,12 @@
    obj:*
    obj:*
    obj:*
+   fun:test_sources
+   fun:func_dsm
+   fun:run_test
+   fun:main
 }
- 42,751 (4,120 direct, 38,631 indirect)NNN bytes in BBBB blocks are definitely lost 
+ 42,629 (4,120 direct, 38,509 indirect)NNN bytes in BBBB blocks are definitely lost 
     at  malloc (vg_replace_malloc.c)
     by  ???
     by  ???
@@ -2203,6 +2157,50 @@
    fun:func_dsm
    fun:run_test
 }
+ 66,197 (66,192 direct, 5 indirect)NNN bytes in BBBB blocks are definitely lost 
+    at  malloc (vg_replace_malloc.c)
+    by  ???
+    by  ???
+    by  ???
+    by  ???
+    by  ???
+    by  detect_sane_devices (sane_main.c)
+    by  SANE_GetIdentity (sane_main.c)
+    by  SANE_SourceControlHandler (sane_main.c)
+    by  DS_Entry (sane_main.c)
+    by  ???
+    by  ???
+    by  ???
+    by  ???
+    by  ???
+    by  test_sources (dsm.c)
+    by  func_dsm (dsm.c)
+    by  run_test (test.h:541)
+    by  main (test.h:591)
+ 
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   fun:malloc
+   obj:*
+   obj:*
+   obj:*
+   obj:*
+   obj:*
+   fun:detect_sane_devices
+   fun:SANE_GetIdentity
+   fun:SANE_SourceControlHandler
+   fun:DS_Entry
+   obj:*
+   obj:*
+   obj:*
+   obj:*
+   obj:*
+   fun:test_sources
+   fun:func_dsm
+   fun:run_test
+   fun:main
+}
  LEAK SUMMARY:
     definitely lost: NNN bytes in BBBB blocks
     indirectly lost: NNN bytes in BBBB blocks