From 237fa4a599a9f2bb12dfb8102962579917ff1de5 Mon Sep 17 00:00:00 2001
From: Peter Howkins <flibble@users.sourceforge.net>
Date: Thu, 30 Aug 2012 22:40:55 +0100
Subject: [PATCH] dtpad: Resolve 6 compiler warnings.

---
 cde/programs/dtpad/main.c        | 2 +-
 cde/programs/dtpad/printOutput.c | 4 ++--
 cde/programs/dtpad/session.c     | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/cde/programs/dtpad/main.c b/cde/programs/dtpad/main.c
index 0691e8911..cccff2bb2 100644
--- a/cde/programs/dtpad/main.c
+++ b/cde/programs/dtpad/main.c
@@ -276,7 +276,7 @@ static int dtpadXIOErrorHandler(
  *				edit window)
  *
  ************************************************************************/ 
-void 
+int 
 main(
         int argc,
         char **argv )
diff --git a/cde/programs/dtpad/printOutput.c b/cde/programs/dtpad/printOutput.c
index a1b89a2e7..071145ea5 100644
--- a/cde/programs/dtpad/printOutput.c
+++ b/cde/programs/dtpad/printOutput.c
@@ -211,7 +211,7 @@ PrintOutputCreate(Widget shell)
 		_poDefaultMargin,
 		_poDefaultMargin,
 		&parseError );
-    assert(parseError == NULL);
+    assert(parseError == 0);
 
     return pOutput;
 }
@@ -783,7 +783,7 @@ _poGetFileContents(char **contents, char *file)
     int			nbytes;
     FILE		*fp = NULL;
 
-    if (file == NULL || *file == NULL) return
+    if (file == NULL || *file == '\0') return
 
     /*
      * Open the file for reading.
diff --git a/cde/programs/dtpad/session.c b/cde/programs/dtpad/session.c
index c715e9136..cc66ac25b 100644
--- a/cde/programs/dtpad/session.c
+++ b/cde/programs/dtpad/session.c
@@ -318,7 +318,7 @@ restoreSession(
 
     xrm_name[0] = XrmStringToQuark ("pads");
     xrm_name[1] = XrmStringToQuark ("numActivePads");
-    xrm_name[2] = NULL;
+    xrm_name[2] = 0;
     XrmQGetResource (db, xrm_name, xrm_name, &rep_type, &value);
     numPadsToRestore = atoi((char *)value.addr);
 
@@ -331,7 +331,7 @@ restoreSession(
 	 * we can find.
 	 */
         xrm_name[0] = XrmStringToQuark ("mainWindow");
-        xrm_name[2] = NULL;
+        xrm_name[2] = 0;
 
         /* get x position */
         xrm_name[1] = XrmStringToQuark ("x");
@@ -382,7 +382,7 @@ RestoreMain(
 
     sprintf(buf, "mainWindow%d", padNum);
     xrm_name[0] = XrmStringToQuark(buf);
-    xrm_name[2] = NULL;
+    xrm_name[2] = 0;
 
     /* get x position */
     xrm_name[1] = XrmStringToQuark ("x");