external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-03-09 15:50:02 +00:00
Code Issues Releases Wiki Activity

dtcalc: Change the prototype of matherr() to reflect actual usage and remove warnings.

Browse source
This commit is contained in:
Peter Howkins 2021-11-25 03:09:45 +00:00
parent 41dbfddc10
commit a9175c896d
2 changed files with 5 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

31
cde/programs/dtcalc/calctool.c
View file

@ -1214,38 +1214,11 @@ make_number(int *MPnumber, BOOLEAN mkFix)
} }
/*ARGSUSED*/
/* Default math library exception handling routine. */ /* Default math library exception handling routine. */
int void
matherr(struct exception *exc) 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]) ; doerr(vstrs[(int) V_ERROR]) ;
return(1) ; /* Value ignored. */
} }
/* Convert string into an MP number. */ /* Convert string into an MP number. */

6
cde/programs/dtcalc/functions.c
View file

@ -42,7 +42,7 @@
#endif #endif
#include "calctool.h" #include "calctool.h"
int matherr(struct exception *exc); // calctool.c void matherr(void); // calctool.c
extern char *base_str[] ; /* Strings for each base value. */ 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) ; mpcim(&i, MPa) ;
mpcmi(MP1, &i) ; mpcmi(MP1, &i) ;
if (!i) matherr((struct exception *) NULL) ; if (!i) matherr() ;
else else
while (i > 0) while (i > 0)
{ {
@ -700,7 +700,7 @@ do_factorial(int *MPval, int *MPres) /* Calculate the factorial of MPval. */
i-- ; i-- ;
} }
} }
else matherr((struct exception *) NULL) ; else matherr() ;
mpstr(MPa, MPres) ; mpstr(MPa, MPres) ;
} }