From b97c2ba5d100ed96855068fe6c22ab818759c6c2 Mon Sep 17 00:00:00 2001
From: rlar <rlar>
Date: Wed, 17 Jul 2013 20:30:46 +0200
Subject: [PATCH] CKTfndMod(), express error return value outside of this
 function

---
 src/frontend/spiceif.c              | 2 ++
 src/spicelib/analysis/cktmcrt.c     | 1 +
 src/spicelib/devices/urc/urcsetup.c | 2 ++
 src/tclspice.c                      | 1 +
 4 files changed, 6 insertions(+)

diff --git a/src/frontend/spiceif.c b/src/frontend/spiceif.c
index 2447b59ae..0fb1d6c31 100644
--- a/src/frontend/spiceif.c
+++ b/src/frontend/spiceif.c
@@ -625,6 +625,7 @@ finddev_special(
     // assert(second && *second == -1)
     // assert(third && *third == NULL)
     err = ft_sim->findModel (ckt, &type, modptr, name);
+    err = *modptr ? OK : E_NOMOD;
     if (err == OK) {
         *device_or_model = 1;
         return (type);
@@ -1225,6 +1226,7 @@ finddev(CKTcircuit *ckt, char *name, GENinstance **devptr, GENmodel **modptr)
     // assert(second && *second == -1)
     // assert(third && *third == NULL)
     err = ft_sim->findModel (ckt, &type, modptr, name);
+    err = *modptr ? OK : E_NOMOD;
     if (err == OK)
         return (type);
 
diff --git a/src/spicelib/analysis/cktmcrt.c b/src/spicelib/analysis/cktmcrt.c
index badc9a532..dfa1c1d1c 100644
--- a/src/spicelib/analysis/cktmcrt.c
+++ b/src/spicelib/analysis/cktmcrt.c
@@ -26,6 +26,7 @@ CKTmodCrt(CKTcircuit *ckt, int type, GENmodel **modfast, IFuid name)
     // assert(second)
     // assert(third && *third == NULL)
     error = CKTfndMod(ckt, &type, &mymodfast, name);
+    error = mymodfast ? OK : E_NOMOD;
     if(error == E_NOMOD) {
         mymodfast = (GENmodel *) tmalloc((size_t) *(DEVices[type]->DEVmodSize));
         if(mymodfast == NULL) return(E_NOMEM);
diff --git a/src/spicelib/devices/urc/urcsetup.c b/src/spicelib/devices/urc/urcsetup.c
index 07e6ac329..82f857735 100644
--- a/src/spicelib/devices/urc/urcsetup.c
+++ b/src/spicelib/devices/urc/urcsetup.c
@@ -311,6 +311,7 @@ URCunsetup(GENmodel *inModel, CKTcircuit *ckt)
             // assert(second && *second == -1)
             // assert(third && *third == NULL)
 	    error = CKTfndMod(ckt, &type, &modfast, varUid);
+            error = modfast ? OK : E_NOMOD;
 	    if (error)
 		return error;
 
@@ -330,6 +331,7 @@ URCunsetup(GENmodel *inModel, CKTcircuit *ckt)
             // assert(second && *second == -1)
             // assert(third && *third == NULL)
 	    error = CKTfndMod(ckt, &type, &modfast, varUid);
+            error = modfast ? OK : E_NOMOD;
 	    if (error)
 		return error;
 
diff --git a/src/tclspice.c b/src/tclspice.c
index 513fb1fb1..24ca9434d 100644
--- a/src/tclspice.c
+++ b/src/tclspice.c
@@ -1400,6 +1400,7 @@ get_mod_param TCL_CMDPROCARGS(clientData, interp, argc, argv)
         // assert(second && *second == -1)
         // assert(third && *third == NULL)
         err = ft_sim->findModel (ft_curckt->ci_ckt, &typecode, &modptr, name);
+        err = modptr ? OK : E_NOMOD;
     } else {
         typecode = devptr->GENmodPtr->GENmodType;
         err = OK;