From f98d6f41d3e763d229b6630aa6130c5e6a474e7e Mon Sep 17 00:00:00 2001
From: David Cantrell <dcantrell@redhat.com>
Date: Tue, 21 Aug 2012 21:53:33 -0400
Subject: [PATCH] Simple compiler warning fixes in programs/dthelp.

---
 cde/programs/dthelp/parser.ccdf/htag/build/build.c  | 3 ++-
 cde/programs/dthelp/parser.ccdf/htag/build/eltree.c | 2 +-
 cde/programs/dthelp/parser.ccdf/htag/util/context.c | 4 ++--
 cde/programs/dthelp/parser.ccdf/htag/util/wchar.c   | 1 +
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/cde/programs/dthelp/parser.ccdf/htag/build/build.c b/cde/programs/dthelp/parser.ccdf/htag/build/build.c
index 5b763728..8c4cfd33 100644
--- a/cde/programs/dthelp/parser.ccdf/htag/build/build.c
+++ b/cde/programs/dthelp/parser.ccdf/htag/build/build.c
@@ -41,7 +41,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 #include "entdef.h"
 
 /* Main procedure */
-void main(argc, argv)
+int main(argc, argv)
 int argc ;
 char **argv ;
 {
@@ -71,4 +71,5 @@ while (TRUE)
     #include "case.c"
     if (m_token == ENDFILE) exit(FALSE) ;
     }
+return EXIT_SUCCESS;
 }
diff --git a/cde/programs/dthelp/parser.ccdf/htag/build/eltree.c b/cde/programs/dthelp/parser.ccdf/htag/build/eltree.c
index 9f6038d3..e037d4dd 100644
--- a/cde/programs/dthelp/parser.ccdf/htag/build/eltree.c
+++ b/cde/programs/dthelp/parser.ccdf/htag/build/eltree.c
@@ -55,7 +55,7 @@ ELTSTRUCT *ntrelt(p)
     w_strcpy(new->enptr, p) ;
     new->model = M_NULLVAL ;
     new->content = M_NULLVAL ;
-    new->inptr = new->exptr = NULL ;
+    new->inptr = new->exptr = 0 ;
     new->parptr = NULL ;
     new->parindex = M_NULLVAL ;
     new->paramcount = M_NULLVAL ;
diff --git a/cde/programs/dthelp/parser.ccdf/htag/util/context.c b/cde/programs/dthelp/parser.ccdf/htag/util/context.c
index 7423afde..b98c3732 100644
--- a/cde/programs/dthelp/parser.ccdf/htag/util/context.c
+++ b/cde/programs/dthelp/parser.ccdf/htag/util/context.c
@@ -169,7 +169,7 @@ delim.h.
 #include "cont.h"
 
 /* Main procedure */
-void main(argc, argv)
+int main(argc, argv)
   int argc ;
   char **argv ;
 {
@@ -242,5 +242,5 @@ fprintf(context, "#define MAXD %d\n", maxd) ;
 dumptree((LOGICAL) (argc > 1)) ;
 fprintf(stderr, "NUMCON set to %d\n", NUMCON) ;
 fprintf(stderr, "NUMDELIM set to %d\n", NUMDELIM) ;
-exit(errexit) ;
+return errexit;
 }
diff --git a/cde/programs/dthelp/parser.ccdf/htag/util/wchar.c b/cde/programs/dthelp/parser.ccdf/htag/util/wchar.c
index 053563a3..aa2fc46c 100644
--- a/cde/programs/dthelp/parser.ccdf/htag/util/wchar.c
+++ b/cde/programs/dthelp/parser.ccdf/htag/util/wchar.c
@@ -25,6 +25,7 @@
 	       Copyright 1992 Hewlett-Packard Co.
 */
 
+#include <string.h>
 #include "basic.h"
 
 
-- 
2.25.1