From: Peter Howkins <flibble@users.sf.net>
Date: Mon, 23 Apr 2018 02:43:48 +0000 (+0100)
Subject: dtpdm: Coverity 87632, 87664, 87923
X-Git-Tag: 2.2.4a~68
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d52e9390ec293074d987baa0de9c73ae772ba6c6;p=oweals%2Fcde.git

dtpdm: Coverity 87632, 87664, 87923
---

diff --git a/cde/programs/dtpdm/MainWindow.c b/cde/programs/dtpdm/MainWindow.c
index cacb12d7..a21f6ad5 100644
--- a/cde/programs/dtpdm/MainWindow.c
+++ b/cde/programs/dtpdm/MainWindow.c
@@ -156,7 +156,7 @@ PdmMainWinDelete(PdmMainWin* me)
  *     The passed PdmSetupBox pointer.
  *
  */
-PdmSetupBox*
+void
 PdmMainWinAddSetupBox(PdmMainWin* me, PdmSetupBox* box)
 {
     /*
diff --git a/cde/programs/dtpdm/MainWindow.h b/cde/programs/dtpdm/MainWindow.h
index 73fde56b..386fb76d 100644
--- a/cde/programs/dtpdm/MainWindow.h
+++ b/cde/programs/dtpdm/MainWindow.h
@@ -139,7 +139,7 @@ PdmMainWin* PdmMainWinCreate(
 			     String print_display_spec,
 			     String print_context_str);
 void PdmMainWinDelete(PdmMainWin* me);
-PdmSetupBox* PdmMainWinAddSetupBox(PdmMainWin* me, PdmSetupBox* box);
+void PdmMainWinAddSetupBox(PdmMainWin* me, PdmSetupBox* box);
 String* PdmMainWinMergeFallbacks(PdmMainWin* me,
 				 const String* app_fallbacks,
 				 int count);
diff --git a/cde/programs/dtpdm/PdmXp.c b/cde/programs/dtpdm/PdmXp.c
index 3cd65d5c..8fd7f284 100644
--- a/cde/programs/dtpdm/PdmXp.c
+++ b/cde/programs/dtpdm/PdmXp.c
@@ -181,7 +181,7 @@ PdmXpClose(PdmXp* me)
 	    if(me->pool[i] != (XrmDatabase)NULL)
 	    {
 		XrmDestroyDatabase(me->pool[i]);
-		me->pool[i] == (XrmDatabase)NULL;
+		me->pool[i] = (XrmDatabase)NULL;
 	    }
 	}
 	XCloseDisplay(me->display);
diff --git a/cde/programs/dtpdm/PrinterBox.c b/cde/programs/dtpdm/PrinterBox.c
index 6c418c09..7c06d010 100644
--- a/cde/programs/dtpdm/PrinterBox.c
+++ b/cde/programs/dtpdm/PrinterBox.c
@@ -3225,7 +3225,7 @@ PdmPixmapListGetPixmap(PdmPixmapList* me, int i)
 				    me->foreground, me->background);
 	if(me->pixmap[i] == XmUNSPECIFIED_PIXMAP)
 	{
-	    me->pixmap[i] == None;
+	    me->pixmap[i] = None;
 	}
 	else if(me->stipple != None)
 	{