From 3393d68818befcfd9a736207fb2b82d9130ee405 Mon Sep 17 00:00:00 2001
From: rlar <rlar>
Date: Fri, 18 Jul 2014 18:38:19 +0200
Subject: [PATCH] subckt.c, doit(), cleanup, local variables

---
 src/frontend/subckt.c | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/src/frontend/subckt.c b/src/frontend/subckt.c
index 658c62dda..ed50d8197 100644
--- a/src/frontend/subckt.c
+++ b/src/frontend/subckt.c
@@ -549,7 +549,6 @@ doit(struct line *deck, wordlist *modnames) {
 
                 char *tofree, *tofree2, *s, *t;
                 char *scname;
-                struct line *su_deck;
 
                 gotone = TRUE;
                 t = tofree = s = copy(c->li_line);       /*  s & t hold copy of component line  */
@@ -589,19 +588,15 @@ doit(struct line *deck, wordlist *modnames) {
                 /* If no .subckt is found, don't complain -- this might be an
                  * instance of a subckt that is defined above at higher level.
                  */
-                if (!sss) {
-                    tfree(tofree);
-                    tfree(tofree2);
-                    continue;
-                }
+                if (sss) {
+
+                struct line *su_deck = inp_deckcopy(sss->su_def);
+                struct line *rest_of_c = c->li_next;
 
                 /* Now we have to replace this line with the
                  * macro definition.
                  */
 
-                /*  make su_deck point to a copy of the .subckt definition  */
-                su_deck = inp_deckcopy(sss->su_def);
-
                 /* Change the names of .models found in .subckts . . .  */
                 /* prepend the translated model names to the list `modnames' */
                 modnames = modtranslate(su_deck, scname, modnames);
@@ -615,8 +610,6 @@ doit(struct line *deck, wordlist *modnames) {
                     error = 1;
 
                 /* Now splice the decks together. */
-                {
-                    struct line *rest_of_c = c->li_next;
                     if (use_numparams == FALSE) {
                         line_free_x(c, FALSE); /* drop the invocation */
                         if (prev_of_c)
@@ -631,7 +624,7 @@ doit(struct line *deck, wordlist *modnames) {
                     while (c->li_next)
                         c = c->li_next;
                     c->li_next = rest_of_c;
-                }
+            }
                 tfree(tofree);
                 tfree(tofree2);
             }     /* if (ciprefix(invoke, c->li_line)) . . . */