dtpad: Resolve 6 compiler warnings.

diff --git a/cde/programs/dtpad/main.c b/cde/programs/dtpad/main.c
index 0691e8911cd2265586e383852a31904de6c58364..cccff2bb2704cb5f1aba8a0e31201e8aa877d57b 100644 (file)
--- 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 a1b89a2e72096d706a3409d1627e24a35a3b6bb0..071145ea5a33318e849703dd9e5e46910e909ef5 100644 (file)
--- 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 c715e913647f04574008fd092ff5f13f56b39f57..cc66ac25b189f9adf6add67fa1a6e2c4fc906411 100644 (file)
--- 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");