dthelp: compiler warning and coverity warning fixes

2018-03-29 00:21:44 +01:00
parent 50a96959f0
commit e12e009eb5
14 changed files with 68 additions and 34 deletions
--- a/cde/programs/dthelp/parser/pass2/util/malloc.c
+++ b/cde/programs/dthelp/parser/pass2/util/malloc.c
@@ -84,16 +84,13 @@ void *m_wctrace(
 #endif
  ) ;

-void m_free(block, msg)
-  void *block ;
-  char *msg ;
+void m_free(void *block, char *msg)
  {
    char buffer[32] ;

 #if defined(MSDOS)
    if (m_heapchk) m_heapdump() ;
 #endif
-    free(block) ;
    if (m_malftrace) {
 #if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) || defined(__uxp__)
      snprintf(buffer, 32, "%5x:%5x",
@@ -107,6 +104,7 @@ void m_free(block, msg)
      m_trace(msg) ;
      m_trace("\n") ;
      }      
+    free(block) ;
 #if defined(MSDOS)
    if (m_heapchk) m_heapdump() ;
 #endif