Nr 3/5 (x = ...) != 0 , swallow warnings

ChangeLog

@@ -1,3 +1,7 @@
+2010-11-19  Robert Larice
+ * */** :
+    Nr 3/5 (x = ...) != 0 , swallow warnings
+
 2010-11-19  Robert Larice
  * src/ngmultidec.c ,
  * src/frontend/inpcom.c ,

src/ciderlib/input/bdryset.c

@@ -143,7 +143,7 @@ BDRYsetup(BDRYcard *cardList, MESHcoord *xMeshList, MESHcoord *yMeshList,DOMNdom
   char ebuf[512];		/* error message buffer */
 
 /* Check the card list */
-  if ((error = BDRYcheck( cardList, domnList ))) return( error );
+  if ((error = BDRYcheck( cardList, domnList )) != 0) return( error );
 
 /* Find the limits on the indices */
   MESHiBounds( xMeshList, &ixMin, &ixMax );

src/ciderlib/input/contset.c

@@ -67,7 +67,7 @@ CONTsetup(CONTcard *cardList, ELCTelectrode *electrodeList)
   int error;
 
 /* Check the card list */
-  if ((error = CONTcheck( cardList ))) return( error );
+  if ((error = CONTcheck( cardList )) != 0) return( error );
 
   for ( card = cardList; card != NIL(CONTcard); card = card->CONTnextCard ) {
 

src/ciderlib/input/domnset.c

@@ -130,7 +130,7 @@ DOMNsetup(DOMNcard *cardList, DOMNdomain **domainList, MESHcoord *xMeshList,
   *domainList = NIL(DOMNdomain);
 
 /* Check the card list */
-  if ((error = DOMNcheck( cardList, materialList ))) return( error );
+  if ((error = DOMNcheck( cardList, materialList )) != 0) return( error );
 
 /* Find the limits on the indices */
   MESHiBounds( xMeshList, &ixMin, &ixMax );

src/ciderlib/input/dopset.c

@@ -207,7 +207,7 @@ DOPsetup(DOPcard *cardList, DOPprofile **profileList, DOPtable **tableList,
   *profileList = endProfile = NIL(DOPprofile);
 
 /* Check the card list */
-  if ((error = DOPcheck( cardList, xMeshList, yMeshList ))) return( error );
+  if ((error = DOPcheck( cardList, xMeshList, yMeshList )) != 0) return( error );
 
 /* Find the limits on locations */
   MESHlBounds( xMeshList, &xMin, &xMax );

src/ciderlib/input/elctset.c

@@ -101,7 +101,7 @@ ELCTsetup(ELCTcard *cardList, ELCTelectrode **electrodeList,
   *electrodeList = NIL(ELCTelectrode);
 
 /* Check the card list */
-  if ((error = ELCTcheck( cardList ))) return( error );
+  if ((error = ELCTcheck( cardList )) != 0) return( error );
 
 /* Find the limits on the indices */
   MESHiBounds( xMeshList, &ixMin, &ixMax );

src/ciderlib/input/matlset.c

@@ -91,7 +91,7 @@ int
   *materialList = NIL(MATLmaterial);
   
   /* Check the card list */
-  if ((error = MATLcheck( cardList ))) return( error );
+  if ((error = MATLcheck( cardList )) != 0) return( error );
   
   for ( card = cardList; card != NIL(MATLcard); card = card->MATLnextCard ) {
 

src/ciderlib/input/meshset.c

@@ -433,7 +433,7 @@ MESHsetup(char dim, MESHcard *cardList, MESHcoord **coordList, int *numCoords)
   *numCoords = totCoords = 0;
 
 /* Check the card list. */
-  if ((error = MESHcheck( dim, cardList ))) return( error );
+  if ((error = MESHcheck( dim, cardList )) != 0) return( error );
 
 /* Print info header. */ 
 #ifdef NOTDEF

src/ciderlib/input/mobset.c

@@ -92,7 +92,7 @@ MOBsetup(MOBcard *cardList, MaterialInfo *materialList)
   int error;
 
 /* Check the card list */
-  if ((error = MOBcheck( cardList, materialList ))) return( error );
+  if ((error = MOBcheck( cardList, materialList )) != 0) return( error );
 
   for ( card = cardList; card != NIL(MOBcard); card = card->MOBnextCard ) {
 

src/ciderlib/input/modlset.c

@@ -84,7 +84,7 @@ int
   int error;
 
   /* Check the card list */
-  if ((error = MODLcheck( cardList ))) return( error );
+  if ((error = MODLcheck( cardList )) != 0) return( error );
 
   /* Nothing else to do. */
   return( OK );

src/ciderlib/input/outpset.c

@@ -141,7 +141,7 @@ int
   int error;
 
   /* Check the card list */
-  if ((error = OUTPcheck( cardList ))) return( error );
+  if ((error = OUTPcheck( cardList )) != 0) return( error );
 
   return( OK );
 }

src/frontend/aspice.c

@@ -378,7 +378,7 @@ com_rspice(wordlist *wl)
     }
     if (p)
 	fputs(buf, out);
-    while ((n = fread(buf, 1, BSIZE_SP, serv))) {
+    while ((n = fread(buf, 1, BSIZE_SP, serv)) != 0) {
         (void) fwrite(buf, 1, n, out);
     }
     /* We hope that positioning info + error messages < pipe size */

src/frontend/variable.c

@@ -869,7 +869,7 @@ vcmp(const void *a, const void *b)
     int i;
     struct xxx *v1 = (struct xxx *) a;
     struct xxx *v2 = (struct xxx *) b;
-    if ((i = strcmp(v1->x_v->va_name, v2->x_v->va_name)))
+    if ((i = strcmp(v1->x_v->va_name, v2->x_v->va_name)) != 0)
         return (i);
     else
         return (v1->x_char - v2->x_char);

src/ngsconvert.c

@@ -352,7 +352,7 @@ main(int ac, char **av)
                 perror(infile);
                 exit(EXIT_BAD);
             }
-            while ((n = fread(buf, 1, sizeof(buf), stdin)))
+            while ((n = fread(buf, 1, sizeof(buf), stdin)) != 0)
                 (void) fwrite(buf, 1, n, fp);
             (void) fclose(fp);
             break;
@@ -424,7 +424,7 @@ main(int ac, char **av)
             perror(outfile);
             exit(EXIT_BAD);
         }
-        while ((n = fread(buf, 1, sizeof(buf), fp)))
+        while ((n = fread(buf, 1, sizeof(buf), fp)) != 0)
             (void) fwrite(buf, 1, n, stdout);
         (void) fclose(fp);
         (void) unlink(infile);

src/spicelib/devices/bjt/bjtsacl.c

@@ -154,7 +154,7 @@ BJTsAcLoad(GENmodel *inModel, CKTcircuit *ckt)
 
                 /* store the  unperturbed values of small signal parameters */
 
-	      if ((error = BJTload((GENmodel*)model,ckt)))
+	      if ((error = BJTload((GENmodel*)model,ckt)) != 0)
 		     return(error);
 
                 *(here->BJTsenGpi)= *(ckt->CKTstate0 + here->BJTgpi);
@@ -271,7 +271,7 @@ BJTsAcLoad(GENmodel *inModel, CKTcircuit *ckt)
                 /* store the  small signal parameters 
                  * corresponding to perturbed area 
                  */
-                if ((error = BJTload((GENmodel*)model,ckt)))
+                if ((error = BJTload((GENmodel*)model,ckt)) != 0)
 		  return(error);
 
                 *(here->BJTsenGpi + 1)= *(ckt->CKTstate0 + here->BJTgpi);
@@ -311,7 +311,7 @@ pertvbx:    /* Perturbation of vbx */
                 /* store the  small signal parameters 
                  * corresponding to perturbed vbx 
                  */
-                if ((error = BJTload((GENmodel*)model,ckt)))
+                if ((error = BJTload((GENmodel*)model,ckt)) != 0)
 		  return(error);
 
                 *(here->BJTsenGpi + 2)= *(ckt->CKTstate0 + here->BJTgpi);
@@ -351,7 +351,7 @@ pertvbe:    /* Perturbation of vbe */
                 /* store the  small signal parameters 
                  * corresponding to perturbed vbe 
                  */
-                if ((error = BJTload((GENmodel*)model,ckt)))
+                if ((error = BJTload((GENmodel*)model,ckt)) != 0)
 		  return(error);
 
                 *(here->BJTsenGpi + 3)= *(ckt->CKTstate0 + here->BJTgpi);
@@ -394,7 +394,7 @@ pertvbc:    /* Perturbation of vbc */
                 /* store the  small signal parameters 
                  * corresponding to perturbed vbc 
                  */
-                if ((error = BJTload((GENmodel*)model,ckt)))
+                if ((error = BJTload((GENmodel*)model,ckt)) != 0)
 		  return(error);
                 *(here->BJTsenGpi + 4)= *(ckt->CKTstate0 + here->BJTgpi);
                 *(here->BJTsenGmu + 4)= *(ckt->CKTstate0 + here->BJTgmu);
@@ -434,7 +434,7 @@ pertvcs:    /* Perturbation of vcs */
                 /* store the  small signal parameters 
                  * corresponding to perturbed vcs 
                  */
-                if ((error = BJTload((GENmodel*)model,ckt)))
+                if ((error = BJTload((GENmodel*)model,ckt)) != 0)
 		  return(error);
                 *(here->BJTsenCcs + 5)= *(ckt->CKTstate0 + here->BJTcqcs);
 

src/spicelib/devices/bjt2/bjt2sacl.c

@@ -155,7 +155,7 @@ BJT2sAcLoad(GENmodel *inModel, CKTcircuit *ckt)
 
                 /* store the  unperturbed values of small signal parameters */
 
-                if ((error = BJT2load((GENmodel*)model,ckt))) return(error);
+                if ((error = BJT2load((GENmodel*)model,ckt)) != 0) return(error);
 
                 *(here->BJT2senGpi)= *(ckt->CKTstate0 + here->BJT2gpi);
                 *(here->BJT2senGmu)= *(ckt->CKTstate0 + here->BJT2gmu);
@@ -271,7 +271,7 @@ BJT2sAcLoad(GENmodel *inModel, CKTcircuit *ckt)
                 /* store the  small signal parameters 
                  * corresponding to perturbed area 
                  */
-                if ((error = BJT2load((GENmodel*)model,ckt))) return(error);
+                if ((error = BJT2load((GENmodel*)model,ckt)) != 0) return(error);
 
                 *(here->BJT2senGpi + 1)= *(ckt->CKTstate0 + here->BJT2gpi);
                 *(here->BJT2senGmu + 1)= *(ckt->CKTstate0 + here->BJT2gmu);
@@ -310,7 +310,7 @@ pertvbx:    /* Perturbation of vbx */
                 /* store the  small signal parameters 
                  * corresponding to perturbed vbx 
                  */
-                if((error = BJT2load((GENmodel*)model,ckt))) return(error);
+                if ((error = BJT2load((GENmodel*)model,ckt)) != 0) return(error);
 
                 *(here->BJT2senGpi + 2)= *(ckt->CKTstate0 + here->BJT2gpi);
                 *(here->BJT2senGmu + 2)= *(ckt->CKTstate0 + here->BJT2gmu);
@@ -349,7 +349,7 @@ pertvbe:    /* Perturbation of vbe */
                 /* store the  small signal parameters 
                  * corresponding to perturbed vbe 
                  */
-                if((error = BJT2load((GENmodel*)model,ckt))) return(error);
+                if ((error = BJT2load((GENmodel*)model,ckt)) != 0) return(error);
 
                 *(here->BJT2senGpi + 3)= *(ckt->CKTstate0 + here->BJT2gpi);
                 *(here->BJT2senGmu + 3)= *(ckt->CKTstate0 + here->BJT2gmu);
@@ -391,7 +391,7 @@ pertvbc:    /* Perturbation of vbc */
                 /* store the  small signal parameters 
                  * corresponding to perturbed vbc 
                  */
-                if((error = BJT2load((GENmodel*)model,ckt))) return(error);
+                if ((error = BJT2load((GENmodel*)model,ckt)) != 0) return(error);
                 *(here->BJT2senGpi + 4)= *(ckt->CKTstate0 + here->BJT2gpi);
                 *(here->BJT2senGmu + 4)= *(ckt->CKTstate0 + here->BJT2gmu);
                 *(here->BJT2senGm + 4)= *(ckt->CKTstate0 + here->BJT2gm);
@@ -430,7 +430,7 @@ pertvcs:    /* Perturbation of vcs */
                 /* store the  small signal parameters 
                  * corresponding to perturbed vcs 
                  */
-                if((error = BJT2load((GENmodel*)model,ckt))) return(error);
+                if ((error = BJT2load((GENmodel*)model,ckt)) != 0) return(error);
                 *(here->BJT2senCsub + 5)= *(ckt->CKTstate0 + here->BJT2cqsub);
 
             }

src/spicelib/devices/bsim3soi_dd/b3soiddld.c

@@ -4222,44 +4222,44 @@ if (here->B3SOIDDdebugMod > 2)
 /*  Here NaN will be detected in any conductance or equivalent current.  Note
     that nandetect is initialized within the "if" statements  */
 
-                   if ((nandetect = isnan (*(here->B3SOIDDGbPtr))))
+                   if ((nandetect = isnan (*(here->B3SOIDDGbPtr))) != 0)
                       { strcpy (nanmessage, "GbPtr"); }
-                   else if ((nandetect = isnan (*(here->B3SOIDDEbPtr))))
+                   else if ((nandetect = isnan (*(here->B3SOIDDEbPtr))) != 0)
                       { strcpy (nanmessage, "EbPtr"); }
-                   else if ((nandetect = isnan (*(here->B3SOIDDDPbPtr))))
+                   else if ((nandetect = isnan (*(here->B3SOIDDDPbPtr))) != 0)
                       { strcpy (nanmessage, "DPbPtr"); }
-                   else if ((nandetect = isnan (*(here->B3SOIDDSPbPtr))))
+                   else if ((nandetect = isnan (*(here->B3SOIDDSPbPtr))) != 0)
                       { strcpy (nanmessage, "SPbPtr"); }
-                   else if ((nandetect = isnan (*(here->B3SOIDDBbPtr))))
+                   else if ((nandetect = isnan (*(here->B3SOIDDBbPtr))) != 0)
                       { strcpy (nanmessage, "BbPtr"); }
-                   else if ((nandetect = isnan (*(here->B3SOIDDBgPtr))))
+                   else if ((nandetect = isnan (*(here->B3SOIDDBgPtr))) != 0)
                       { strcpy (nanmessage, "BgPtr"); }
-                   else if ((nandetect = isnan (*(here->B3SOIDDBePtr))))
+                   else if ((nandetect = isnan (*(here->B3SOIDDBePtr))) != 0)
                       { strcpy (nanmessage, "BePtr"); }
-                   else if ((nandetect = isnan (*(here->B3SOIDDBdpPtr))))
+                   else if ((nandetect = isnan (*(here->B3SOIDDBdpPtr))) != 0)
                       { strcpy (nanmessage, "BdpPtr"); }
-                   else if ((nandetect = isnan (*(here->B3SOIDDBspPtr))))
+                   else if ((nandetect = isnan (*(here->B3SOIDDBspPtr))) != 0)
                       { strcpy (nanmessage, "BspPtr"); }
                    
-                   if ((nandetect = isnan (*(here->B3SOIDDGgPtr))))
+                   if ((nandetect = isnan (*(here->B3SOIDDGgPtr))) != 0)
                    { strcpy (nanmessage, "GgPtr"); }
-                   else if ((nandetect = isnan (*(here->B3SOIDDGdpPtr))))
+                   else if ((nandetect = isnan (*(here->B3SOIDDGdpPtr))) != 0)
                    { strcpy (nanmessage, "GdpPtr"); }
-                   else if ((nandetect = isnan (*(here->B3SOIDDGspPtr))))
+                   else if ((nandetect = isnan (*(here->B3SOIDDGspPtr))) != 0)
                    { strcpy (nanmessage, "GspPtr"); }
-                   else if ((nandetect = isnan (*(here->B3SOIDDDPgPtr))))
+                   else if ((nandetect = isnan (*(here->B3SOIDDDPgPtr))) != 0)
                    { strcpy (nanmessage, "DPgPtr"); }
-                   else if ((nandetect = isnan (*(here->B3SOIDDDPdpPtr))))
+                   else if ((nandetect = isnan (*(here->B3SOIDDDPdpPtr))) != 0)
                    { strcpy (nanmessage, "DPdpPtr"); }
-                   else if ((nandetect = isnan (*(here->B3SOIDDDPspPtr))))
+                   else if ((nandetect = isnan (*(here->B3SOIDDDPspPtr))) != 0)
                    { strcpy (nanmessage, "DPspPtr"); }
-                   else if ((nandetect = isnan (*(here->B3SOIDDSPgPtr))))
+                   else if ((nandetect = isnan (*(here->B3SOIDDSPgPtr))) != 0)
                    { strcpy (nanmessage, "SPgPtr"); }
-                   else if ((nandetect = isnan (*(here->B3SOIDDSPdpPtr))))
+                   else if ((nandetect = isnan (*(here->B3SOIDDSPdpPtr))) != 0)
                    { strcpy (nanmessage, "SPdpPtr"); }
-                   else if ((nandetect = isnan (*(here->B3SOIDDSPspPtr))))
+                   else if ((nandetect = isnan (*(here->B3SOIDDSPspPtr))) != 0)
                    { strcpy (nanmessage, "SPspPtr"); }
-                   else if ((nandetect = isnan (*(here->B3SOIDDEePtr))))
+                   else if ((nandetect = isnan (*(here->B3SOIDDEePtr))) != 0)
                    { strcpy (nanmessage, "EePtr"); }
  
                    /*  At this point, nandetect = 0 if none of the
@@ -4267,17 +4267,17 @@ if (here->B3SOIDDdebugMod > 2)
  
                    if (nandetect == 0)
                    {
-                     if ((nandetect = isnan (*(here->B3SOIDDEgPtr))))
+                     if ((nandetect = isnan (*(here->B3SOIDDEgPtr))) != 0)
                       { strcpy (nanmessage, "EgPtr"); }
-                     else if ((nandetect = isnan (*(here->B3SOIDDEdpPtr))))
+                     else if ((nandetect = isnan (*(here->B3SOIDDEdpPtr))) != 0)
                       { strcpy (nanmessage, "EdpPtr"); }
-                     else if ((nandetect = isnan (*(here->B3SOIDDEspPtr))))
+                     else if ((nandetect = isnan (*(here->B3SOIDDEspPtr))) != 0)
                       { strcpy (nanmessage, "EspPtr"); }
-                     else if ((nandetect = isnan (*(here->B3SOIDDGePtr))))
+                     else if ((nandetect = isnan (*(here->B3SOIDDGePtr))) != 0)
                       { strcpy (nanmessage, "GePtr"); }
-                     else if ((nandetect = isnan (*(here->B3SOIDDDPePtr))))
+                     else if ((nandetect = isnan (*(here->B3SOIDDDPePtr))) != 0)
                       { strcpy (nanmessage, "DPePtr"); }
-                     else if ((nandetect = isnan (*(here->B3SOIDDSPePtr))))
+                     else if ((nandetect = isnan (*(here->B3SOIDDSPePtr))) != 0)
                       { strcpy (nanmessage, "SPePtr"); } }
  
                    /*  Now check if self-heating caused NaN if nothing else
@@ -4285,29 +4285,29 @@ if (here->B3SOIDDdebugMod > 2)
  
                    if (selfheat && nandetect == 0)
                    {
-                     if ((nandetect = isnan (*(here->B3SOIDDTemptempPtr))))
+                     if ((nandetect = isnan (*(here->B3SOIDDTemptempPtr))) != 0)
                       { strcpy (nanmessage, "TemptempPtr"); }
-                     else if ((nandetect = isnan (*(here->B3SOIDDTempgPtr))))
+                     else if ((nandetect = isnan (*(here->B3SOIDDTempgPtr))) != 0)
                       { strcpy (nanmessage, "TempgPtr"); }
-                     else if ((nandetect = isnan (*(here->B3SOIDDTempbPtr))))
+                     else if ((nandetect = isnan (*(here->B3SOIDDTempbPtr))) != 0)
                       { strcpy (nanmessage, "TempbPtr"); }
-                     else if ((nandetect = isnan (*(here->B3SOIDDTempePtr))))
+                     else if ((nandetect = isnan (*(here->B3SOIDDTempePtr))) != 0)
                       { strcpy (nanmessage, "TempePtr"); }
-                     else if ((nandetect = isnan (*(here->B3SOIDDTempdpPtr))))
+                     else if ((nandetect = isnan (*(here->B3SOIDDTempdpPtr))) != 0)
                       { strcpy (nanmessage, "TempdpPtr"); }
-                     else if ((nandetect = isnan (*(here->B3SOIDDTempspPtr))))
+                     else if ((nandetect = isnan (*(here->B3SOIDDTempspPtr))) != 0)
                       { strcpy (nanmessage, "TempspPtr"); }
-                     else if ((nandetect = isnan (*(here->B3SOIDDGtempPtr))))
+                     else if ((nandetect = isnan (*(here->B3SOIDDGtempPtr))) != 0)
                       { strcpy (nanmessage, "GtempPtr"); }
-                     else if ((nandetect = isnan (*(here->B3SOIDDDPtempPtr))))
+                     else if ((nandetect = isnan (*(here->B3SOIDDDPtempPtr))) != 0)
                       { strcpy (nanmessage, "DPtempPtr"); }
-                     else if ((nandetect = isnan (*(here->B3SOIDDSPtempPtr))))
+                     else if ((nandetect = isnan (*(here->B3SOIDDSPtempPtr))) != 0)
                       { strcpy (nanmessage, "SPtempPtr"); }
-                     else if ((nandetect = isnan (*(here->B3SOIDDEtempPtr))))
+                     else if ((nandetect = isnan (*(here->B3SOIDDEtempPtr))) != 0)
                       { strcpy (nanmessage, "EtempPtr"); }
-                     else if ((nandetect = isnan (*(here->B3SOIDDBtempPtr))))
+                     else if ((nandetect = isnan (*(here->B3SOIDDBtempPtr))) != 0)
                       { strcpy (nanmessage, "BtempPtr"); }
-                     else if ((nandetect = isnan (*(ckt->CKTrhs + here->B3SOIDDtempNode))))
+                     else if ((nandetect = isnan (*(ckt->CKTrhs + here->B3SOIDDtempNode))) != 0)
                       { strcpy (nanmessage, "tempNode"); }
                    }
  
@@ -4317,19 +4317,19 @@ if (here->B3SOIDDdebugMod > 2)
                    if (nandetect == 0)
                    {
                       if ((nandetect = isnan (*(ckt->CKTrhs
-                                                + here->B3SOIDDgNode))))
+                                                + here->B3SOIDDgNode))) != 0)
                       { strcpy (nanmessage, "gNode"); }
                       else if ((nandetect = isnan (*(ckt->CKTrhs
-                                                     + here->B3SOIDDbNode))))
+                                                     + here->B3SOIDDbNode))) != 0)
                       { strcpy (nanmessage, "bNode"); }
                       else if ((nandetect = isnan (*(ckt->CKTrhs
-                                                     + here->B3SOIDDdNodePrime))))
+                                                     + here->B3SOIDDdNodePrime))) != 0)
                       { strcpy (nanmessage, "dpNode"); }
                       else if ((nandetect = isnan (*(ckt->CKTrhs
-                                                     + here->B3SOIDDsNodePrime))))
+                                                     + here->B3SOIDDsNodePrime))) != 0)
                       { strcpy (nanmessage, "spNode"); }
                       else if ((nandetect = isnan (*(ckt->CKTrhs
-                                                     + here->B3SOIDDeNode))))
+                                                     + here->B3SOIDDeNode))) != 0)
                       { strcpy (nanmessage, "eNode"); } 
                    }
 

src/spicelib/devices/bsim3soi_fd/b3soifdld.c

@@ -3329,25 +3329,25 @@ if (here->B3SOIFDdebugMod > 2)
 /*  Here NaN will be detected in any conductance or equivalent current.  Note
     that nandetect is initialized within the "if" statements  */
 
-                   if ((nandetect = isnan (*(here->B3SOIFDGgPtr))))
+                   if ((nandetect = isnan (*(here->B3SOIFDGgPtr))) != 0)
                    { strcpy (nanmessage, "GgPtr"); }
-                   else if ((nandetect = isnan (*(here->B3SOIFDGdpPtr))))
+                   else if ((nandetect = isnan (*(here->B3SOIFDGdpPtr))) != 0)
                    { strcpy (nanmessage, "GdpPtr"); }
-                   else if ((nandetect = isnan (*(here->B3SOIFDGspPtr))))
+                   else if ((nandetect = isnan (*(here->B3SOIFDGspPtr))) != 0)
                    { strcpy (nanmessage, "GspPtr"); }
-                   else if ((nandetect = isnan (*(here->B3SOIFDDPgPtr))))
+                   else if ((nandetect = isnan (*(here->B3SOIFDDPgPtr))) != 0)
                    { strcpy (nanmessage, "DPgPtr"); }
-                   else if ((nandetect = isnan (*(here->B3SOIFDDPdpPtr))))
+                   else if ((nandetect = isnan (*(here->B3SOIFDDPdpPtr))) != 0)
                    { strcpy (nanmessage, "DPdpPtr"); }
-                   else if ((nandetect = isnan (*(here->B3SOIFDDPspPtr))))
+                   else if ((nandetect = isnan (*(here->B3SOIFDDPspPtr))) != 0)
                    { strcpy (nanmessage, "DPspPtr"); }
-                   else if ((nandetect = isnan (*(here->B3SOIFDSPgPtr))))
+                   else if ((nandetect = isnan (*(here->B3SOIFDSPgPtr))) != 0)
                    { strcpy (nanmessage, "SPgPtr"); }
-                   else if ((nandetect = isnan (*(here->B3SOIFDSPdpPtr))))
+                   else if ((nandetect = isnan (*(here->B3SOIFDSPdpPtr))) != 0)
                    { strcpy (nanmessage, "SPdpPtr"); }
-                   else if ((nandetect = isnan (*(here->B3SOIFDSPspPtr))))
+                   else if ((nandetect = isnan (*(here->B3SOIFDSPspPtr))) != 0)
                    { strcpy (nanmessage, "SPspPtr"); }
-                   else if ((nandetect = isnan (*(here->B3SOIFDEePtr))))
+                   else if ((nandetect = isnan (*(here->B3SOIFDEePtr))) != 0)
                    { strcpy (nanmessage, "EePtr"); }
  
                    /*  At this point, nandetect = 0 if none of the
@@ -3355,17 +3355,17 @@ if (here->B3SOIFDdebugMod > 2)
  
                    if (nandetect == 0)
                    {
-                     if ((nandetect = isnan (*(here->B3SOIFDEgPtr))))
+                     if ((nandetect = isnan (*(here->B3SOIFDEgPtr))) != 0)
                       { strcpy (nanmessage, "EgPtr"); }
-                     else if ((nandetect = isnan (*(here->B3SOIFDEdpPtr))))
+                     else if ((nandetect = isnan (*(here->B3SOIFDEdpPtr))) != 0)
                       { strcpy (nanmessage, "EdpPtr"); }
-                     else if ((nandetect = isnan (*(here->B3SOIFDEspPtr))))
+                     else if ((nandetect = isnan (*(here->B3SOIFDEspPtr))) != 0)
                       { strcpy (nanmessage, "EspPtr"); }
-                     else if ((nandetect = isnan (*(here->B3SOIFDGePtr))))
+                     else if ((nandetect = isnan (*(here->B3SOIFDGePtr))) != 0)
                       { strcpy (nanmessage, "GePtr"); }
-                     else if ((nandetect = isnan (*(here->B3SOIFDDPePtr))))
+                     else if ((nandetect = isnan (*(here->B3SOIFDDPePtr))) != 0)
                       { strcpy (nanmessage, "DPePtr"); }
-                     else if ((nandetect = isnan (*(here->B3SOIFDSPePtr))))
+                     else if ((nandetect = isnan (*(here->B3SOIFDSPePtr))) != 0)
                       { strcpy (nanmessage, "SPePtr"); } }
  
                    /*  Now check if self-heating caused NaN if nothing else
@@ -3373,29 +3373,29 @@ if (here->B3SOIFDdebugMod > 2)
  
                    if (selfheat && nandetect == 0)
                    {
-                     if ((nandetect = isnan (*(here->B3SOIFDTemptempPtr))))
+                     if ((nandetect = isnan (*(here->B3SOIFDTemptempPtr))) != 0)
                       { strcpy (nanmessage, "TemptempPtr"); }
-                     else if ((nandetect = isnan (*(here->B3SOIFDTempgPtr))))
+                     else if ((nandetect = isnan (*(here->B3SOIFDTempgPtr))) != 0)
                       { strcpy (nanmessage, "TempgPtr"); }
-                     else if ((nandetect = isnan (*(here->B3SOIFDTempbPtr))))
+                     else if ((nandetect = isnan (*(here->B3SOIFDTempbPtr))) != 0)
                       { strcpy (nanmessage, "TempbPtr"); }
-                     else if ((nandetect = isnan (*(here->B3SOIFDTempePtr))))
+                     else if ((nandetect = isnan (*(here->B3SOIFDTempePtr))) != 0)
                       { strcpy (nanmessage, "TempePtr"); }
-                     else if ((nandetect = isnan (*(here->B3SOIFDTempdpPtr))))
+                     else if ((nandetect = isnan (*(here->B3SOIFDTempdpPtr))) != 0)
                       { strcpy (nanmessage, "TempdpPtr"); }
-                     else if ((nandetect = isnan (*(here->B3SOIFDTempspPtr))))
+                     else if ((nandetect = isnan (*(here->B3SOIFDTempspPtr))) != 0)
                       { strcpy (nanmessage, "TempspPtr"); }
-                     else if ((nandetect = isnan (*(here->B3SOIFDGtempPtr))))
+                     else if ((nandetect = isnan (*(here->B3SOIFDGtempPtr))) != 0)
                       { strcpy (nanmessage, "GtempPtr"); }
-                     else if ((nandetect = isnan (*(here->B3SOIFDDPtempPtr))))
+                     else if ((nandetect = isnan (*(here->B3SOIFDDPtempPtr))) != 0)
                       { strcpy (nanmessage, "DPtempPtr"); }
-                     else if ((nandetect = isnan (*(here->B3SOIFDSPtempPtr))))
+                     else if ((nandetect = isnan (*(here->B3SOIFDSPtempPtr))) != 0)
                       { strcpy (nanmessage, "SPtempPtr"); }
-                     else if ((nandetect = isnan (*(here->B3SOIFDEtempPtr))))
+                     else if ((nandetect = isnan (*(here->B3SOIFDEtempPtr))) != 0)
                       { strcpy (nanmessage, "EtempPtr"); }
-                     else if ((nandetect = isnan (*(here->B3SOIFDBtempPtr))))
+                     else if ((nandetect = isnan (*(here->B3SOIFDBtempPtr))) != 0)
                       { strcpy (nanmessage, "BtempPtr"); }
-                     else if ((nandetect = isnan (*(ckt->CKTrhs + here->B3SOIFDtempNode))))
+                     else if ((nandetect = isnan (*(ckt->CKTrhs + here->B3SOIFDtempNode))) != 0)
                       { strcpy (nanmessage, "tempNode"); }
                    }
  
@@ -3405,19 +3405,19 @@ if (here->B3SOIFDdebugMod > 2)
                    if (nandetect == 0)
                    {
                       if ((nandetect = isnan (*(ckt->CKTrhs
-                                                + here->B3SOIFDgNode))))
+                                                + here->B3SOIFDgNode))) != 0)
                       { strcpy (nanmessage, "gNode"); }
                       else if ((nandetect = isnan (*(ckt->CKTrhs
-                                                     + here->B3SOIFDbNode))))
+                                                     + here->B3SOIFDbNode))) != 0)
                       { strcpy (nanmessage, "bNode"); }
                       else if ((nandetect = isnan (*(ckt->CKTrhs
-                                                     + here->B3SOIFDdNodePrime))))
+                                                     + here->B3SOIFDdNodePrime))) != 0)
                       { strcpy (nanmessage, "dpNode"); }
                       else if ((nandetect = isnan (*(ckt->CKTrhs
-                                                  + here->B3SOIFDsNodePrime))))
+                                                  + here->B3SOIFDsNodePrime))) != 0)
                       { strcpy (nanmessage, "spNode"); }
                       else if ((nandetect = isnan (*(ckt->CKTrhs
-                                                     + here->B3SOIFDeNode))))
+                                                     + here->B3SOIFDeNode))) != 0)
                       { strcpy (nanmessage, "eNode"); } 
                    }
 

src/spicelib/devices/dio/diosacl.c

@@ -102,7 +102,7 @@ DIOsAcLoad(GENmodel *inModel, CKTcircuit *ckt)
 
             here->DIOsenPertFlag = ON;
             if(info->SENacpertflag == 1){
-                if ((error = DIOload((GENmodel*)model,ckt)))
+                if ((error = DIOload((GENmodel*)model,ckt)) != 0)
 		  return(error);
 
                 *(here->DIOsenGeq) =  *(ckt->CKTstate0 + here->DIOconduct);
@@ -139,7 +139,7 @@ DIOsAcLoad(GENmodel *inModel, CKTcircuit *ckt)
             if(info->SENacpertflag == 1){
                 here->DIOarea = Apert;
                 *(ckt->CKTstate0 + here->DIOvoltage) = vdOp;
-                if ((error = DIOload((GENmodel*)model,ckt)))
+                if ((error = DIOload((GENmodel*)model,ckt)) != 0)
 		  return(error);
 
                 *(here->DIOsenGeq + 1) =  *(ckt->CKTstate0 + here->DIOconduct);
@@ -166,7 +166,7 @@ pertvd:     /* Perturbation of Diode Voltage */
 
             if(info->SENacpertflag == 1){
                 *(ckt->CKTstate0 + here->DIOvoltage) = Apert;
-                if ((error = DIOload((GENmodel*)model,ckt)))
+                if ((error = DIOload((GENmodel*)model,ckt)) != 0)
 		  return(error);
 
                 *(here->DIOsenGeq + 2) =  *(ckt->CKTstate0 + here->DIOconduct);

src/spicelib/devices/hisim/hsm1ld.c

@@ -1083,9 +1083,9 @@ int HSM1load(GENmodel *inModel, register CKTcircuit *ckt)
       *(ckt->CKTstate1 + here->HSM1qd) = *(ckt->CKTstate0 + here->HSM1qd);
     }
     
-    if ((error = NIintegrate(ckt, &geq, &ceq, 0.0, here->HSM1qb))) return(error);
-    if ((error = NIintegrate(ckt, &geq, &ceq, 0.0, here->HSM1qg))) return(error);
-    if ((error = NIintegrate(ckt, &geq, &ceq, 0.0, here->HSM1qd))) return(error);
+    if ((error = NIintegrate(ckt, &geq, &ceq, 0.0, here->HSM1qb)) != 0) return(error);
+    if ((error = NIintegrate(ckt, &geq, &ceq, 0.0, here->HSM1qg)) != 0) return(error);
+    if ((error = NIintegrate(ckt, &geq, &ceq, 0.0, here->HSM1qd)) != 0) return(error);
 
     goto line860;
     

src/spicelib/devices/mos1/mos1sacl.c

@@ -232,7 +232,7 @@ MOS1sAcLoad(GENmodel *inModel, CKTcircuit *ckt)
             here->MOS1senPertFlag = ON ;
             if(info->SENacpertflag == 1){
                 /* store the  unperturbed values of small signal parameters */
-                if((error = MOS1load((GENmodel*)model,ckt)))
+                if((error = MOS1load((GENmodel*)model,ckt)) != 0)
 		  return(error);
                 *(here->MOS1senCgs) = here->MOS1cgs;
                 *(here->MOS1senCgd) = here->MOS1cgd;
@@ -323,7 +323,7 @@ MOS1sAcLoad(GENmodel *inModel, CKTcircuit *ckt)
                 *(ckt->CKTstate0 + here->MOS1vbs) = Apert;
                 *(ckt->CKTstate0 + here->MOS1vbd) = vbdOp;
 
-                if((error = MOS1load((GENmodel*)model,ckt)))
+                if((error = MOS1load((GENmodel*)model,ckt)) != 0)
 		  return(error);
 
                 *(here->MOS1senCgs + 1) = here->MOS1cgs;
@@ -362,7 +362,7 @@ pertvbd:  /* Perturbation of vbd */
                 *(ckt->CKTstate0 + here->MOS1vbs) = vbsOp;
                 *(ckt->CKTstate0 + here->MOS1vbd) = Apert;
 
-                if((error = MOS1load((GENmodel*)model,ckt)))
+                if((error = MOS1load((GENmodel*)model,ckt)) != 0)
 		  return(error);
 
                 *(here->MOS1senCgs + 2) = here->MOS1cgs;
@@ -402,7 +402,7 @@ pertvgb:  /* Perturbation of vgb */
                 *(ckt->CKTstate0 + here->MOS1vbd) = vbdOp;
                 *(ckt->CKTrhsOp + here->MOS1bNode) -= DELA; 
 
-                if((error = MOS1load((GENmodel*)model,ckt)))
+                if((error = MOS1load((GENmodel*)model,ckt)) != 0)
 		  return(error);
 
                 *(here->MOS1senCgs + 3) = here->MOS1cgs;
@@ -443,7 +443,7 @@ pertl:    /* Perturbation of length */
                 *(ckt->CKTstate0 + here->MOS1vbs) = vbsOp;
                 *(ckt->CKTstate0 + here->MOS1vbd) = vbdOp;
 
-                if ((error = MOS1load((GENmodel*)model,ckt)))
+                if ((error = MOS1load((GENmodel*)model,ckt)) != 0)
 		  return(error);
 
                 *(here->MOS1senCgs + 4) = here->MOS1cgs;
@@ -544,7 +544,7 @@ pertw:    /* Perturbation of width */
                 *(ckt->CKTstate0 + here->MOS1vbs) = vbsOp;
                 *(ckt->CKTstate0 + here->MOS1vbd) = vbdOp;
 
-                if ((error = MOS1load((GENmodel*)model,ckt)))
+                if ((error = MOS1load((GENmodel*)model,ckt)) != 0)
 		  return(error);
 
                 *(here->MOS1senCgs + 5) = here->MOS1cgs;

src/spicelib/devices/mos2/mos2sacl.c

@@ -232,7 +232,7 @@ MOS2sAcLoad(GENmodel *inModel, CKTcircuit *ckt)
             here->MOS2senPertFlag = ON ;
             if(info->SENacpertflag == 1){
                 /* store the  unperturbed values of small signal parameters */
-                if((error = MOS2load((GENmodel*)model,ckt)))
+                if((error = MOS2load((GENmodel*)model,ckt)) != 0)
 		  return(error);
                 *(here->MOS2senCgs) = here->MOS2cgs;
                 *(here->MOS2senCgd) = here->MOS2cgd;
@@ -323,7 +323,7 @@ MOS2sAcLoad(GENmodel *inModel, CKTcircuit *ckt)
                 *(ckt->CKTstate0 + here->MOS2vbs) = Apert;
                 *(ckt->CKTstate0 + here->MOS2vbd) = vbdOp;
 
-                if((error = MOS2load((GENmodel*)model,ckt)))
+                if((error = MOS2load((GENmodel*)model,ckt)) != 0)
 		  return(error);
 
                 *(here->MOS2senCgs + 1) = here->MOS2cgs;
@@ -362,7 +362,7 @@ pertvbd:  /* Perturbation of vbd */
                 *(ckt->CKTstate0 + here->MOS2vbs) = vbsOp;
                 *(ckt->CKTstate0 + here->MOS2vbd) = Apert;
 
-                if((error = MOS2load((GENmodel*)model,ckt)))
+                if((error = MOS2load((GENmodel*)model,ckt)) != 0)
 		  return(error);
 
                 *(here->MOS2senCgs + 2) = here->MOS2cgs;
@@ -402,7 +402,7 @@ pertvgb:  /* Perturbation of vgb */
                 *(ckt->CKTstate0 + here->MOS2vbd) = vbdOp;
                 *(ckt->CKTrhsOp + here->MOS2bNode) -= DELA; 
 
-                if((error = MOS2load((GENmodel*)model,ckt)))
+                if((error = MOS2load((GENmodel*)model,ckt)) != 0)
 		  return(error);
 
                 *(here->MOS2senCgs + 3) = here->MOS2cgs;
@@ -443,7 +443,7 @@ pertl:    /* Perturbation of length */
                 *(ckt->CKTstate0 + here->MOS2vbs) = vbsOp;
                 *(ckt->CKTstate0 + here->MOS2vbd) = vbdOp;
 
-                if((error = MOS2load((GENmodel*)model,ckt))) return(error);
+                if((error = MOS2load((GENmodel*)model,ckt)) != 0) return(error);
 
                 *(here->MOS2senCgs + 4) = here->MOS2cgs;
                 *(here->MOS2senCgd + 4) = here->MOS2cgd;
@@ -542,7 +542,7 @@ pertw:    /* Perturbation of width */
                 *(ckt->CKTstate0 + here->MOS2vbs) = vbsOp;
                 *(ckt->CKTstate0 + here->MOS2vbd) = vbdOp;
 
-                if((error = MOS2load((GENmodel*)model,ckt))) return(error);
+                if((error = MOS2load((GENmodel*)model,ckt)) != 0) return(error);
 
                 *(here->MOS2senCgs + 5) = here->MOS2cgs;
                 *(here->MOS2senCgd + 5) = here->MOS2cgd;

src/spicelib/devices/mos3/mos3sacl.c

@@ -232,7 +232,7 @@ MOS3sAcLoad(GENmodel *inModel, CKTcircuit *ckt)
             here->MOS3senPertFlag = ON ;
             if(info->SENacpertflag == 1){
                 /* store the  unperturbed values of small signal parameters */
-                if((error = MOS3load((GENmodel*)model,ckt)))
+                if((error = MOS3load((GENmodel*)model,ckt)) != 0)
 		  return(error);
                 *(here->MOS3senCgs) = here->MOS3cgs;
                 *(here->MOS3senCgd) = here->MOS3cgd;
@@ -322,7 +322,7 @@ MOS3sAcLoad(GENmodel *inModel, CKTcircuit *ckt)
                 *(ckt->CKTstate0 + here->MOS3vbs) = Apert;
                 *(ckt->CKTstate0 + here->MOS3vbd) = vbdOp;
 
-                if((error = MOS3load((GENmodel*)model,ckt)))
+                if((error = MOS3load((GENmodel*)model,ckt)) != 0)
 		  return(error);
 
                 *(here->MOS3senCgs + 1) = here->MOS3cgs;
@@ -361,7 +361,7 @@ pertvbd:  /* Perturbation of vbd */
                 *(ckt->CKTstate0 + here->MOS3vbs) = vbsOp;
                 *(ckt->CKTstate0 + here->MOS3vbd) = Apert;
 
-                if((error = MOS3load((GENmodel*)model,ckt)))
+                if((error = MOS3load((GENmodel*)model,ckt)) != 0)
 		  return(error);
 
                 *(here->MOS3senCgs + 2) = here->MOS3cgs;
@@ -401,7 +401,7 @@ pertvgb:  /* Perturbation of vgb */
                 *(ckt->CKTstate0 + here->MOS3vbd) = vbdOp;
                 *(ckt->CKTrhsOp + here->MOS3bNode) -= DELA; 
 
-                if((error = MOS3load((GENmodel*)model,ckt)))
+                if((error = MOS3load((GENmodel*)model,ckt)) != 0)
 		  return(error);
 
                 *(here->MOS3senCgs + 3) = here->MOS3cgs;
@@ -442,7 +442,7 @@ pertl:    /* Perturbation of length */
                 *(ckt->CKTstate0 + here->MOS3vbs) = vbsOp;
                 *(ckt->CKTstate0 + here->MOS3vbd) = vbdOp;
 
-                if((error = MOS3load((GENmodel*)model,ckt)))
+                if((error = MOS3load((GENmodel*)model,ckt)) != 0)
 		  return(error);
 
                 *(here->MOS3senCgs + 4) = here->MOS3cgs;
@@ -545,7 +545,7 @@ pertw:    /* Perturbation of width */
                 *(ckt->CKTstate0 + here->MOS3vbs) = vbsOp;
                 *(ckt->CKTstate0 + here->MOS3vbd) = vbdOp;
 
-                if((error = MOS3load((GENmodel*)model,ckt)))
+                if((error = MOS3load((GENmodel*)model,ckt)) != 0)
 		  return(error);
 
                 *(here->MOS3senCgs + 5) = here->MOS3cgs;

src/spicelib/devices/mos9/mos9sacl.c

@@ -233,7 +233,7 @@ MOS9sAcLoad(GENmodel *inModel, CKTcircuit *ckt)
             here->MOS9senPertFlag = ON ;
             if(info->SENacpertflag == 1){
                 /* store the  unperturbed values of small signal parameters */
-                if((error = MOS9load((GENmodel*)model,ckt))) return(error);
+                if((error = MOS9load((GENmodel*)model,ckt)) != 0) return(error);
                 *(here->MOS9senCgs) = here->MOS9cgs;
                 *(here->MOS9senCgd) = here->MOS9cgd;
                 *(here->MOS9senCgb) = here->MOS9cgb;
@@ -322,7 +322,7 @@ MOS9sAcLoad(GENmodel *inModel, CKTcircuit *ckt)
                 *(ckt->CKTstate0 + here->MOS9vbs) = Apert;
                 *(ckt->CKTstate0 + here->MOS9vbd) = vbdOp;
 
-                if((error = MOS9load((GENmodel*)model,ckt))) return(error);
+                if((error = MOS9load((GENmodel*)model,ckt)) != 0) return(error);
 
                 *(here->MOS9senCgs + 1) = here->MOS9cgs;
                 *(here->MOS9senCgd + 1) = here->MOS9cgd;
@@ -360,7 +360,7 @@ pertvbd:  /* Perturbation of vbd */
                 *(ckt->CKTstate0 + here->MOS9vbs) = vbsOp;
                 *(ckt->CKTstate0 + here->MOS9vbd) = Apert;
 
-                if((error = MOS9load((GENmodel*)model,ckt))) return(error);
+                if((error = MOS9load((GENmodel*)model,ckt)) != 0) return(error);
 
                 *(here->MOS9senCgs + 2) = here->MOS9cgs;
                 *(here->MOS9senCgd + 2) = here->MOS9cgd;
@@ -399,7 +399,7 @@ pertvgb:  /* Perturbation of vgb */
                 *(ckt->CKTstate0 + here->MOS9vbd) = vbdOp;
                 *(ckt->CKTrhsOp + here->MOS9bNode) -= DELA; 
 
-                if((error = MOS9load((GENmodel*)model,ckt))) return(error);
+                if((error = MOS9load((GENmodel*)model,ckt)) != 0) return(error);
 
                 *(here->MOS9senCgs + 3) = here->MOS9cgs;
                 *(here->MOS9senCgd + 3) = here->MOS9cgd;
@@ -439,7 +439,7 @@ pertl:    /* Perturbation of length */
                 *(ckt->CKTstate0 + here->MOS9vbs) = vbsOp;
                 *(ckt->CKTstate0 + here->MOS9vbd) = vbdOp;
 
-                if((error = MOS9load((GENmodel*)model,ckt))) return(error);
+                if((error = MOS9load((GENmodel*)model,ckt)) != 0) return(error);
 
                 *(here->MOS9senCgs + 4) = here->MOS9cgs;
                 *(here->MOS9senCgd + 4) = here->MOS9cgd;
@@ -541,7 +541,7 @@ pertw:    /* Perturbation of width */
                 *(ckt->CKTstate0 + here->MOS9vbs) = vbsOp;
                 *(ckt->CKTstate0 + here->MOS9vbd) = vbdOp;
 
-                if((error = MOS9load((GENmodel*)model,ckt))) return(error);
+                if((error = MOS9load((GENmodel*)model,ckt)) != 0) return(error);
 
                 *(here->MOS9senCgs + 5) = here->MOS9cgs;
                 *(here->MOS9senCgd + 5) = here->MOS9cgd;

src/spicelib/devices/nbjt/nbjtset.c

@@ -118,31 +118,31 @@ NBJTsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
     }
 
     /* Set up the rest of the card lists */
-    if ((error = MODLsetup(model->NBJTmodels)))
+    if ((error = MODLsetup(model->NBJTmodels)) != 0)
       return (error);
     BandGapNarrowing = models->MODLbandGapNarrowing;
     ConcDepLifetime = models->MODLconcDepLifetime;
     TempDepMobility = models->MODLtempDepMobility;
     ConcDepMobility = models->MODLconcDepMobility;
 
-    if ((error = OUTPsetup(model->NBJToutputs)))
+    if ((error = OUTPsetup(model->NBJToutputs)) != 0)
       return (error);
-    if ((error = MATLsetup(model->NBJTmaterials, &materialList)))
+    if ((error = MATLsetup(model->NBJTmaterials, &materialList)) != 0)
       return (error);
-    if ((error = MOBsetup(model->NBJTmobility, materialList)))
+    if ((error = MOBsetup(model->NBJTmobility, materialList)) != 0)
       return (error);
-    if ((error = MESHsetup('x', model->NBJTxMeshes, &xCoordList, &xMeshSize)))
+    if ((error = MESHsetup('x', model->NBJTxMeshes, &xCoordList, &xMeshSize)) != 0)
       return (error);
     if ((error = DOMNsetup(model->NBJTdomains, &domainList,
-	    xCoordList, NIL(ONEcoord), materialList)))
+	    xCoordList, NIL(ONEcoord), materialList)) != 0)
       return (error);
     if ((error = BDRYsetup(model->NBJTboundaries,
-	    xCoordList, NIL(ONEcoord), domainList)))
+	    xCoordList, NIL(ONEcoord), domainList)) != 0)
       return (error);
-    if ((error = CONTsetup(model->NBJTcontacts, NULL)))
+    if ((error = CONTsetup(model->NBJTcontacts, NULL)) != 0)
       return (error);
     if ((error = DOPsetup(model->NBJTdopings, &profileList,
-	    &dopTableList, xCoordList, NIL(ONEcoord))))
+	    &dopTableList, xCoordList, NIL(ONEcoord))) != 0)
       return (error);
     model->NBJTmatlInfo = materialList;
     model->NBJTprofiles = profileList;

src/spicelib/devices/nbjt2/nbt2set.c

@@ -126,7 +126,7 @@ NBJT2setup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
     OneCarrier = methods->METHoneCarrier;
 
     /* Set up the rest of the card lists */
-    if ((error = MODLsetup(model->NBJT2models)))
+    if ((error = MODLsetup(model->NBJT2models)) != 0)
       return (error);
     BandGapNarrowing = models->MODLbandGapNarrowing;
     ConcDepLifetime = models->MODLconcDepLifetime;
@@ -134,32 +134,32 @@ NBJT2setup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
     ConcDepMobility = models->MODLconcDepMobility;
     SurfaceMobility = models->MODLsurfaceMobility;
 
-    if ((error = OUTPsetup(model->NBJT2outputs)))
+    if ((error = OUTPsetup(model->NBJT2outputs)) != 0)
       return (error);
-    if ((error = MATLsetup(model->NBJT2materials, &materialList)))
+    if ((error = MATLsetup(model->NBJT2materials, &materialList)) != 0)
       return (error);
-    if ((error = MOBsetup(model->NBJT2mobility, materialList)))
+    if ((error = MOBsetup(model->NBJT2mobility, materialList)) != 0)
       return (error);
-    if ((error = MESHsetup('x', model->NBJT2xMeshes, &xCoordList, &xMeshSize)))
+    if ((error = MESHsetup('x', model->NBJT2xMeshes, &xCoordList, &xMeshSize)) != 0)
       return (error);
-    if ((error = MESHsetup('y', model->NBJT2yMeshes, &yCoordList, &yMeshSize)))
+    if ((error = MESHsetup('y', model->NBJT2yMeshes, &yCoordList, &yMeshSize)) != 0)
       return (error);
     if ((error = DOMNsetup(model->NBJT2domains, &domainList,
-	    xCoordList, yCoordList, materialList)))
+	    xCoordList, yCoordList, materialList)) != 0)
       return (error);
     if ((error = BDRYsetup(model->NBJT2boundaries,
-	    xCoordList, yCoordList, domainList)))
+	    xCoordList, yCoordList, domainList)) != 0)
       return (error);
     if ((error = ELCTsetup(model->NBJT2electrodes, &electrodeList,
-	    xCoordList, yCoordList)))
+	    xCoordList, yCoordList)) != 0)
       return (error);
     /* Make sure electrodes are OK. */
     checkElectrodes(electrodeList, 3);	/* NBJT2 has 3 electrodes */
 
-    if ((error = CONTsetup(model->NBJT2contacts, electrodeList)))
+    if ((error = CONTsetup(model->NBJT2contacts, electrodeList)) != 0)
       return (error);
     if ((error = DOPsetup(model->NBJT2dopings, &profileList,
-	    &dopTableList, xCoordList, yCoordList)))
+	    &dopTableList, xCoordList, yCoordList)) != 0)
       return (error);
     model->NBJT2matlInfo = materialList;
     model->NBJT2profiles = profileList;

src/spicelib/devices/numd/numdset.c

@@ -113,31 +113,31 @@ NUMDsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
     }
 
     /* Set up the rest of the card lists */
-    if ((error = MODLsetup(model->NUMDmodels)))
+    if ((error = MODLsetup(model->NUMDmodels)) != 0)
       return (error);
     BandGapNarrowing = models->MODLbandGapNarrowing;
     ConcDepLifetime = models->MODLconcDepLifetime;
     TempDepMobility = models->MODLtempDepMobility;
     ConcDepMobility = models->MODLconcDepMobility;
 
-    if ((error = OUTPsetup(model->NUMDoutputs)))
+    if ((error = OUTPsetup(model->NUMDoutputs)) != 0)
       return (error);
-    if ((error = MATLsetup(model->NUMDmaterials, &materialList)))
+    if ((error = MATLsetup(model->NUMDmaterials, &materialList)) != 0)
       return (error);
-    if ((error = MOBsetup(model->NUMDmobility, materialList)))
+    if ((error = MOBsetup(model->NUMDmobility, materialList)) != 0)
       return (error);
-    if ((error = MESHsetup('x', model->NUMDxMeshes, &xCoordList, &xMeshSize)))
+    if ((error = MESHsetup('x', model->NUMDxMeshes, &xCoordList, &xMeshSize)) != 0)
       return (error);
     if ((error = DOMNsetup(model->NUMDdomains, &domainList,
-	    xCoordList, NIL(ONEcoord), materialList)))
+	    xCoordList, NIL(ONEcoord), materialList)) != 0)
       return (error);
     if ((error = BDRYsetup(model->NUMDboundaries,
-	    xCoordList, NIL(ONEcoord), domainList)))
+	    xCoordList, NIL(ONEcoord), domainList)) != 0)
       return (error);
-    if ((error = CONTsetup(model->NUMDcontacts, NULL)))
+    if ((error = CONTsetup(model->NUMDcontacts, NULL)) != 0)
       return (error);
     if ((error = DOPsetup(model->NUMDdopings, &profileList,
-	    &dopTableList, xCoordList, NIL(ONEcoord))))
+	    &dopTableList, xCoordList, NIL(ONEcoord))) != 0)
       return (error);
     model->NUMDmatlInfo = materialList;
     model->NUMDprofiles = profileList;

src/spicelib/devices/numd2/nud2set.c

@@ -125,7 +125,7 @@ NUMD2setup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
     OneCarrier = methods->METHoneCarrier;
 
     /* Set up the rest of the card lists */
-    if ((error = MODLsetup(model->NUMD2models)))
+    if ((error = MODLsetup(model->NUMD2models)) != 0)
       return (error);
     BandGapNarrowing = models->MODLbandGapNarrowing;
     ConcDepLifetime = models->MODLconcDepLifetime;
@@ -133,32 +133,32 @@ NUMD2setup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
     ConcDepMobility = models->MODLconcDepMobility;
     SurfaceMobility = models->MODLsurfaceMobility;
 
-    if ((error = OUTPsetup(model->NUMD2outputs)))
+    if ((error = OUTPsetup(model->NUMD2outputs)) != 0)
       return (error);
-    if ((error = MATLsetup(model->NUMD2materials, &materialList)))
+    if ((error = MATLsetup(model->NUMD2materials, &materialList)) != 0)
       return (error);
-    if ((error = MOBsetup(model->NUMD2mobility, materialList)))
+    if ((error = MOBsetup(model->NUMD2mobility, materialList)) != 0)
       return (error);
-    if ((error = MESHsetup('x', model->NUMD2xMeshes, &xCoordList, &xMeshSize)))
+    if ((error = MESHsetup('x', model->NUMD2xMeshes, &xCoordList, &xMeshSize)) != 0)
       return (error);
-    if ((error = MESHsetup('y', model->NUMD2yMeshes, &yCoordList, &yMeshSize)))
+    if ((error = MESHsetup('y', model->NUMD2yMeshes, &yCoordList, &yMeshSize)) != 0)
       return (error);
     if ((error = DOMNsetup(model->NUMD2domains, &domainList,
-	    xCoordList, yCoordList, materialList)))
+	    xCoordList, yCoordList, materialList)) != 0)
       return (error);
     if ((error = BDRYsetup(model->NUMD2boundaries,
-	    xCoordList, yCoordList, domainList)))
+	    xCoordList, yCoordList, domainList)) != 0)
       return (error);
     if ((error = ELCTsetup(model->NUMD2electrodes, &electrodeList,
-	    xCoordList, yCoordList)))
+	    xCoordList, yCoordList)) != 0)
       return (error);
     /* Make sure electrodes are OK. */
     checkElectrodes(electrodeList, 2);	/* NUMD2 has 4 electrodes */
 
-    if ((error = CONTsetup(model->NUMD2contacts, electrodeList)))
+    if ((error = CONTsetup(model->NUMD2contacts, electrodeList)) != 0)
       return (error);
     if ((error = DOPsetup(model->NUMD2dopings, &profileList,
-	    &dopTableList, xCoordList, yCoordList)))
+	    &dopTableList, xCoordList, yCoordList)) != 0)
       return (error);
     model->NUMD2matlInfo = materialList;
     model->NUMD2profiles = profileList;

src/spicelib/devices/numos/nummset.c

@@ -124,7 +124,7 @@ NUMOSsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
     OneCarrier = methods->METHoneCarrier;
 
     /* Set up the rest of the card lists */
-    if ((error = MODLsetup(model->NUMOSmodels)))
+    if ((error = MODLsetup(model->NUMOSmodels)) != 0)
       return (error);
     BandGapNarrowing = models->MODLbandGapNarrowing;
     ConcDepLifetime = models->MODLconcDepLifetime;
@@ -132,32 +132,32 @@ NUMOSsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
     ConcDepMobility = models->MODLconcDepMobility;
     SurfaceMobility = models->MODLsurfaceMobility;
 
-    if ((error = OUTPsetup(model->NUMOSoutputs)))
+    if ((error = OUTPsetup(model->NUMOSoutputs)) != 0)
       return (error);
-    if ((error = MATLsetup(model->NUMOSmaterials, &materialList)))
+    if ((error = MATLsetup(model->NUMOSmaterials, &materialList)) != 0)
       return (error);
-    if ((error = MOBsetup(model->NUMOSmobility, materialList)))
+    if ((error = MOBsetup(model->NUMOSmobility, materialList)) != 0)
       return (error);
-    if ((error = MESHsetup('x', model->NUMOSxMeshes, &xCoordList, &xMeshSize)))
+    if ((error = MESHsetup('x', model->NUMOSxMeshes, &xCoordList, &xMeshSize)) != 0)
       return (error);
-    if ((error = MESHsetup('y', model->NUMOSyMeshes, &yCoordList, &yMeshSize)))
+    if ((error = MESHsetup('y', model->NUMOSyMeshes, &yCoordList, &yMeshSize)) != 0)
       return (error);
     if ((error = DOMNsetup(model->NUMOSdomains, &domainList,
-	    xCoordList, yCoordList, materialList)))
+	    xCoordList, yCoordList, materialList)) != 0)
       return (error);
     if ((error = BDRYsetup(model->NUMOSboundaries,
-	    xCoordList, yCoordList, domainList)))
+	    xCoordList, yCoordList, domainList)) != 0)
       return (error);
     if ((error = ELCTsetup(model->NUMOSelectrodes, &electrodeList,
-	    xCoordList, yCoordList)))
+	    xCoordList, yCoordList)) != 0)
       return (error);
     /* Make sure electrodes are OK. */
     checkElectrodes(electrodeList, 4);	/* NUMOS has 4 electrodes */
 
-    if ((error = CONTsetup(model->NUMOScontacts, electrodeList)))
+    if ((error = CONTsetup(model->NUMOScontacts, electrodeList)) != 0)
       return (error);
     if ((error = DOPsetup(model->NUMOSdopings, &profileList,
-	    &dopTableList, xCoordList, yCoordList)))
+	    &dopTableList, xCoordList, yCoordList)) != 0)
       return (error);
     model->NUMOSmatlInfo = materialList;
     model->NUMOSprofiles = profileList;