Fixed cider code for inclusion into ngspice.

src/ciderlib/input/doping.c

@@ -107,7 +107,7 @@ DOPparam(int param, IFvalue *value, void *inCard)
 	case DOP_DOMAIN:
 	    if ( !card->DOPdomainsGiven ) {
 	      card->DOPnumDomains = value->v.numValue;
-	      card->DOPdomains = (int *)xmalloc(value->v.numValue * sizeof(int));
+	      card->DOPdomains = (int *)tmalloc(value->v.numValue * sizeof(int));
 	      for ( i=0; i < card->DOPnumDomains; i++ ) {
 		  card->DOPdomains[i] = value->v.vec.iVec[i];
 	      }

src/ciderlib/oned/oneadmit.c

@@ -12,7 +12,7 @@ Author:	1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 #include "onedev.h"
 #include "onemesh.h"
 #include "complex.h"
-#include "spMatrix.h"
+#include "spmatrix.h"
 #include "ifsim.h"
 
 #include "onedext.h"

src/ciderlib/oned/onecond.c

@@ -11,7 +11,7 @@ Author:	1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 #include "onemesh.h"
 #include "onedev.h"
 #include "macros.h"
-#include "spMatrix.h"
+#include "spmatrix.h"
 
 #include "onedext.h"
 #include "oneddefs.h"

src/ciderlib/oned/onedest.c

@@ -8,7 +8,7 @@ Author:	1991 David A. Gates, U. C. Berkeley CAD Group
 #include "numenum.h"
 #include "onedev.h"
 #include "onemesh.h"
-#include "spMatrix.h"
+#include "spmatrix.h"
 #include "onedext.h"
 #include "oneddefs.h"
 

src/ciderlib/oned/onepoiss.c

@@ -10,7 +10,7 @@ Author:	1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 #include "onedev.h"
 #include "onedext.h"
 #include "oneddefs.h"
-#include "spMatrix.h"
+#include "spmatrix.h"
 
 /* Functions to setup and solve the 1D poisson equation. */
 

src/ciderlib/oned/oneprint.c

@@ -11,7 +11,7 @@ Author:	1992 David A. Gates, U. C. Berkeley CAD Group
 #include "onemesh.h"
 #include "onedev.h"
 #include "carddefs.h"
-#include "spMatrix.h"
+#include "spmatrix.h"
 #include "onedext.h"
 #include "oneddefs.h"
 

src/ciderlib/oned/oneproj.c

@@ -9,7 +9,7 @@ Author:	1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 #include "onemesh.h"
 #include "onedev.h"
 #include "macros.h"
-#include "spMatrix.h"
+#include "spmatrix.h"
 #include "bool.h"
 #include "onedext.h"
 #include "oneddefs.h"

src/ciderlib/oned/onesolve.c

@@ -13,7 +13,7 @@ Author:	1991 David A. Gates, U. C. Berkeley CAD Group
 #include "numenum.h"
 #include "onedev.h"
 #include "onemesh.h"
-#include "spMatrix.h"
+#include "spmatrix.h"
 #include "bool.h"
 #include "macros.h"
 #include "onedext.h"

src/ciderlib/support/misc.c

@@ -12,7 +12,7 @@ Author:	1992 David A. Gates, U. C. Berkeley CAD Group
 #include "ngspice.h"
 #include "numglobs.h"
 #include "numenum.h"
-#include "spMatrix.h"
+#include "spmatrix.h"
 
 
 /* Used in Solution Projection Calculations */

src/ciderlib/twod/twoadmit.c

@@ -12,7 +12,7 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 #include "twodev.h"
 #include "twomesh.h"
 #include "complex.h"
-#include "spMatrix.h"
+#include "spmatrix.h"
 #include "bool.h"
 #include "macros.h"
 #include "ifsim.h"

src/ciderlib/twod/twocond.c

@@ -11,7 +11,7 @@ Author:	1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 #include "twomesh.h"
 #include "twodev.h"
 #include "bool.h"
-#include "spMatrix.h"
+#include "spmatrix.h"
 #include "twoddefs.h"
 #include "twodext.h"
 

src/ciderlib/twod/twocont.c

@@ -10,7 +10,7 @@ Author:	1991 David A. Gates, U. C. Berkeley CAD Group
 #include "twomesh.h"
 #include "twodev.h"
 #include "bool.h"
-#include "spMatrix.h"
+#include "spmatrix.h"
 #include "twoddefs.h"
 #include "twodext.h"
 #include "cidersupt.h"

src/ciderlib/twod/twodest.c

@@ -8,7 +8,7 @@ Author:	1991 David A. Gates, U. C. Berkeley CAD Group
 #include "numenum.h"
 #include "twodev.h"
 #include "twomesh.h"
-#include "spMatrix.h"
+#include "spmatrix.h"
 #include "twoddefs.h"
 #include "twodext.h"
 

src/ciderlib/twod/twoncont.c

@@ -10,7 +10,7 @@ Author:	1991 David A. Gates, U. C. Berkeley CAD Group
 #include "twomesh.h"
 #include "twodev.h"
 #include "bool.h"
-#include "spMatrix.h"
+#include "spmatrix.h"
 #include "twoddefs.h"
 #include "twodext.h"
 #include "cidersupt.h"

src/ciderlib/twod/twopcont.c

@@ -10,7 +10,7 @@ Author:	1991 David A. Gates, U. C. Berkeley CAD Group
 #include "twomesh.h"
 #include "twodev.h"
 #include "bool.h"
-#include "spMatrix.h"
+#include "spmatrix.h"
 #include "twoddefs.h"
 #include "twodext.h"
 #include "cidersupt.h"

src/ciderlib/twod/twopoiss.c

@@ -9,7 +9,7 @@ Author:	1991 David A. Gates, U. C. Berkeley CAD Group
 #include "numenum.h"
 #include "twomesh.h"
 #include "twodev.h"
-#include "spMatrix.h"
+#include "spmatrix.h"
 #include "twoddefs.h"
 #include "twodext.h"
 

src/ciderlib/twod/twoprint.c

@@ -11,7 +11,7 @@ Author:	1992 David A. Gates, U. C. Berkeley CAD Group
 #include "twomesh.h"
 #include "twodev.h"
 #include "carddefs.h"
-#include "spMatrix.h"
+#include "spmatrix.h"
 #include "bool.h"
 #include "twoddefs.h"
 #include "twodext.h"

src/ciderlib/twod/twoproj.c

@@ -15,7 +15,7 @@ Author:	1991 David A. Gates, U. C. Berkeley CAD Group
 #include "twomesh.h"
 #include "twodev.h"
 #include "bool.h"
-#include "spMatrix.h"
+#include "spmatrix.h"
 #include "twoddefs.h"
 #include "twodext.h"
 #include "cidersupt.h"

src/ciderlib/twod/twosolve.c

@@ -9,8 +9,9 @@ Author:	1991 David A. Gates, U. C. Berkeley CAD Group
 #include "numenum.h"
 #include "twodev.h"
 #include "twomesh.h"
-#include "spMatrix.h"
+#include "spmatrix.h"
 #include "bool.h"
+#include "macros.h"
 #include "twoddefs.h"
 #include "twodext.h"
 #include "cidersupt.h"

src/spicelib/parser/inpgmod.c

@@ -242,7 +242,7 @@ INPparseNumMod( ckt, model, tab, errMessage )
 	        cardType = lastType;
                 while (*line == '+') line++;	/* Skip leading '+'s */
 	    } else {
-	        tmp = (char *)xmalloc((55)*sizeof(char));
+	        tmp = (char *)tmalloc((55)*sizeof(char));
 		(void) sprintf(tmp,
 		    "Error on card %d : illegal continuation \'+\' - ignored",
 		    cardNum);
@@ -275,7 +275,7 @@ INPparseNumMod( ckt, model, tab, errMessage )
 			cardType = E_MISSING;
 		    } else {
 		        /* Error */
-		        tmp =(char *)xmalloc((55+strlen(cardName))*sizeof(char));
+		        tmp =(char *)tmalloc((55+strlen(cardName))*sizeof(char));
 			(void) sprintf(tmp,
 			    "Error on card %d : unrecognized name (%s) - ignored",
 			    cardNum, cardName );
@@ -298,14 +298,14 @@ INPparseNumMod( ckt, model, tab, errMessage )
 		    idx = INPfindParm(parm, info->cardParms, info->numParms);
 		    if (idx == E_MISSING) {
 			/* parm not found */
-                        tmp = (char *)xmalloc((60+strlen(parm)) * sizeof(char));
+                        tmp = (char *)tmalloc((60+strlen(parm)) * sizeof(char));
                         (void)sprintf(tmp,
                             "Error on card %d : unrecognized parameter (%s) - ignored",
 			    cardNum, parm);
                         err = INPerrCat(err, tmp);
 		    } else if (idx == E_AMBIGUOUS) {
 			/* parm ambiguous */
-                        tmp = (char *)xmalloc((58+strlen(parm)) * sizeof(char));
+                        tmp = (char *)tmalloc((58+strlen(parm)) * sizeof(char));
                         (void)sprintf(tmp,
                             "Error on card %d : ambiguous parameter (%s) - ignored",
 			    cardNum, parm);
@@ -318,7 +318,7 @@ INPparseNumMod( ckt, model, tab, errMessage )
 			      == IF_FLAG) {
 			    value->iValue = 0;
 			  } else {
-                            tmp =(char *)xmalloc((63+strlen(parm))*sizeof(char));
+                            tmp =(char *)tmalloc((63+strlen(parm))*sizeof(char));
                             (void)sprintf(tmp,
                               "Error on card %d : non-boolean parameter (%s) - \'^\' ignored",
 			      cardNum, parm);