From a9175c896d45f4e0f7df385bc0d5560071aa9d2e Mon Sep 17 00:00:00 2001
From: Peter Howkins <flibble@users.sf.net>
Date: Thu, 25 Nov 2021 03:09:45 +0000
Subject: [PATCH] dtcalc: Change the prototype of matherr() to reflect actual
 usage and remove warnings.

---
 cde/programs/dtcalc/calctool.c  | 31 ++-----------------------------
 cde/programs/dtcalc/functions.c |  6 +++---
 2 files changed, 5 insertions(+), 32 deletions(-)

diff --git a/cde/programs/dtcalc/calctool.c b/cde/programs/dtcalc/calctool.c
index 30be94ee7..69ea728ea 100644
--- a/cde/programs/dtcalc/calctool.c
+++ b/cde/programs/dtcalc/calctool.c
@@ -1214,38 +1214,11 @@ make_number(int *MPnumber, BOOLEAN mkFix)
 }
 
 
-/*ARGSUSED*/
 /* Default math library exception handling routine. */
-int
-matherr(struct exception *exc)
+void
+matherr(void)
 {
-#if 0
-  char msg[100];
-  
-  if (exc) {
-	  strcpy(msg, exc->name);
-	  strcat(msg, ": ");
-	  if(exc->type == DOMAIN)
-	     strcat(msg, "DOMAIN ");
-	  else if(exc->type == SING)
-	     strcat(msg, "SING ");
-	  else if(exc->type == OVERFLOW)
-	     strcat(msg, "OVERFLOW ");
-	  else if(exc->type == UNDERFLOW)
-	     strcat(msg, "UNDERFLOW ");
-	  else if(exc->type == TLOSS)
-	     strcat(msg, "TLOSS ");
-	  else if(exc->type == PLOSS)
-	     strcat(msg, "PLOSS ");
-	  
-	  strcat(msg, vstrs[(int) V_ERROR]);
-
-	  _DtSimpleError (v->appname, DtWarning, NULL, msg);
-  }
-#endif
-
   doerr(vstrs[(int) V_ERROR]) ;
-  return(1) ;                     /* Value ignored. */
 }
 
 /* Convert string into an MP number. */
diff --git a/cde/programs/dtcalc/functions.c b/cde/programs/dtcalc/functions.c
index 8e3356a91..7e7041d71 100644
--- a/cde/programs/dtcalc/functions.c
+++ b/cde/programs/dtcalc/functions.c
@@ -42,7 +42,7 @@
 #endif
 #include "calctool.h"
 
-int matherr(struct exception *exc); // calctool.c
+void matherr(void); // calctool.c
 
 
 extern char *base_str[] ;       /* Strings for each base value. */
@@ -690,7 +690,7 @@ do_factorial(int *MPval, int *MPres)     /* Calculate the factorial of MPval. */
         }
       mpcim(&i, MPa) ;
       mpcmi(MP1, &i) ;
-      if (!i) matherr((struct exception *) NULL) ;
+      if (!i) matherr() ;
       else
         while (i > 0)
           {
@@ -700,7 +700,7 @@ do_factorial(int *MPval, int *MPres)     /* Calculate the factorial of MPval. */
             i-- ;
           }
     }
-  else matherr((struct exception *) NULL) ;
+  else matherr() ;
   mpstr(MPa, MPres) ;
 }