From 58f745f57fca0a0da37a6717acba012e9c1f4ad0 Mon Sep 17 00:00:00 2001
From: rlar <rlar>
Date: Thu, 4 Jan 2018 22:38:33 +0100
Subject: [PATCH] devices/**/XXXmdel.c, cleanup linewrap

---
 src/spicelib/devices/bjt/bjtmdel.c            |  7 ++++---
 src/spicelib/devices/bsim1/b1mdel.c           | 10 ++++++----
 src/spicelib/devices/bsim2/b2mdel.c           | 10 ++++++----
 src/spicelib/devices/bsim3/b3mdel.c           | 14 ++++++--------
 .../devices/bsim3soi_dd/b3soiddmdel.c         |  9 +++++----
 .../devices/bsim3soi_fd/b3soifdmdel.c         |  9 +++++----
 .../devices/bsim3soi_pd/b3soipdmdel.c         |  9 +++++----
 src/spicelib/devices/bsim3v0/b3v0mdel.c       |  9 +++++----
 src/spicelib/devices/bsim3v1/b3v1mdel.c       |  9 +++++----
 src/spicelib/devices/bsim3v32/b3v32mdel.c     |  9 +++++----
 src/spicelib/devices/bsim4/b4mdel.c           | 14 ++++++--------
 src/spicelib/devices/bsim4v5/b4v5mdel.c       | 14 ++++++--------
 src/spicelib/devices/bsim4v6/b4v6mdel.c       | 14 ++++++--------
 src/spicelib/devices/bsim4v7/b4v7mdel.c       | 14 ++++++--------
 src/spicelib/devices/bsimsoi/b4soimdel.c      | 14 ++++++--------
 src/spicelib/devices/cap/capmdel.c            | 10 ++++++----
 src/spicelib/devices/cccs/cccsmdel.c          | 10 ++++++----
 src/spicelib/devices/ccvs/ccvsmdel.c          | 10 ++++++----
 src/spicelib/devices/cpl/cplmdel.c            | 10 ++++++----
 src/spicelib/devices/csw/cswmdel.c            | 10 ++++++----
 src/spicelib/devices/dio/diomdel.c            | 10 ++++++----
 src/spicelib/devices/hfet1/hfetmdel.c         | 10 ++++++----
 src/spicelib/devices/hfet2/hfet2mdel.c        | 10 ++++++----
 src/spicelib/devices/hisim2/hsm2mdel.c        | 19 +++++++++----------
 src/spicelib/devices/hisimhv1/hsmhvmdel.c     | 19 +++++++++----------
 src/spicelib/devices/hisimhv2/hsmhv2mdel.c    | 19 +++++++++----------
 src/spicelib/devices/ind/indmdel.c            | 10 ++++++----
 src/spicelib/devices/ind/mutmdel.c            | 10 ++++++----
 src/spicelib/devices/isrc/isrcmdel.c          | 10 ++++++----
 src/spicelib/devices/jfet/jfetmdel.c          | 10 ++++++----
 src/spicelib/devices/jfet2/jfet2mdel.c        | 10 ++++++----
 src/spicelib/devices/ltra/ltramdel.c          |  3 +--
 src/spicelib/devices/mes/mesmdel.c            | 10 ++++++----
 src/spicelib/devices/mesa/mesamdel.c          | 10 ++++++----
 src/spicelib/devices/mos1/mos1mdel.c          | 10 ++++++----
 src/spicelib/devices/mos2/mos2mdel.c          | 10 ++++++----
 src/spicelib/devices/mos3/mos3mdel.c          | 10 ++++++----
 src/spicelib/devices/mos9/mos9mdel.c          | 10 ++++++----
 src/spicelib/devices/nbjt/nbjtmdel.c          |  3 +--
 src/spicelib/devices/nbjt2/nbt2mdel.c         |  3 +--
 src/spicelib/devices/ndev/ndevmdel.c          |  5 +----
 src/spicelib/devices/numd/numdmdel.c          |  3 +--
 src/spicelib/devices/numd2/nud2mdel.c         |  3 +--
 src/spicelib/devices/numos/nummmdel.c         |  3 +--
 src/spicelib/devices/res/resmdel.c            | 10 ++++++----
 src/spicelib/devices/soi3/soi3mdel.c          | 10 ++++++----
 src/spicelib/devices/sw/swmdel.c              | 10 ++++++----
 src/spicelib/devices/tra/tramdel.c            | 10 ++++++----
 src/spicelib/devices/txl/txlmdel.c            | 10 ++++++----
 src/spicelib/devices/urc/urcmdel.c            | 10 ++++++----
 src/spicelib/devices/vbic/vbicmdel.c          |  7 ++++---
 src/spicelib/devices/vccs/vccsmdel.c          | 10 ++++++----
 src/spicelib/devices/vcvs/vcvsmdel.c          | 10 ++++++----
 src/spicelib/devices/vsrc/vsrcmdel.c          | 10 ++++++----
 54 files changed, 288 insertions(+), 244 deletions(-)

diff --git a/src/spicelib/devices/bjt/bjtmdel.c b/src/spicelib/devices/bjt/bjtmdel.c
index 00c371c43..271ea1e10 100644
--- a/src/spicelib/devices/bjt/bjtmdel.c
+++ b/src/spicelib/devices/bjt/bjtmdel.c
@@ -24,15 +24,16 @@ BJTmDelete(GENmodel **inModels, IFuid modname, GENmodel *kill)
 
     oldmod = model;
     for (; *model; model = &((*model)->BJTnextModel)) {
-        if ((*model)->BJTmodName == modname ||
-            (modfast && *model == modfast)) goto delgot;
+        if ((*model)->BJTmodName == modname || (modfast && *model == modfast))
+            goto delgot;
         oldmod = model;
     }
 
     return E_NOMOD;
 
  delgot:
-    if ((*model)->BJTinstances) return E_NOTEMPTY;
+    if ((*model)->BJTinstances)
+        return E_NOTEMPTY;
     *oldmod = (*model)->BJTnextModel; /* cut deleted device out of list */
     FREE(*model);
     return OK;
diff --git a/src/spicelib/devices/bsim1/b1mdel.c b/src/spicelib/devices/bsim1/b1mdel.c
index 8c63e2885..7670ab6a1 100644
--- a/src/spicelib/devices/bsim1/b1mdel.c
+++ b/src/spicelib/devices/bsim1/b1mdel.c
@@ -20,8 +20,8 @@ B1mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
 
     oldmod = model;
     for (; *model; model = &((*model)->B1nextModel)) {
-        if ((*model)->B1modName == modname ||
-            (modfast && *model == modfast)) goto delgot;
+        if ((*model)->B1modName == modname || (modfast && *model == modfast))
+            goto delgot;
         oldmod = model;
     }
 
@@ -30,10 +30,12 @@ B1mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
  delgot:
     *oldmod = (*model)->B1nextModel; /* cut deleted device out of list */
     for (here = (*model)->B1instances; here; here = here->B1nextInstance) {
-        if (prev) FREE(prev);
+        if (prev)
+            FREE(prev);
         prev = here;
     }
-    if (prev) FREE(prev);
+    if (prev)
+        FREE(prev);
     FREE(*model);
     return OK;
 }
diff --git a/src/spicelib/devices/bsim2/b2mdel.c b/src/spicelib/devices/bsim2/b2mdel.c
index 3bce7c815..c085fabad 100644
--- a/src/spicelib/devices/bsim2/b2mdel.c
+++ b/src/spicelib/devices/bsim2/b2mdel.c
@@ -20,8 +20,8 @@ B2mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
 
     oldmod = model;
     for (; *model; model = &((*model)->B2nextModel)) {
-        if ((*model)->B2modName == modname ||
-            (modfast && *model == modfast)) goto delgot;
+        if ((*model)->B2modName == modname || (modfast && *model == modfast))
+            goto delgot;
         oldmod = model;
     }
 
@@ -30,10 +30,12 @@ B2mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
  delgot:
     *oldmod = (*model)->B2nextModel; /* cut deleted device out of list */
     for (here = (*model)->B2instances; here; here = here->B2nextInstance) {
-        if (prev) FREE(prev);
+        if (prev)
+            FREE(prev);
         prev = here;
     }
-    if (prev) FREE(prev);
+    if (prev)
+        FREE(prev);
     FREE(*model);
     return OK;
 }
diff --git a/src/spicelib/devices/bsim3/b3mdel.c b/src/spicelib/devices/bsim3/b3mdel.c
index 220ed2274..37a4d56f0 100644
--- a/src/spicelib/devices/bsim3/b3mdel.c
+++ b/src/spicelib/devices/bsim3/b3mdel.c
@@ -15,10 +15,7 @@
 
 
 int
-BSIM3mDelete(
-             GENmodel **inModel,
-             IFuid modname,
-             GENmodel *kill)
+BSIM3mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
 {
     BSIM3model **model = (BSIM3model **) inModel;
     BSIM3model *modfast = (BSIM3model *) kill;
@@ -28,8 +25,7 @@ BSIM3mDelete(
 
     oldmod = model;
     for (; *model; model = &((*model)->BSIM3nextModel)) {
-        if ((*model)->BSIM3modName == modname ||
-            (modfast && *model == modfast))
+        if ((*model)->BSIM3modName == modname || (modfast && *model == modfast))
             goto delgot;
         oldmod = model;
     }
@@ -39,10 +35,12 @@ BSIM3mDelete(
  delgot:
     *oldmod = (*model)->BSIM3nextModel; /* cut deleted device out of list */
     for (here = (*model)->BSIM3instances; here; here = here->BSIM3nextInstance) {
-        if (prev) FREE(prev);
+        if (prev)
+            FREE(prev);
         prev = here;
     }
-    if (prev) FREE(prev);
+    if (prev)
+        FREE(prev);
     FREE(*model);
     return OK;
 }
diff --git a/src/spicelib/devices/bsim3soi_dd/b3soiddmdel.c b/src/spicelib/devices/bsim3soi_dd/b3soiddmdel.c
index 9e58eeaab..02e08bcdf 100644
--- a/src/spicelib/devices/bsim3soi_dd/b3soiddmdel.c
+++ b/src/spicelib/devices/bsim3soi_dd/b3soiddmdel.c
@@ -28,8 +28,7 @@ B3SOIDDmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
 
     oldmod = model;
     for (; *model; model = &((*model)->B3SOIDDnextModel)) {
-        if ((*model)->B3SOIDDmodName == modname ||
-            (modfast && *model == modfast))
+        if ((*model)->B3SOIDDmodName == modname || (modfast && *model == modfast))
             goto delgot;
         oldmod = model;
     }
@@ -39,10 +38,12 @@ B3SOIDDmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
  delgot:
     *oldmod = (*model)->B3SOIDDnextModel; /* cut deleted device out of list */
     for (here = (*model)->B3SOIDDinstances; here; here = here->B3SOIDDnextInstance) {
-        if (prev) FREE(prev);
+        if (prev)
+            FREE(prev);
         prev = here;
     }
-    if (prev) FREE(prev);
+    if (prev)
+        FREE(prev);
     FREE(*model);
     return OK;
 }
diff --git a/src/spicelib/devices/bsim3soi_fd/b3soifdmdel.c b/src/spicelib/devices/bsim3soi_fd/b3soifdmdel.c
index 955d6aebe..b13fb8686 100644
--- a/src/spicelib/devices/bsim3soi_fd/b3soifdmdel.c
+++ b/src/spicelib/devices/bsim3soi_fd/b3soifdmdel.c
@@ -27,8 +27,7 @@ B3SOIFDmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
 
     oldmod = model;
     for (; *model; model = &((*model)->B3SOIFDnextModel)) {
-        if ((*model)->B3SOIFDmodName == modname ||
-            (modfast && *model == modfast))
+        if ((*model)->B3SOIFDmodName == modname || (modfast && *model == modfast))
             goto delgot;
         oldmod = model;
     }
@@ -38,10 +37,12 @@ B3SOIFDmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
  delgot:
     *oldmod = (*model)->B3SOIFDnextModel; /* cut deleted device out of list */
     for (here = (*model)->B3SOIFDinstances; here; here = here->B3SOIFDnextInstance) {
-        if (prev) FREE(prev);
+        if (prev)
+            FREE(prev);
         prev = here;
     }
-    if (prev) FREE(prev);
+    if (prev)
+        FREE(prev);
     FREE(*model);
     return OK;
 }
diff --git a/src/spicelib/devices/bsim3soi_pd/b3soipdmdel.c b/src/spicelib/devices/bsim3soi_pd/b3soipdmdel.c
index a376635cb..68e4de0b1 100644
--- a/src/spicelib/devices/bsim3soi_pd/b3soipdmdel.c
+++ b/src/spicelib/devices/bsim3soi_pd/b3soipdmdel.c
@@ -27,8 +27,7 @@ B3SOIPDmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
 
     oldmod = model;
     for (; *model; model = &((*model)->B3SOIPDnextModel)) {
-        if ((*model)->B3SOIPDmodName == modname ||
-            (modfast && *model == modfast))
+        if ((*model)->B3SOIPDmodName == modname || (modfast && *model == modfast))
             goto delgot;
         oldmod = model;
     }
@@ -38,10 +37,12 @@ B3SOIPDmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
  delgot:
     *oldmod = (*model)->B3SOIPDnextModel; /* cut deleted device out of list */
     for (here = (*model)->B3SOIPDinstances; here; here = here->B3SOIPDnextInstance) {
-        if (prev) FREE(prev);
+        if (prev)
+            FREE(prev);
         prev = here;
     }
-    if (prev) FREE(prev);
+    if (prev)
+        FREE(prev);
     FREE(*model);
     return OK;
 }
diff --git a/src/spicelib/devices/bsim3v0/b3v0mdel.c b/src/spicelib/devices/bsim3v0/b3v0mdel.c
index 9c37debec..297391447 100644
--- a/src/spicelib/devices/bsim3v0/b3v0mdel.c
+++ b/src/spicelib/devices/bsim3v0/b3v0mdel.c
@@ -21,8 +21,7 @@ BSIM3v0mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
 
     oldmod = model;
     for (; *model; model = &((*model)->BSIM3v0nextModel)) {
-        if ((*model)->BSIM3v0modName == modname ||
-            (modfast && *model == modfast))
+        if ((*model)->BSIM3v0modName == modname || (modfast && *model == modfast))
             goto delgot;
         oldmod = model;
     }
@@ -32,10 +31,12 @@ BSIM3v0mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
  delgot:
     *oldmod = (*model)->BSIM3v0nextModel; /* cut deleted device out of list */
     for (here = (*model)->BSIM3v0instances; here; here = here->BSIM3v0nextInstance) {
-        if (prev) FREE(prev);
+        if (prev)
+            FREE(prev);
         prev = here;
     }
-    if (prev) FREE(prev);
+    if (prev)
+        FREE(prev);
     FREE(*model);
     return OK;
 }
diff --git a/src/spicelib/devices/bsim3v1/b3v1mdel.c b/src/spicelib/devices/bsim3v1/b3v1mdel.c
index 38e5e13fb..9b1d9dbff 100644
--- a/src/spicelib/devices/bsim3v1/b3v1mdel.c
+++ b/src/spicelib/devices/bsim3v1/b3v1mdel.c
@@ -27,8 +27,7 @@ BSIM3v1mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
 
     oldmod = model;
     for (; *model; model = &((*model)->BSIM3v1nextModel)) {
-        if ((*model)->BSIM3v1modName == modname ||
-            (modfast && *model == modfast))
+        if ((*model)->BSIM3v1modName == modname || (modfast && *model == modfast))
             goto delgot;
         oldmod = model;
     }
@@ -38,10 +37,12 @@ BSIM3v1mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
  delgot:
     *oldmod = (*model)->BSIM3v1nextModel; /* cut deleted device out of list */
     for (here = (*model)->BSIM3v1instances; here; here = here->BSIM3v1nextInstance) {
-        if (prev) FREE(prev);
+        if (prev)
+            FREE(prev);
         prev = here;
     }
-    if (prev) FREE(prev);
+    if (prev)
+        FREE(prev);
     FREE(*model);
     return OK;
 }
diff --git a/src/spicelib/devices/bsim3v32/b3v32mdel.c b/src/spicelib/devices/bsim3v32/b3v32mdel.c
index 075f02f81..c4222705e 100644
--- a/src/spicelib/devices/bsim3v32/b3v32mdel.c
+++ b/src/spicelib/devices/bsim3v32/b3v32mdel.c
@@ -26,8 +26,7 @@ BSIM3v32mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
 
     oldmod = model;
     for (; *model; model = &((*model)->BSIM3v32nextModel)) {
-        if ((*model)->BSIM3v32modName == modname ||
-            (modfast && *model == modfast))
+        if ((*model)->BSIM3v32modName == modname || (modfast && *model == modfast))
             goto delgot;
         oldmod = model;
     }
@@ -37,10 +36,12 @@ BSIM3v32mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
  delgot:
     *oldmod = (*model)->BSIM3v32nextModel; /* cut deleted device out of list */
     for (here = (*model)->BSIM3v32instances; here; here = here->BSIM3v32nextInstance) {
-        if (prev) FREE(prev);
+        if (prev)
+            FREE(prev);
         prev = here;
     }
-    if (prev) FREE(prev);
+    if (prev)
+        FREE(prev);
     FREE(*model);
     return OK;
 }
diff --git a/src/spicelib/devices/bsim4/b4mdel.c b/src/spicelib/devices/bsim4/b4mdel.c
index 30b81e51b..0f3b54d92 100644
--- a/src/spicelib/devices/bsim4/b4mdel.c
+++ b/src/spicelib/devices/bsim4/b4mdel.c
@@ -65,10 +65,7 @@
 
 
 int
-BSIM4mDelete(
-             GENmodel **inModel,
-             IFuid modname,
-             GENmodel *kill)
+BSIM4mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
 {
     BSIM4model **model = (BSIM4model **) inModel;
     BSIM4model *modfast = (BSIM4model *) kill;
@@ -78,8 +75,7 @@ BSIM4mDelete(
 
     oldmod = model;
     for (; *model; model = &((*model)->BSIM4nextModel)) {
-        if ((*model)->BSIM4modName == modname ||
-            (modfast && *model == modfast))
+        if ((*model)->BSIM4modName == modname || (modfast && *model == modfast))
             goto delgot;
         oldmod = model;
     }
@@ -89,10 +85,12 @@ BSIM4mDelete(
  delgot:
     *oldmod = (*model)->BSIM4nextModel; /* cut deleted device out of list */
     for (here = (*model)->BSIM4instances; here; here = here->BSIM4nextInstance) {
-        if (prev) FREE(prev);
+        if (prev)
+            FREE(prev);
         prev = here;
     }
-    if (prev) FREE(prev);
+    if (prev)
+        FREE(prev);
     FREE(*model);
     return OK;
 }
diff --git a/src/spicelib/devices/bsim4v5/b4v5mdel.c b/src/spicelib/devices/bsim4v5/b4v5mdel.c
index d764d6874..e10231b4b 100644
--- a/src/spicelib/devices/bsim4v5/b4v5mdel.c
+++ b/src/spicelib/devices/bsim4v5/b4v5mdel.c
@@ -15,10 +15,7 @@
 
 
 int
-BSIM4v5mDelete(
-               GENmodel **inModel,
-               IFuid modname,
-               GENmodel *kill)
+BSIM4v5mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
 {
     BSIM4v5model **model = (BSIM4v5model **) inModel;
     BSIM4v5model *modfast = (BSIM4v5model *) kill;
@@ -28,8 +25,7 @@ BSIM4v5mDelete(
 
     oldmod = model;
     for (; *model; model = &((*model)->BSIM4v5nextModel)) {
-        if ((*model)->BSIM4v5modName == modname ||
-            (modfast && *model == modfast))
+        if ((*model)->BSIM4v5modName == modname || (modfast && *model == modfast))
             goto delgot;
         oldmod = model;
     }
@@ -39,10 +35,12 @@ BSIM4v5mDelete(
  delgot:
     *oldmod = (*model)->BSIM4v5nextModel; /* cut deleted device out of list */
     for (here = (*model)->BSIM4v5instances; here; here = here->BSIM4v5nextInstance) {
-        if (prev) FREE(prev);
+        if (prev)
+            FREE(prev);
         prev = here;
     }
-    if (prev) FREE(prev);
+    if (prev)
+        FREE(prev);
     FREE(*model);
     return OK;
 }
diff --git a/src/spicelib/devices/bsim4v6/b4v6mdel.c b/src/spicelib/devices/bsim4v6/b4v6mdel.c
index 83b0a738d..afa655153 100644
--- a/src/spicelib/devices/bsim4v6/b4v6mdel.c
+++ b/src/spicelib/devices/bsim4v6/b4v6mdel.c
@@ -17,10 +17,7 @@
 
 
 int
-BSIM4v6mDelete(
-               GENmodel **inModel,
-               IFuid modname,
-               GENmodel *kill)
+BSIM4v6mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
 {
     BSIM4v6model **model = (BSIM4v6model **) inModel;
     BSIM4v6model *modfast = (BSIM4v6model *) kill;
@@ -30,8 +27,7 @@ BSIM4v6mDelete(
 
     oldmod = model;
     for (; *model; model = &((*model)->BSIM4v6nextModel)) {
-        if ((*model)->BSIM4v6modName == modname ||
-            (modfast && *model == modfast))
+        if ((*model)->BSIM4v6modName == modname || (modfast && *model == modfast))
             goto delgot;
         oldmod = model;
     }
@@ -41,10 +37,12 @@ BSIM4v6mDelete(
  delgot:
     *oldmod = (*model)->BSIM4v6nextModel; /* cut deleted device out of list */
     for (here = (*model)->BSIM4v6instances; here; here = here->BSIM4v6nextInstance) {
-        if (prev) FREE(prev);
+        if (prev)
+            FREE(prev);
         prev = here;
     }
-    if (prev) FREE(prev);
+    if (prev)
+        FREE(prev);
     FREE(*model);
     return OK;
 }
diff --git a/src/spicelib/devices/bsim4v7/b4v7mdel.c b/src/spicelib/devices/bsim4v7/b4v7mdel.c
index bfe8ec401..0cbdb4510 100644
--- a/src/spicelib/devices/bsim4v7/b4v7mdel.c
+++ b/src/spicelib/devices/bsim4v7/b4v7mdel.c
@@ -17,10 +17,7 @@
 
 
 int
-BSIM4v7mDelete(
-               GENmodel **inModel,
-               IFuid modname,
-               GENmodel *kill)
+BSIM4v7mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
 {
     BSIM4v7model **model = (BSIM4v7model **) inModel;
     BSIM4v7model *modfast = (BSIM4v7model *) kill;
@@ -30,8 +27,7 @@ BSIM4v7mDelete(
 
     oldmod = model;
     for (; *model; model = &((*model)->BSIM4v7nextModel)) {
-        if ((*model)->BSIM4v7modName == modname ||
-            (modfast && *model == modfast))
+        if ((*model)->BSIM4v7modName == modname || (modfast && *model == modfast))
             goto delgot;
         oldmod = model;
     }
@@ -41,10 +37,12 @@ BSIM4v7mDelete(
  delgot:
     *oldmod = (*model)->BSIM4v7nextModel; /* cut deleted device out of list */
     for (here = (*model)->BSIM4v7instances; here; here = here->BSIM4v7nextInstance) {
-        if (prev) FREE(prev);
+        if (prev)
+            FREE(prev);
         prev = here;
     }
-    if (prev) FREE(prev);
+    if (prev)
+        FREE(prev);
     FREE(*model);
     return OK;
 }
diff --git a/src/spicelib/devices/bsimsoi/b4soimdel.c b/src/spicelib/devices/bsimsoi/b4soimdel.c
index 1f1af6e38..0e74aee81 100644
--- a/src/spicelib/devices/bsimsoi/b4soimdel.c
+++ b/src/spicelib/devices/bsimsoi/b4soimdel.c
@@ -21,10 +21,7 @@
 
 
 int
-B4SOImDelete(
-             GENmodel **inModel,
-             IFuid modname,
-             GENmodel *kill)
+B4SOImDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
 {
     B4SOImodel **model = (B4SOImodel **) inModel;
     B4SOImodel *modfast = (B4SOImodel *) kill;
@@ -34,8 +31,7 @@ B4SOImDelete(
 
     oldmod = model;
     for (; *model; model = &((*model)->B4SOInextModel)) {
-        if ((*model)->B4SOImodName == modname ||
-            (modfast && *model == modfast))
+        if ((*model)->B4SOImodName == modname || (modfast && *model == modfast))
             goto delgot;
         oldmod = model;
     }
@@ -45,10 +41,12 @@ B4SOImDelete(
  delgot:
     *oldmod = (*model)->B4SOInextModel; /* cut deleted device out of list */
     for (here = (*model)->B4SOIinstances; here; here = here->B4SOInextInstance) {
-        if (prev) FREE(prev);
+        if (prev)
+            FREE(prev);
         prev = here;
     }
-    if (prev) FREE(prev);
+    if (prev)
+        FREE(prev);
     FREE(*model);
     return OK;
 }
diff --git a/src/spicelib/devices/cap/capmdel.c b/src/spicelib/devices/cap/capmdel.c
index fc9ea3c0d..57969bb61 100644
--- a/src/spicelib/devices/cap/capmdel.c
+++ b/src/spicelib/devices/cap/capmdel.c
@@ -21,8 +21,8 @@ CAPmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
 
     oldmod = model;
     for (; *model; model = &((*model)->CAPnextModel)) {
-        if ((*model)->CAPmodName == modname ||
-            (modfast && *model == modfast)) goto delgot;
+        if ((*model)->CAPmodName == modname || (modfast && *model == modfast))
+            goto delgot;
         oldmod = model;
     }
 
@@ -31,10 +31,12 @@ CAPmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
  delgot:
     *oldmod = (*model)->CAPnextModel; /* cut deleted device out of list */
     for (here = (*model)->CAPinstances; here; here = here->CAPnextInstance) {
-        if (prev) FREE(prev);
+        if (prev)
+            FREE(prev);
         prev = here;
     }
-    if (prev) FREE(prev);
+    if (prev)
+        FREE(prev);
     FREE(*model);
     return OK;
 }
diff --git a/src/spicelib/devices/cccs/cccsmdel.c b/src/spicelib/devices/cccs/cccsmdel.c
index fb12c29f6..f93c775c9 100644
--- a/src/spicelib/devices/cccs/cccsmdel.c
+++ b/src/spicelib/devices/cccs/cccsmdel.c
@@ -20,8 +20,8 @@ CCCSmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
 
     oldmod = model;
     for (; *model; model = &((*model)->CCCSnextModel)) {
-        if ((*model)->CCCSmodName == modname ||
-            (modfast && *model == modfast)) goto delgot;
+        if ((*model)->CCCSmodName == modname || (modfast && *model == modfast))
+            goto delgot;
         oldmod = model;
     }
 
@@ -30,10 +30,12 @@ CCCSmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
  delgot:
     *oldmod = (*model)->CCCSnextModel; /* cut deleted device out of list */
     for (here = (*model)->CCCSinstances; here; here = here->CCCSnextInstance) {
-        if (prev) FREE(prev);
+        if (prev)
+            FREE(prev);
         prev = here;
     }
-    if (prev) FREE(prev);
+    if (prev)
+        FREE(prev);
     FREE(*model);
     return OK;
 }
diff --git a/src/spicelib/devices/ccvs/ccvsmdel.c b/src/spicelib/devices/ccvs/ccvsmdel.c
index 473be8811..d655f8144 100644
--- a/src/spicelib/devices/ccvs/ccvsmdel.c
+++ b/src/spicelib/devices/ccvs/ccvsmdel.c
@@ -20,8 +20,8 @@ CCVSmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
 
     oldmod = model;
     for (; *model; model = &((*model)->CCVSnextModel)) {
-        if ((*model)->CCVSmodName == modname ||
-            (modfast && *model == modfast)) goto delgot;
+        if ((*model)->CCVSmodName == modname || (modfast && *model == modfast))
+            goto delgot;
         oldmod = model;
     }
 
@@ -30,10 +30,12 @@ CCVSmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
  delgot:
     *oldmod = (*model)->CCVSnextModel; /* cut deleted device out of list */
     for (here = (*model)->CCVSinstances; here; here = here->CCVSnextInstance) {
-        if (prev) FREE(prev);
+        if (prev)
+            FREE(prev);
         prev = here;
     }
-    if (prev) FREE(prev);
+    if (prev)
+        FREE(prev);
     FREE(*model);
     return OK;
 }
diff --git a/src/spicelib/devices/cpl/cplmdel.c b/src/spicelib/devices/cpl/cplmdel.c
index bfe32fe49..c50a6ef53 100644
--- a/src/spicelib/devices/cpl/cplmdel.c
+++ b/src/spicelib/devices/cpl/cplmdel.c
@@ -22,8 +22,8 @@ CPLmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
 
     oldmod = model;
     for (; *model; model = &((*model)->CPLnextModel)) {
-        if ((*model)->CPLmodName == modname ||
-            (modfast && *model == modfast)) goto delgot;
+        if ((*model)->CPLmodName == modname || (modfast && *model == modfast))
+            goto delgot;
         oldmod = model;
     }
 
@@ -32,10 +32,12 @@ CPLmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
  delgot:
     *oldmod = (*model)->CPLnextModel; /* cut deleted device out of list */
     for (here = (*model)->CPLinstances; here; here = here->CPLnextInstance) {
-        if (prev) FREE(prev);
+        if (prev)
+            FREE(prev);
         prev = here;
     }
-    if (prev) FREE(prev);
+    if (prev)
+        FREE(prev);
     FREE(*model);
     return OK;
 }
diff --git a/src/spicelib/devices/csw/cswmdel.c b/src/spicelib/devices/csw/cswmdel.c
index 94109faa0..62e782bda 100644
--- a/src/spicelib/devices/csw/cswmdel.c
+++ b/src/spicelib/devices/csw/cswmdel.c
@@ -20,8 +20,8 @@ CSWmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
 
     oldmod = model;
     for (; *model; model = &((*model)->CSWnextModel)) {
-        if ((*model)->CSWmodName == modname ||
-            (modfast && *model == modfast)) goto delgot;
+        if ((*model)->CSWmodName == modname || (modfast && *model == modfast))
+            goto delgot;
         oldmod = model;
     }
 
@@ -30,10 +30,12 @@ CSWmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
  delgot:
     *oldmod = (*model)->CSWnextModel; /* cut deleted device out of list */
     for (here = (*model)->CSWinstances; here; here = here->CSWnextInstance) {
-        if (prev) FREE(prev);
+        if (prev)
+            FREE(prev);
         prev = here;
     }
-    if (prev) FREE(prev);
+    if (prev)
+        FREE(prev);
     FREE(*model);
     return OK;
 }
diff --git a/src/spicelib/devices/dio/diomdel.c b/src/spicelib/devices/dio/diomdel.c
index 0513ef2b8..46961c4c2 100644
--- a/src/spicelib/devices/dio/diomdel.c
+++ b/src/spicelib/devices/dio/diomdel.c
@@ -20,8 +20,8 @@ DIOmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
 
     oldmod = model;
     for (; *model; model = &((*model)->DIOnextModel)) {
-        if ((*model)->DIOmodName == modname ||
-            (modfast && *model == modfast)) goto delgot;
+        if ((*model)->DIOmodName == modname || (modfast && *model == modfast))
+            goto delgot;
         oldmod = model;
     }
 
@@ -30,10 +30,12 @@ DIOmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
  delgot:
     *oldmod = (*model)->DIOnextModel; /* cut deleted device out of list */
     for (here = (*model)->DIOinstances; here; here = here->DIOnextInstance) {
-        if (prev) FREE(prev);
+        if (prev)
+            FREE(prev);
         prev = here;
     }
-    if (prev) FREE(prev);
+    if (prev)
+        FREE(prev);
     FREE(*model);
     return OK;
 }
diff --git a/src/spicelib/devices/hfet1/hfetmdel.c b/src/spicelib/devices/hfet1/hfetmdel.c
index 6a38fab45..cab07f070 100644
--- a/src/spicelib/devices/hfet1/hfetmdel.c
+++ b/src/spicelib/devices/hfet1/hfetmdel.c
@@ -24,8 +24,8 @@ HFETAmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
 
     oldmod = model;
     for (; *model; model = &((*model)->HFETAnextModel)) {
-        if ((*model)->HFETAmodName == modname ||
-            (modfast && *model == modfast)) goto delgot;
+        if ((*model)->HFETAmodName == modname || (modfast && *model == modfast))
+            goto delgot;
         oldmod = model;
     }
 
@@ -34,10 +34,12 @@ HFETAmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
  delgot:
     *oldmod = (*model)->HFETAnextModel; /* cut deleted device out of list */
     for (here = (*model)->HFETAinstances; here; here = here->HFETAnextInstance) {
-        if (prev) FREE(prev);
+        if (prev)
+            FREE(prev);
         prev = here;
     }
-    if (prev) FREE(prev);
+    if (prev)
+        FREE(prev);
     FREE(*model);
     return OK;
 }
diff --git a/src/spicelib/devices/hfet2/hfet2mdel.c b/src/spicelib/devices/hfet2/hfet2mdel.c
index 382b9192c..e878fa924 100644
--- a/src/spicelib/devices/hfet2/hfet2mdel.c
+++ b/src/spicelib/devices/hfet2/hfet2mdel.c
@@ -24,8 +24,8 @@ HFET2mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
 
     oldmod = model;
     for (; *model; model = &((*model)->HFET2nextModel)) {
-        if ((*model)->HFET2modName == modname ||
-            (modfast && *model == modfast)) goto delgot;
+        if ((*model)->HFET2modName == modname || (modfast && *model == modfast))
+            goto delgot;
         oldmod = model;
     }
 
@@ -34,10 +34,12 @@ HFET2mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
  delgot:
     *oldmod = (*model)->HFET2nextModel; /* cut deleted device out of list */
     for (here = (*model)->HFET2instances; here; here = here->HFET2nextInstance) {
-        if (prev) FREE(prev);
+        if (prev)
+            FREE(prev);
         prev = here;
     }
-    if (prev) FREE(prev);
+    if (prev)
+        FREE(prev);
     FREE(*model);
     return OK;
 }
diff --git a/src/spicelib/devices/hisim2/hsm2mdel.c b/src/spicelib/devices/hisim2/hsm2mdel.c
index c39d76cf3..9cf0e1565 100644
--- a/src/spicelib/devices/hisim2/hsm2mdel.c
+++ b/src/spicelib/devices/hisim2/hsm2mdel.c
@@ -60,10 +60,8 @@ to others."
 #include "ngspice/suffix.h"
 
 
-int HSM2mDelete(
-                GENmodel **inModel,
-                IFuid modname,
-                GENmodel *kill)
+int
+HSM2mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
 {
     HSM2model **model = (HSM2model **) inModel;
     HSM2model *modfast = (HSM2model *) kill;
@@ -73,8 +71,8 @@ int HSM2mDelete(
 
     oldmod = model;
     for (; *model; model = &((*model)->HSM2nextModel)) {
-        if ((*model)->HSM2modName == modname ||
-             (modfast && *model == modfast)) goto delgot;
+        if ((*model)->HSM2modName == modname || (modfast && *model == modfast))
+            goto delgot;
         oldmod = model;
     }
 
@@ -82,12 +80,13 @@ int HSM2mDelete(
 
  delgot:
     *oldmod = (*model)->HSM2nextModel; /* cut deleted device out of list */
-    for (here = (*model)->HSM2instances;
-          here; here = here->HSM2nextInstance) {
-        if (prev) FREE(prev);
+    for (here = (*model)->HSM2instances; here; here = here->HSM2nextInstance) {
+        if (prev)
+            FREE(prev);
         prev = here;
     }
-    if (prev) FREE(prev);
+    if (prev)
+        FREE(prev);
     FREE(*model);
     return OK;
 }
diff --git a/src/spicelib/devices/hisimhv1/hsmhvmdel.c b/src/spicelib/devices/hisimhv1/hsmhvmdel.c
index 1bc3112a5..6364e3093 100644
--- a/src/spicelib/devices/hisimhv1/hsmhvmdel.c
+++ b/src/spicelib/devices/hisimhv1/hsmhvmdel.c
@@ -21,10 +21,8 @@
 #include "ngspice/suffix.h"
 
 
-int HSMHVmDelete(
-                 GENmodel **inModel,
-                 IFuid modname,
-                 GENmodel *kill)
+int
+HSMHVmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
 {
     HSMHVmodel **model = (HSMHVmodel **) inModel;
     HSMHVmodel *modfast = (HSMHVmodel *) kill;
@@ -34,8 +32,8 @@ int HSMHVmDelete(
 
     oldmod = model;
     for (; *model; model = &((*model)->HSMHVnextModel)) {
-        if ((*model)->HSMHVmodName == modname ||
-             (modfast && *model == modfast)) goto delgot;
+        if ((*model)->HSMHVmodName == modname || (modfast && *model == modfast))
+            goto delgot;
         oldmod = model;
     }
 
@@ -43,12 +41,13 @@ int HSMHVmDelete(
 
  delgot:
     *oldmod = (*model)->HSMHVnextModel; /* cut deleted device out of list */
-    for (here = (*model)->HSMHVinstances;
-          here; here = here->HSMHVnextInstance) {
-        if (prev) FREE(prev);
+    for (here = (*model)->HSMHVinstances; here; here = here->HSMHVnextInstance) {
+        if (prev)
+            FREE(prev);
         prev = here;
     }
-    if (prev) FREE(prev);
+    if (prev)
+        FREE(prev);
     FREE(*model);
     return OK;
 }
diff --git a/src/spicelib/devices/hisimhv2/hsmhv2mdel.c b/src/spicelib/devices/hisimhv2/hsmhv2mdel.c
index 64f1e2968..5e9907c4c 100644
--- a/src/spicelib/devices/hisimhv2/hsmhv2mdel.c
+++ b/src/spicelib/devices/hisimhv2/hsmhv2mdel.c
@@ -63,10 +63,8 @@ June 2008 (revised October 2011)
 #include "ngspice/suffix.h"
 
 
-int HSMHV2mDelete(
-                  GENmodel **inModel,
-                  IFuid modname,
-                  GENmodel *kill)
+int
+HSMHV2mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
 {
     HSMHV2model **model = (HSMHV2model **) inModel;
     HSMHV2model *modfast = (HSMHV2model *) kill;
@@ -76,8 +74,8 @@ int HSMHV2mDelete(
 
     oldmod = model;
     for (; *model; model = &((*model)->HSMHV2nextModel)) {
-        if ((*model)->HSMHV2modName == modname ||
-             (modfast && *model == modfast)) goto delgot;
+        if ((*model)->HSMHV2modName == modname || (modfast && *model == modfast))
+            goto delgot;
         oldmod = model;
     }
 
@@ -85,12 +83,13 @@ int HSMHV2mDelete(
 
  delgot:
     *oldmod = (*model)->HSMHV2nextModel; /* cut deleted device out of list */
-    for (here = (*model)->HSMHV2instances;
-          here; here = here->HSMHV2nextInstance) {
-        if (prev) FREE(prev);
+    for (here = (*model)->HSMHV2instances; here; here = here->HSMHV2nextInstance) {
+        if (prev)
+            FREE(prev);
         prev = here;
     }
-    if (prev) FREE(prev);
+    if (prev)
+        FREE(prev);
     FREE(*model);
     return OK;
 }
diff --git a/src/spicelib/devices/ind/indmdel.c b/src/spicelib/devices/ind/indmdel.c
index ec455044e..b66b03852 100644
--- a/src/spicelib/devices/ind/indmdel.c
+++ b/src/spicelib/devices/ind/indmdel.c
@@ -20,8 +20,8 @@ INDmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
 
     oldmod = model;
     for (; *model; model = &((*model)->INDnextModel)) {
-        if ((*model)->INDmodName == modname ||
-            (modfast && *model == modfast)) goto delgot;
+        if ((*model)->INDmodName == modname || (modfast && *model == modfast))
+            goto delgot;
         oldmod = model;
     }
 
@@ -30,10 +30,12 @@ INDmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
  delgot:
     *oldmod = (*model)->INDnextModel; /* cut deleted device out of list */
     for (here = (*model)->INDinstances; here; here = here->INDnextInstance) {
-        if (prev) FREE(prev);
+        if (prev)
+            FREE(prev);
         prev = here;
     }
-    if (prev) FREE(prev);
+    if (prev)
+        FREE(prev);
     FREE(*model);
     return OK;
 }
diff --git a/src/spicelib/devices/ind/mutmdel.c b/src/spicelib/devices/ind/mutmdel.c
index fd106d5ef..72f2853a1 100644
--- a/src/spicelib/devices/ind/mutmdel.c
+++ b/src/spicelib/devices/ind/mutmdel.c
@@ -21,8 +21,8 @@ MUTmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
 
     oldmod = model;
     for (; *model; model = &((*model)->MUTnextModel)) {
-        if ((*model)->MUTmodName == modname ||
-            (modfast && *model == modfast)) goto delgot;
+        if ((*model)->MUTmodName == modname || (modfast && *model == modfast))
+            goto delgot;
         oldmod = model;
     }
 
@@ -31,10 +31,12 @@ MUTmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
  delgot:
     *oldmod = (*model)->MUTnextModel; /* cut deleted device out of list */
     for (here = (*model)->MUTinstances; here; here = here->MUTnextInstance) {
-        if (prev) FREE(prev);
+        if (prev)
+            FREE(prev);
         prev = here;
     }
-    if (prev) FREE(prev);
+    if (prev)
+        FREE(prev);
     FREE(*model);
     return OK;
 }
diff --git a/src/spicelib/devices/isrc/isrcmdel.c b/src/spicelib/devices/isrc/isrcmdel.c
index 4e0f72b67..6f48ea9df 100644
--- a/src/spicelib/devices/isrc/isrcmdel.c
+++ b/src/spicelib/devices/isrc/isrcmdel.c
@@ -20,8 +20,8 @@ ISRCmDelete(GENmodel **inModel, IFuid modname, GENmodel *fast)
 
     oldmod = model;
     for (; *model; model = &((*model)->ISRCnextModel)) {
-        if ((*model)->ISRCmodName == modname ||
-            (modfast && *model == modfast)) goto delgot;
+        if ((*model)->ISRCmodName == modname || (modfast && *model == modfast))
+            goto delgot;
         oldmod = model;
     }
 
@@ -30,10 +30,12 @@ ISRCmDelete(GENmodel **inModel, IFuid modname, GENmodel *fast)
  delgot:
     *oldmod = (*model)->ISRCnextModel; /* cut deleted device out of list */
     for (here = (*model)->ISRCinstances; here; here = here->ISRCnextInstance) {
-        if (prev) FREE(prev);
+        if (prev)
+            FREE(prev);
         prev = here;
     }
-    if (prev) FREE(prev);
+    if (prev)
+        FREE(prev);
     FREE(*model);
     return OK;
 }
diff --git a/src/spicelib/devices/jfet/jfetmdel.c b/src/spicelib/devices/jfet/jfetmdel.c
index fe93597fc..f5efa05fb 100644
--- a/src/spicelib/devices/jfet/jfetmdel.c
+++ b/src/spicelib/devices/jfet/jfetmdel.c
@@ -20,8 +20,8 @@ JFETmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
 
     oldmod = model;
     for (; *model; model = &((*model)->JFETnextModel)) {
-        if ((*model)->JFETmodName == modname ||
-            (modfast && *model == modfast)) goto delgot;
+        if ((*model)->JFETmodName == modname || (modfast && *model == modfast))
+            goto delgot;
         oldmod = model;
     }
 
@@ -30,10 +30,12 @@ JFETmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
  delgot:
     *oldmod = (*model)->JFETnextModel; /* cut deleted device out of list */
     for (here = (*model)->JFETinstances; here; here = here->JFETnextInstance) {
-        if (prev) FREE(prev);
+        if (prev)
+            FREE(prev);
         prev = here;
     }
-    if (prev) FREE(prev);
+    if (prev)
+        FREE(prev);
     FREE(*model);
     return OK;
 }
diff --git a/src/spicelib/devices/jfet2/jfet2mdel.c b/src/spicelib/devices/jfet2/jfet2mdel.c
index 670249a7b..e23deb1b7 100644
--- a/src/spicelib/devices/jfet2/jfet2mdel.c
+++ b/src/spicelib/devices/jfet2/jfet2mdel.c
@@ -24,8 +24,8 @@ JFET2mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
 
     oldmod = model;
     for (; *model; model = &((*model)->JFET2nextModel)) {
-        if ((*model)->JFET2modName == modname ||
-            (modfast && *model == modfast)) goto delgot;
+        if ((*model)->JFET2modName == modname || (modfast && *model == modfast))
+            goto delgot;
         oldmod = model;
     }
 
@@ -34,10 +34,12 @@ JFET2mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
  delgot:
     *oldmod = (*model)->JFET2nextModel; /* cut deleted device out of list */
     for (here = (*model)->JFET2instances; here; here = here->JFET2nextInstance) {
-        if (prev) FREE(prev);
+        if (prev)
+            FREE(prev);
         prev = here;
     }
-    if (prev) FREE(prev);
+    if (prev)
+        FREE(prev);
     FREE(*model);
     return OK;
 }
diff --git a/src/spicelib/devices/ltra/ltramdel.c b/src/spicelib/devices/ltra/ltramdel.c
index 8c61c914e..1075765a0 100644
--- a/src/spicelib/devices/ltra/ltramdel.c
+++ b/src/spicelib/devices/ltra/ltramdel.c
@@ -20,8 +20,7 @@ LTRAmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
 
     oldmod = model;
     for (; *model; model = &((*model)->LTRAnextModel)) {
-        if ((*model)->LTRAmodName == modname ||
-            (modfast && *model == modfast))
+        if ((*model)->LTRAmodName == modname || (modfast && *model == modfast))
             goto delgot;
         oldmod = model;
     }
diff --git a/src/spicelib/devices/mes/mesmdel.c b/src/spicelib/devices/mes/mesmdel.c
index 892e5e7e3..4af104e86 100644
--- a/src/spicelib/devices/mes/mesmdel.c
+++ b/src/spicelib/devices/mes/mesmdel.c
@@ -20,8 +20,8 @@ MESmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
 
     oldmod = model;
     for (; *model; model = &((*model)->MESnextModel)) {
-        if ((*model)->MESmodName == modname ||
-            (modfast && *model == modfast)) goto delgot;
+        if ((*model)->MESmodName == modname || (modfast && *model == modfast))
+            goto delgot;
         oldmod = model;
     }
 
@@ -30,10 +30,12 @@ MESmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
  delgot:
     *oldmod = (*model)->MESnextModel; /* cut deleted device out of list */
     for (here = (*model)->MESinstances; here; here = here->MESnextInstance) {
-        if (prev) FREE(prev);
+        if (prev)
+            FREE(prev);
         prev = here;
     }
-    if (prev) FREE(prev);
+    if (prev)
+        FREE(prev);
     FREE(*model);
     return OK;
 }
diff --git a/src/spicelib/devices/mesa/mesamdel.c b/src/spicelib/devices/mesa/mesamdel.c
index 9f73b8fd9..92ab3be82 100644
--- a/src/spicelib/devices/mesa/mesamdel.c
+++ b/src/spicelib/devices/mesa/mesamdel.c
@@ -24,8 +24,8 @@ MESAmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
 
     oldmod = model;
     for (; *model; model = &((*model)->MESAnextModel)) {
-        if ((*model)->MESAmodName == modname ||
-            (modfast && *model == modfast)) goto delgot;
+        if ((*model)->MESAmodName == modname || (modfast && *model == modfast))
+            goto delgot;
         oldmod = model;
     }
 
@@ -34,10 +34,12 @@ MESAmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
  delgot:
     *oldmod = (*model)->MESAnextModel; /* cut deleted device out of list */
     for (here = (*model)->MESAinstances; here; here = here->MESAnextInstance) {
-        if (prev) FREE(prev);
+        if (prev)
+            FREE(prev);
         prev = here;
     }
-    if (prev) FREE(prev);
+    if (prev)
+        FREE(prev);
     FREE(*model);
     return OK;
 }
diff --git a/src/spicelib/devices/mos1/mos1mdel.c b/src/spicelib/devices/mos1/mos1mdel.c
index 30b79108c..b125356a1 100644
--- a/src/spicelib/devices/mos1/mos1mdel.c
+++ b/src/spicelib/devices/mos1/mos1mdel.c
@@ -20,8 +20,8 @@ MOS1mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
 
     oldmod = model;
     for (; *model; model = &((*model)->MOS1nextModel)) {
-        if ((*model)->MOS1modName == modname ||
-            (modfast && *model == modfast)) goto delgot;
+        if ((*model)->MOS1modName == modname || (modfast && *model == modfast))
+            goto delgot;
         oldmod = model;
     }
 
@@ -30,10 +30,12 @@ MOS1mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
  delgot:
     *oldmod = (*model)->MOS1nextModel; /* cut deleted device out of list */
     for (here = (*model)->MOS1instances; here; here = here->MOS1nextInstance) {
-        if (prev) FREE(prev);
+        if (prev)
+            FREE(prev);
         prev = here;
     }
-    if (prev) FREE(prev);
+    if (prev)
+        FREE(prev);
     FREE(*model);
     return OK;
 }
diff --git a/src/spicelib/devices/mos2/mos2mdel.c b/src/spicelib/devices/mos2/mos2mdel.c
index 10360420c..3c10020da 100644
--- a/src/spicelib/devices/mos2/mos2mdel.c
+++ b/src/spicelib/devices/mos2/mos2mdel.c
@@ -20,8 +20,8 @@ MOS2mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
 
     oldmod = model;
     for (; *model; model = &((*model)->MOS2nextModel)) {
-        if ((*model)->MOS2modName == modname ||
-            (modfast && *model == modfast)) goto delgot;
+        if ((*model)->MOS2modName == modname || (modfast && *model == modfast))
+            goto delgot;
         oldmod = model;
     }
 
@@ -30,10 +30,12 @@ MOS2mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
  delgot:
     *oldmod = (*model)->MOS2nextModel; /* cut deleted device out of list */
     for (here = (*model)->MOS2instances; here; here = here->MOS2nextInstance) {
-        if (prev) FREE(prev);
+        if (prev)
+            FREE(prev);
         prev = here;
     }
-    if (prev) FREE(prev);
+    if (prev)
+        FREE(prev);
     FREE(*model);
     return OK;
 }
diff --git a/src/spicelib/devices/mos3/mos3mdel.c b/src/spicelib/devices/mos3/mos3mdel.c
index 81fecf8f0..0cc194e56 100644
--- a/src/spicelib/devices/mos3/mos3mdel.c
+++ b/src/spicelib/devices/mos3/mos3mdel.c
@@ -20,8 +20,8 @@ MOS3mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
 
     oldmod = model;
     for (; *model; model = &((*model)->MOS3nextModel)) {
-        if ((*model)->MOS3modName == modname ||
-            (modfast && *model == modfast)) goto delgot;
+        if ((*model)->MOS3modName == modname || (modfast && *model == modfast))
+            goto delgot;
         oldmod = model;
     }
 
@@ -30,10 +30,12 @@ MOS3mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
  delgot:
     *oldmod = (*model)->MOS3nextModel; /* cut deleted device out of list */
     for (here = (*model)->MOS3instances; here; here = here->MOS3nextInstance) {
-        if (prev) FREE(prev);
+        if (prev)
+            FREE(prev);
         prev = here;
     }
-    if (prev) FREE(prev);
+    if (prev)
+        FREE(prev);
     FREE(*model);
     return OK;
 }
diff --git a/src/spicelib/devices/mos9/mos9mdel.c b/src/spicelib/devices/mos9/mos9mdel.c
index af66d9c06..be1aa4703 100644
--- a/src/spicelib/devices/mos9/mos9mdel.c
+++ b/src/spicelib/devices/mos9/mos9mdel.c
@@ -21,8 +21,8 @@ MOS9mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
 
     oldmod = model;
     for (; *model; model = &((*model)->MOS9nextModel)) {
-        if ((*model)->MOS9modName == modname ||
-            (modfast && *model == modfast)) goto delgot;
+        if ((*model)->MOS9modName == modname || (modfast && *model == modfast))
+            goto delgot;
         oldmod = model;
     }
 
@@ -31,10 +31,12 @@ MOS9mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
  delgot:
     *oldmod = (*model)->MOS9nextModel; /* cut deleted device out of list */
     for (here = (*model)->MOS9instances; here; here = here->MOS9nextInstance) {
-        if (prev) FREE(prev);
+        if (prev)
+            FREE(prev);
         prev = here;
     }
-    if (prev) FREE(prev);
+    if (prev)
+        FREE(prev);
     FREE(*model);
     return OK;
 }
diff --git a/src/spicelib/devices/nbjt/nbjtmdel.c b/src/spicelib/devices/nbjt/nbjtmdel.c
index 1a8f2d018..4ac5c8b42 100644
--- a/src/spicelib/devices/nbjt/nbjtmdel.c
+++ b/src/spicelib/devices/nbjt/nbjtmdel.c
@@ -23,8 +23,7 @@ NBJTmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
 
     oldmod = model;
     for (; *model; model = &((*model)->NBJTnextModel)) {
-        if ((*model)->NBJTmodName == modname ||
-            (modfast && *model == modfast))
+        if ((*model)->NBJTmodName == modname || (modfast && *model == modfast))
             goto delgot;
         oldmod = model;
     }
diff --git a/src/spicelib/devices/nbjt2/nbt2mdel.c b/src/spicelib/devices/nbjt2/nbt2mdel.c
index 182a9aec7..2c4a92853 100644
--- a/src/spicelib/devices/nbjt2/nbt2mdel.c
+++ b/src/spicelib/devices/nbjt2/nbt2mdel.c
@@ -23,8 +23,7 @@ NBJT2mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
 
     oldmod = model;
     for (; *model; model = &((*model)->NBJT2nextModel)) {
-        if ((*model)->NBJT2modName == modname ||
-            (modfast && *model == modfast))
+        if ((*model)->NBJT2modName == modname || (modfast && *model == modfast))
             goto delgot;
         oldmod = model;
     }
diff --git a/src/spicelib/devices/ndev/ndevmdel.c b/src/spicelib/devices/ndev/ndevmdel.c
index 33b01b05a..8fc7ba412 100644
--- a/src/spicelib/devices/ndev/ndevmdel.c
+++ b/src/spicelib/devices/ndev/ndevmdel.c
@@ -10,10 +10,7 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
 
 
 int
-NDEVmDelete(
-            GENmodel **inModel,
-            IFuid modname,
-            GENmodel *kill)
+NDEVmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
 {
     NG_IGNORE(inModel);
     NG_IGNORE(modname);
diff --git a/src/spicelib/devices/numd/numdmdel.c b/src/spicelib/devices/numd/numdmdel.c
index e28df7a21..b73788074 100644
--- a/src/spicelib/devices/numd/numdmdel.c
+++ b/src/spicelib/devices/numd/numdmdel.c
@@ -20,8 +20,7 @@ NUMDmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
 
     oldmod = model;
     for (; *model; model = &((*model)->NUMDnextModel)) {
-        if ((*model)->NUMDmodName == modname ||
-            (modfast && *model == modfast))
+        if ((*model)->NUMDmodName == modname || (modfast && *model == modfast))
             goto delgot;
         oldmod = model;
     }
diff --git a/src/spicelib/devices/numd2/nud2mdel.c b/src/spicelib/devices/numd2/nud2mdel.c
index e5f47a9c5..2caba9528 100644
--- a/src/spicelib/devices/numd2/nud2mdel.c
+++ b/src/spicelib/devices/numd2/nud2mdel.c
@@ -20,8 +20,7 @@ NUMD2mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
 
     oldmod = model;
     for (; *model; model = &((*model)->NUMD2nextModel)) {
-        if ((*model)->NUMD2modName == modname ||
-            (modfast && *model == modfast))
+        if ((*model)->NUMD2modName == modname || (modfast && *model == modfast))
             goto delgot;
         oldmod = model;
     }
diff --git a/src/spicelib/devices/numos/nummmdel.c b/src/spicelib/devices/numos/nummmdel.c
index ba0fae29a..0c5177abb 100644
--- a/src/spicelib/devices/numos/nummmdel.c
+++ b/src/spicelib/devices/numos/nummmdel.c
@@ -23,8 +23,7 @@ NUMOSmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
 
     oldmod = model;
     for (; *model; model = &((*model)->NUMOSnextModel)) {
-        if ((*model)->NUMOSmodName == modname ||
-            (modfast && *model == modfast))
+        if ((*model)->NUMOSmodName == modname || (modfast && *model == modfast))
             goto delgot;
         oldmod = model;
     }
diff --git a/src/spicelib/devices/res/resmdel.c b/src/spicelib/devices/res/resmdel.c
index bfe5178f2..02fbbb4eb 100644
--- a/src/spicelib/devices/res/resmdel.c
+++ b/src/spicelib/devices/res/resmdel.c
@@ -20,8 +20,8 @@ RESmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
 
     oldmod = model;
     for (; *model; model = &((*model)->RESnextModel)) {
-        if ((*model)->RESmodName == modname ||
-            (modfast && *model == modfast)) goto delgot;
+        if ((*model)->RESmodName == modname || (modfast && *model == modfast))
+            goto delgot;
         oldmod = model;
     }
 
@@ -30,10 +30,12 @@ RESmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
  delgot:
     *oldmod = (*model)->RESnextModel; /* cut deleted device out of list */
     for (here = (*model)->RESinstances; here; here = here->RESnextInstance) {
-        if (prev) FREE(prev);
+        if (prev)
+            FREE(prev);
         prev = here;
     }
-    if (prev) FREE(prev);
+    if (prev)
+        FREE(prev);
     FREE(*model);
     return OK;
 }
diff --git a/src/spicelib/devices/soi3/soi3mdel.c b/src/spicelib/devices/soi3/soi3mdel.c
index e5cc167f2..51dd40513 100644
--- a/src/spicelib/devices/soi3/soi3mdel.c
+++ b/src/spicelib/devices/soi3/soi3mdel.c
@@ -37,8 +37,8 @@ SOI3mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
 
     oldmod = model;
     for (; *model; model = &((*model)->SOI3nextModel)) {
-        if ((*model)->SOI3modName == modname ||
-            (modfast && *model == modfast)) goto delgot;
+        if ((*model)->SOI3modName == modname || (modfast && *model == modfast))
+            goto delgot;
         oldmod = model;
     }
 
@@ -47,10 +47,12 @@ SOI3mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
  delgot:
     *oldmod = (*model)->SOI3nextModel; /* cut deleted device out of list */
     for (here = (*model)->SOI3instances; here; here = here->SOI3nextInstance) {
-        if (prev) FREE(prev);
+        if (prev)
+            FREE(prev);
         prev = here;
     }
-    if (prev) FREE(prev);
+    if (prev)
+        FREE(prev);
     FREE(*model);
     return OK;
 }
diff --git a/src/spicelib/devices/sw/swmdel.c b/src/spicelib/devices/sw/swmdel.c
index 8c812c681..9da4ea132 100644
--- a/src/spicelib/devices/sw/swmdel.c
+++ b/src/spicelib/devices/sw/swmdel.c
@@ -20,8 +20,8 @@ SWmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
 
     oldmod = model;
     for (; *model; model = &((*model)->SWnextModel)) {
-        if ((*model)->SWmodName == modname ||
-            (modfast && *model == modfast)) goto delgot;
+        if ((*model)->SWmodName == modname || (modfast && *model == modfast))
+            goto delgot;
         oldmod = model;
     }
 
@@ -30,10 +30,12 @@ SWmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
  delgot:
     *oldmod = (*model)->SWnextModel; /* cut deleted device out of list */
     for (here = (*model)->SWinstances; here; here = here->SWnextInstance) {
-        if (prev) FREE(prev);
+        if (prev)
+            FREE(prev);
         prev = here;
     }
-    if (prev) FREE(prev);
+    if (prev)
+        FREE(prev);
     FREE(*model);
     return OK;
 }
diff --git a/src/spicelib/devices/tra/tramdel.c b/src/spicelib/devices/tra/tramdel.c
index 493affb6f..c50e93591 100644
--- a/src/spicelib/devices/tra/tramdel.c
+++ b/src/spicelib/devices/tra/tramdel.c
@@ -20,8 +20,8 @@ TRAmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
 
     oldmod = model;
     for (; *model; model = &((*model)->TRAnextModel)) {
-        if ((*model)->TRAmodName == modname ||
-            (modfast && *model == modfast)) goto delgot;
+        if ((*model)->TRAmodName == modname || (modfast && *model == modfast))
+            goto delgot;
         oldmod = model;
     }
 
@@ -30,10 +30,12 @@ TRAmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
  delgot:
     *oldmod = (*model)->TRAnextModel; /* cut deleted device out of list */
     for (here = (*model)->TRAinstances; here; here = here->TRAnextInstance) {
-        if (prev) FREE(prev);
+        if (prev)
+            FREE(prev);
         prev = here;
     }
-    if (prev) FREE(prev);
+    if (prev)
+        FREE(prev);
     FREE(*model);
     return OK;
 }
diff --git a/src/spicelib/devices/txl/txlmdel.c b/src/spicelib/devices/txl/txlmdel.c
index f3ee8218b..799c3c24e 100644
--- a/src/spicelib/devices/txl/txlmdel.c
+++ b/src/spicelib/devices/txl/txlmdel.c
@@ -21,8 +21,8 @@ TXLmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
 
     oldmod = model;
     for (; *model; model = &((*model)->TXLnextModel)) {
-        if ((*model)->TXLmodName == modname ||
-            (modfast && *model == modfast)) goto delgot;
+        if ((*model)->TXLmodName == modname || (modfast && *model == modfast))
+            goto delgot;
         oldmod = model;
     }
 
@@ -31,10 +31,12 @@ TXLmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
  delgot:
     *oldmod = (*model)->TXLnextModel; /* cut deleted device out of list */
     for (here = (*model)->TXLinstances; here; here = here->TXLnextInstance) {
-        if (prev) FREE(prev);
+        if (prev)
+            FREE(prev);
         prev = here;
     }
-    if (prev) FREE(prev);
+    if (prev)
+        FREE(prev);
     FREE(*model);
     return OK;
 }
diff --git a/src/spicelib/devices/urc/urcmdel.c b/src/spicelib/devices/urc/urcmdel.c
index 49fd47a9d..5dd245eba 100644
--- a/src/spicelib/devices/urc/urcmdel.c
+++ b/src/spicelib/devices/urc/urcmdel.c
@@ -20,8 +20,8 @@ URCmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
 
     oldmod = model;
     for (; *model; model = &((*model)->URCnextModel)) {
-        if ((*model)->URCmodName == modname ||
-            (modfast && *model == modfast)) goto delgot;
+        if ((*model)->URCmodName == modname || (modfast && *model == modfast))
+            goto delgot;
         oldmod = model;
     }
 
@@ -30,10 +30,12 @@ URCmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
  delgot:
     *oldmod = (*model)->URCnextModel; /* cut deleted device out of list */
     for (here = (*model)->URCinstances; here; here = here->URCnextInstance) {
-        if (prev) FREE(prev);
+        if (prev)
+            FREE(prev);
         prev = here;
     }
-    if (prev) FREE(prev);
+    if (prev)
+        FREE(prev);
     FREE(*model);
     return OK;
 }
diff --git a/src/spicelib/devices/vbic/vbicmdel.c b/src/spicelib/devices/vbic/vbicmdel.c
index ede3426ce..df3eea090 100644
--- a/src/spicelib/devices/vbic/vbicmdel.c
+++ b/src/spicelib/devices/vbic/vbicmdel.c
@@ -26,15 +26,16 @@ VBICmDelete(GENmodel **inModels, IFuid modname, GENmodel *kill)
 
     oldmod = model;
     for (; *model; model = &((*model)->VBICnextModel)) {
-        if ((*model)->VBICmodName == modname ||
-            (modfast && *model == modfast)) goto delgot;
+        if ((*model)->VBICmodName == modname || (modfast && *model == modfast))
+            goto delgot;
         oldmod = model;
     }
 
     return E_NOMOD;
 
  delgot:
-    if ((*model)->VBICinstances) return E_NOTEMPTY;
+    if ((*model)->VBICinstances)
+        return E_NOTEMPTY;
     *oldmod = (*model)->VBICnextModel; /* cut deleted device out of list */
     FREE(*model);
     return OK;
diff --git a/src/spicelib/devices/vccs/vccsmdel.c b/src/spicelib/devices/vccs/vccsmdel.c
index 8bcaf70af..cafc3ba3e 100644
--- a/src/spicelib/devices/vccs/vccsmdel.c
+++ b/src/spicelib/devices/vccs/vccsmdel.c
@@ -20,8 +20,8 @@ VCCSmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
 
     oldmod = model;
     for (; *model; model = &((*model)->VCCSnextModel)) {
-        if ((*model)->VCCSmodName == modname ||
-            (modfast && *model == modfast)) goto delgot;
+        if ((*model)->VCCSmodName == modname || (modfast && *model == modfast))
+            goto delgot;
         oldmod = model;
     }
 
@@ -30,10 +30,12 @@ VCCSmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
  delgot:
     *oldmod = (*model)->VCCSnextModel; /* cut deleted device out of list */
     for (here = (*model)->VCCSinstances; here; here = here->VCCSnextInstance) {
-        if (prev) FREE(prev);
+        if (prev)
+            FREE(prev);
         prev = here;
     }
-    if (prev) FREE(prev);
+    if (prev)
+        FREE(prev);
     FREE(*model);
     return OK;
 }
diff --git a/src/spicelib/devices/vcvs/vcvsmdel.c b/src/spicelib/devices/vcvs/vcvsmdel.c
index da49d1535..803c4aa69 100644
--- a/src/spicelib/devices/vcvs/vcvsmdel.c
+++ b/src/spicelib/devices/vcvs/vcvsmdel.c
@@ -20,8 +20,8 @@ VCVSmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
 
     oldmod = model;
     for (; *model; model = &((*model)->VCVSnextModel)) {
-        if ((*model)->VCVSmodName == modname ||
-            (modfast && *model == modfast)) goto delgot;
+        if ((*model)->VCVSmodName == modname || (modfast && *model == modfast))
+            goto delgot;
         oldmod = model;
     }
 
@@ -30,10 +30,12 @@ VCVSmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
  delgot:
     *oldmod = (*model)->VCVSnextModel; /* cut deleted device out of list */
     for (here = (*model)->VCVSinstances; here; here = here->VCVSnextInstance) {
-        if (prev) FREE(prev);
+        if (prev)
+            FREE(prev);
         prev = here;
     }
-    if (prev) FREE(prev);
+    if (prev)
+        FREE(prev);
     FREE(*model);
     return OK;
 }
diff --git a/src/spicelib/devices/vsrc/vsrcmdel.c b/src/spicelib/devices/vsrc/vsrcmdel.c
index 152ed484e..7c759a284 100644
--- a/src/spicelib/devices/vsrc/vsrcmdel.c
+++ b/src/spicelib/devices/vsrc/vsrcmdel.c
@@ -20,8 +20,8 @@ VSRCmDelete(GENmodel **inModel, IFuid modname, GENmodel *fast)
 
     oldmod = model;
     for (; *model; model = &((*model)->VSRCnextModel)) {
-        if ((*model)->VSRCmodName == modname ||
-            (modfast && *model == modfast)) goto delgot;
+        if ((*model)->VSRCmodName == modname || (modfast && *model == modfast))
+            goto delgot;
         oldmod = model;
     }
 
@@ -30,10 +30,12 @@ VSRCmDelete(GENmodel **inModel, IFuid modname, GENmodel *fast)
  delgot:
     *oldmod = (*model)->VSRCnextModel; /* cut deleted device out of list */
     for (here = (*model)->VSRCinstances; here; here = here->VSRCnextInstance) {
-        if (prev) FREE(prev);
+        if (prev)
+            FREE(prev);
         prev = here;
     }
-    if (prev) FREE(prev);
+    if (prev)
+        FREE(prev);
     FREE(*model);
     return OK;
 }