From 494ef3f628bed31a5cd801a5d97fec7ce70ae0a6 Mon Sep 17 00:00:00 2001
From: rlar <rlar>
Date: Wed, 17 Jul 2013 20:34:19 +0200
Subject: [PATCH] CKTfndMod(), cleanup

---
 src/frontend/spiceif.c              | 2 --
 src/spicelib/analysis/cktmcrt.c     | 1 -
 src/spicelib/devices/urc/urcsetup.c | 3 ---
 3 files changed, 6 deletions(-)

diff --git a/src/frontend/spiceif.c b/src/frontend/spiceif.c
index df44ef4b0..fea9cd260 100644
--- a/src/frontend/spiceif.c
+++ b/src/frontend/spiceif.c
@@ -629,7 +629,6 @@ finddev_special(
         return (*modptr)->GENmodType;
     }
 
-    *modptr = NULL;
     *device_or_model = 2;
     return (-1);
 }
@@ -1226,7 +1225,6 @@ finddev(CKTcircuit *ckt, char *name, GENinstance **devptr, GENmodel **modptr)
     if (*modptr)
         return (*modptr)->GENmodType;
 
-    *modptr = NULL;
     return (-1);
 }
 
diff --git a/src/spicelib/analysis/cktmcrt.c b/src/spicelib/analysis/cktmcrt.c
index 9378823d9..8065dca42 100644
--- a/src/spicelib/analysis/cktmcrt.c
+++ b/src/spicelib/analysis/cktmcrt.c
@@ -35,7 +35,6 @@ CKTmodCrt(CKTcircuit *ckt, int type, GENmodel **modfast, IFuid name)
         if(modfast) *modfast=mymodfast;
         return(OK);
     } else {
-        type = mymodfast->GENmodType;  /* unused */
         if(modfast) *modfast=mymodfast;
         return(E_EXISTS);
     }
diff --git a/src/spicelib/devices/urc/urcsetup.c b/src/spicelib/devices/urc/urcsetup.c
index b66aa0e9d..169939845 100644
--- a/src/spicelib/devices/urc/urcsetup.c
+++ b/src/spicelib/devices/urc/urcsetup.c
@@ -313,7 +313,6 @@ URCunsetup(GENmodel *inModel, CKTcircuit *ckt)
 	    modfast = CKTfndMod(ckt, &type, &modfast, varUid);
 	    if (!modfast)
 		return E_NOMOD;
-            type = modfast->GENmodType; /* unused */
 
 	    for (in = modfast->GENinstances; in; in = in->GENnextInstance)
 		CKTdltNNum(ckt, in->GENnode1);
@@ -333,8 +332,6 @@ URCunsetup(GENmodel *inModel, CKTcircuit *ckt)
 	    modfast = CKTfndMod(ckt, &type, &modfast, varUid);
 	    if (!modfast)
 		return E_NOMOD;
-
-            type = modfast->GENmodType; /* unused */
 	    CKTdltMod(ckt, modfast);
 	}
     }