From fe1acd3757e17b073e2d0865f6a8dc4dacf8933b Mon Sep 17 00:00:00 2001
From: rlar <rlar>
Date: Sat, 22 Sep 2012 13:36:45 +0200
Subject: [PATCH] src/frontend/**  remove superfluous `return' invocations

---
 src/frontend/aspice.c              |  9 ---------
 src/frontend/breakp.c              | 15 ---------------
 src/frontend/breakp2.c             |  4 ----
 src/frontend/circuits.c            |  1 -
 src/frontend/com_ahelp.c           |  2 --
 src/frontend/com_alias.c           |  7 -------
 src/frontend/com_asciiplot.c       |  1 -
 src/frontend/com_cdump.c           |  8 --------
 src/frontend/com_chdir.c           |  1 -
 src/frontend/com_compose.c         |  3 ---
 src/frontend/com_display.c         |  2 --
 src/frontend/com_dl.c              |  2 --
 src/frontend/com_dump.c            |  1 -
 src/frontend/com_gnuplot.c         |  4 ----
 src/frontend/com_hardcopy.c        |  1 -
 src/frontend/com_help.c            |  1 -
 src/frontend/com_history.c         |  5 -----
 src/frontend/com_let.c             |  1 -
 src/frontend/com_measure2.c        | 15 ---------------
 src/frontend/com_option.c          |  1 -
 src/frontend/com_plot.c            |  2 --
 src/frontend/com_rehash.c          |  1 -
 src/frontend/com_set.c             |  2 --
 src/frontend/com_shell.c           |  1 -
 src/frontend/com_shift.c           |  1 -
 src/frontend/com_state.c           |  1 -
 src/frontend/com_strcmp.c          |  1 -
 src/frontend/com_unset.c           |  1 -
 src/frontend/com_xgraph.c          |  1 -
 src/frontend/control.c             |  6 ------
 src/frontend/device.c              |  3 ---
 src/frontend/diff.c                |  1 -
 src/frontend/dotcards.c            |  4 ----
 src/frontend/error.c               |  2 --
 src/frontend/help/help.c           |  2 --
 src/frontend/help/provide.c        |  1 -
 src/frontend/help/readhelp.c       |  3 ---
 src/frontend/help/textdisp.c       |  2 --
 src/frontend/help/x11disp.c        |  3 ---
 src/frontend/init.c                |  2 --
 src/frontend/inpcom.c              |  1 -
 src/frontend/interp.c              |  1 -
 src/frontend/inventory.c           |  1 -
 src/frontend/linear.c              |  2 --
 src/frontend/nutinp.c              |  3 ---
 src/frontend/parser/complete.c     | 11 -----------
 src/frontend/parser/cshpar.c       |  1 -
 src/frontend/parser/unixcom.c      |  2 --
 src/frontend/plotting/agraf.c      |  2 --
 src/frontend/plotting/gnuplot.c    |  3 ---
 src/frontend/plotting/graf.c       |  5 -----
 src/frontend/plotting/grid.c       |  8 --------
 src/frontend/plotting/plotcurv.c   |  3 ---
 src/frontend/plotting/pvec.c       |  1 -
 src/frontend/plotting/x11.c        |  2 --
 src/frontend/plotting/xgraph.c     |  2 --
 src/frontend/postcoms.c            | 11 -----------
 src/frontend/quote.c               |  4 ----
 src/frontend/rawfile.c             |  4 ----
 src/frontend/resource.c            |  4 ----
 src/frontend/runcoms.c             | 12 ------------
 src/frontend/runcoms2.c            |  5 -----
 src/frontend/signal_handler.c      |  1 -
 src/frontend/spec.c                |  1 -
 src/frontend/spiceif.c             |  2 --
 src/frontend/subckt.c              |  1 -
 src/frontend/terminal.c            |  3 ---
 src/frontend/trannoise/FastNorm3.c |  3 ---
 src/frontend/trannoise/wallace.c   |  1 -
 src/frontend/typesdef.c            |  4 ----
 src/frontend/vectors.c             | 12 ------------
 71 files changed, 240 deletions(-)

diff --git a/src/frontend/aspice.c b/src/frontend/aspice.c
index f08e034a5..c94c7c801 100644
--- a/src/frontend/aspice.c
+++ b/src/frontend/aspice.c
@@ -148,7 +148,6 @@ com_aspice(wordlist *wl)
     (void) signal(SIGCLD, (SIGNAL_FUNCTION) sigchild);
 #    endif
 #  endif
-    return;
 }
 
 
@@ -161,7 +160,6 @@ com_jobs(wordlist *wl)
 
     for (p = running; p; p = p->pr_next)
         fprintf(cp_out, "%d\t%.70s\n", p->pr_pid, p->pr_name);
-    return;
 }
 
 
@@ -173,7 +171,6 @@ sigchild(void)
         fprintf(cp_err, "%d jobs done now\n", numchanged);
     if (cp_cwait)
         ft_checkkids();
-    return;
 }
 
 
@@ -262,7 +259,6 @@ ft_checkkids(void)
     (void) ioctl(0, TIOCSTI, "\022");   /* Reprint the line. */
 #endif
     here = FALSE;
-    return;
 }
 
 
@@ -423,7 +419,6 @@ com_rspice(wordlist *wl)
         plot_add(pl);
     (void) unlink(outfile);
     fprintf(stderr, "done.\n");
-    return;
 }
 
 #else
@@ -433,7 +428,6 @@ com_aspice(wordlist *wl)
 {
     NG_IGNORE(wl);
     fprintf(cp_err, "Asynchronous spice jobs are not available.\n");
-    return;
 }
 
 
@@ -442,14 +436,12 @@ com_jobs(wordlist *wl)
 {
     NG_IGNORE(wl);
     fprintf(cp_err, "Asynchronous spice jobs are not available.\n");
-    return;
 }
 
 
 void
 ft_checkkids(void)
 {
-    return;
 }
 
 
@@ -458,7 +450,6 @@ com_rspice(wordlist *wl)
 {
     NG_IGNORE(wl);
     fprintf(cp_err, "Remote spice jobs are not available.\n");
-    return;
 }
 
 #endif
diff --git a/src/frontend/breakp.c b/src/frontend/breakp.c
index 4dfcf2ed5..5b27f7517 100644
--- a/src/frontend/breakp.c
+++ b/src/frontend/breakp.c
@@ -153,7 +153,6 @@ com_stop(wordlist *wl)
 
 bad:
     fprintf(cp_err, "Syntax error parsing breakpoint specification.\n");
-    return;
 }
 
 
@@ -163,7 +162,6 @@ void
 com_trce(wordlist *wl)
 {
     settrace(wl, VF_PRINT, 0);
-    return;
 }
 
 
@@ -204,8 +202,6 @@ com_iplot(wordlist *wl)
     } else {
         dbs = currentdb;
     }
-
-    return;
 }
 
 
@@ -220,8 +216,6 @@ com_step(wordlist *wl)
         steps = howmanysteps = 1;
 
     com_resume(NULL);
-
-    return;
 }
 
 
@@ -294,8 +288,6 @@ com_sttus(wordlist *wl)
         }
         (void) putc('\n', cp_out);
     }
-
-    return;
 }
 
 
@@ -310,8 +302,6 @@ dbfree(struct dbcomm *db)
         tfree(dd->db_nodename2);
         tfree(dd);
     }
-
-    return;
 }
 
 
@@ -374,8 +364,6 @@ com_delete(wordlist *wl)
     bad:
         wl = wl->wl_next;
     }
-
-    return;
 }
 
 
@@ -505,7 +493,6 @@ satisfied(struct dbcomm *d, struct plot *plot)
 void
 ft_trquery(void)
 {
-    return;
 }
 
 
@@ -553,6 +540,4 @@ printcond(struct dbcomm *d, FILE *fp)
                 fprintf(fp, " %g", dt->db_value2);
         }
     }
-
-    return;
 }
diff --git a/src/frontend/breakp2.c b/src/frontend/breakp2.c
index 38f08de80..707f43455 100644
--- a/src/frontend/breakp2.c
+++ b/src/frontend/breakp2.c
@@ -33,7 +33,6 @@ void
 com_save(wordlist *wl)
 {
     settrace(wl, VF_ACCUM, NULL);
-    return;
 }
 
 
@@ -42,7 +41,6 @@ void
 com_save2(wordlist *wl, char *name)
 {
     settrace(wl, VF_ACCUM, name);
-    return;
 }
 
 
@@ -100,8 +98,6 @@ settrace(wordlist *wl, int what, char *name)
 
         wl = wl->wl_next;
     }
-
-    return;
 }
 
 
diff --git a/src/frontend/circuits.c b/src/frontend/circuits.c
index 25a44026c..6246dfcda 100644
--- a/src/frontend/circuits.c
+++ b/src/frontend/circuits.c
@@ -26,5 +26,4 @@ ft_newcirc(struct circ *ckt)
 {
     ckt->ci_next = ft_circuits;
     ft_circuits = ckt;
-    return;
 }
diff --git a/src/frontend/com_ahelp.c b/src/frontend/com_ahelp.c
index 9e1aab771..55cb852d8 100644
--- a/src/frontend/com_ahelp.c
+++ b/src/frontend/com_ahelp.c
@@ -83,6 +83,4 @@ com_ahelp(wordlist *wl)
     }
 
     out_send("\n");
-
-    return;
 }
diff --git a/src/frontend/com_alias.c b/src/frontend/com_alias.c
index 8c6c6fd10..86a0b3989 100644
--- a/src/frontend/com_alias.c
+++ b/src/frontend/com_alias.c
@@ -156,7 +156,6 @@ cp_setalias(char *word, wordlist *wlist)
      * keyword lookup is done the alias is evaluated.  Make everything
      * file completion, just in case...  */
     cp_addcomm(word, (long) 1, (long) 1, (long) 1, (long) 1);
-    return;
 }
 
 
@@ -188,8 +187,6 @@ cp_unalias(char *word)
     tfree(al->al_name);
     tfree(al);
     cp_remcomm(word);
-
-    return;
 }
 
 
@@ -205,7 +202,6 @@ cp_paliases(char *word)
             wl_print(al->al_text, cp_out);
             (void) putc('\n', cp_out);
         }
-    return;
 }
 
 
@@ -220,7 +216,6 @@ com_alias(wordlist *wl)
         cp_paliases(wl->wl_word);
     else
         cp_setalias(wl->wl_word, wl->wl_next);
-    return;
 }
 
 
@@ -244,7 +239,5 @@ com_unalias(wordlist *wl)
         cp_unalias(wl->wl_word);
         wl = wl->wl_next;
     }
-
-    return;
 }
 
diff --git a/src/frontend/com_asciiplot.c b/src/frontend/com_asciiplot.c
index e93ff6739..44ebdd2ca 100644
--- a/src/frontend/com_asciiplot.c
+++ b/src/frontend/com_asciiplot.c
@@ -13,5 +13,4 @@ void
 com_asciiplot(wordlist *wl)
 {
     plotit(wl, NULL, "lpr");
-    return;
 }
diff --git a/src/frontend/com_cdump.c b/src/frontend/com_cdump.c
index f1d91f93c..ae20c0249 100644
--- a/src/frontend/com_cdump.c
+++ b/src/frontend/com_cdump.c
@@ -128,8 +128,6 @@ dodump(struct control *cc)
         fprintf(cp_out, "bad type %d\n", cc->co_type);
         break;
     }
-
-    return;
 }
 
 
@@ -142,8 +140,6 @@ com_cdump(wordlist *wl)
     indent = 0;
     for (c = control[stackp]; c; c = c->co_next)
         dodump(c);
-
-    return;
 }
 
 
@@ -170,8 +166,6 @@ com_mdump(wordlist *wl)
         }
     else
         fprintf(cp_err, "Error: no matrix available.\n");
-
-    return;
 }
 
 
@@ -198,6 +192,4 @@ com_rdump(wordlist *wl)
         }
     else
         fprintf(cp_err, "Error: no matrix or RHS available.\n");
-
-    return;
 }
diff --git a/src/frontend/com_chdir.c b/src/frontend/com_chdir.c
index a6d9a52ce..4d33f4432 100644
--- a/src/frontend/com_chdir.c
+++ b/src/frontend/com_chdir.c
@@ -64,5 +64,4 @@ com_chdir(wordlist *wl)
         fprintf(cp_err, "Can't get current working directory.\n");
 #endif
 
-    return;
 }
diff --git a/src/frontend/com_compose.c b/src/frontend/com_compose.c
index 94c5d9c6c..49f677433 100644
--- a/src/frontend/com_compose.c
+++ b/src/frontend/com_compose.c
@@ -56,8 +56,6 @@ dimxpand(struct dvec *v, int *newdims, double *data)
         if (i < 0)
             break;
     }
-
-    return;
 }
 
 
@@ -472,5 +470,4 @@ com_compose(wordlist *wl)
     cp_addkword(CT_VECTOR, result->v_name);
     free_pnode(first_pn);
     tfree(resname); /*DG: resname has been copied so its remains allocated: memory leak One can remove this and not copy resname*/
-    return;
 }
diff --git a/src/frontend/com_display.c b/src/frontend/com_display.c
index 22e61c261..12791b826 100644
--- a/src/frontend/com_display.c
+++ b/src/frontend/com_display.c
@@ -78,6 +78,4 @@ com_display(wordlist *wl)
         d = dvs[i];
         pvec(d);
     }
-
-    return;
 }
diff --git a/src/frontend/com_dl.c b/src/frontend/com_dl.c
index ce58d884b..6321acebc 100644
--- a/src/frontend/com_dl.c
+++ b/src/frontend/com_dl.c
@@ -12,7 +12,6 @@ void com_codemodel(wordlist *wl)
     for (ww = wl; ww; ww = ww->wl_next)
         if (load_opus(wl->wl_word))
             fprintf(cp_err, "Error: Library %s couldn't be loaded!\n", ww->wl_word);
-    return;
 }
 #endif
 
@@ -24,6 +23,5 @@ void com_use(wordlist *wl)
     for (ww = wl; ww; ww = ww->wl_next)
         if (load_dev(wl->wl_word))
             fprintf(cp_err, "Error: Library %s couldn't be loaded!\n", ww->wl_word);
-    return;
 }
 #endif
diff --git a/src/frontend/com_dump.c b/src/frontend/com_dump.c
index f4099c12a..b2c2f622d 100644
--- a/src/frontend/com_dump.c
+++ b/src/frontend/com_dump.c
@@ -21,5 +21,4 @@ com_dump(wordlist *wl)
     }
 
     if_dump(ft_curckt->ci_ckt, cp_out);
-    return;
 }
diff --git a/src/frontend/com_gnuplot.c b/src/frontend/com_gnuplot.c
index f902fbb50..23dede2af 100644
--- a/src/frontend/com_gnuplot.c
+++ b/src/frontend/com_gnuplot.c
@@ -36,8 +36,6 @@ com_gnuplot(wordlist *wl)
        background. */
     if (tempf)
         tfree(fname);
-
-    return;
 }
 
 
@@ -67,6 +65,4 @@ com_write_simple(wordlist *wl)
        background. */
     if (tempf)
         tfree(fname);
-
-    return;
 }
diff --git a/src/frontend/com_hardcopy.c b/src/frontend/com_hardcopy.c
index 08b213c4f..bde585d01 100644
--- a/src/frontend/com_hardcopy.c
+++ b/src/frontend/com_hardcopy.c
@@ -208,5 +208,4 @@ com_hardcopy(wordlist *wl)
 
     /* restore previous graphics context by retrieving the previous currentgraph */
     PopGraphContext();
-    return;
 }
diff --git a/src/frontend/com_help.c b/src/frontend/com_help.c
index e47f42187..2c3038f45 100644
--- a/src/frontend/com_help.c
+++ b/src/frontend/com_help.c
@@ -86,5 +86,4 @@ com_help(wordlist *wl)
     }
 
     out_send("\n");
-    return;
 }
diff --git a/src/frontend/com_history.c b/src/frontend/com_history.c
index df3fdf7eb..47423fa19 100644
--- a/src/frontend/com_history.c
+++ b/src/frontend/com_history.c
@@ -380,7 +380,6 @@ cp_addhistent(int event, wordlist *wlist)
     freehist(histlength - cp_maxhistlength);
     histlength++;
 #endif
-    return;
 }
 
 
@@ -438,7 +437,6 @@ cp_hprint(int eventhi, int eventlo, bool rev)
                 (void) putc('\n', cp_out);
             }
     }
-    return;
 }
 
 
@@ -478,7 +476,6 @@ freehist(int num)
 
     wl_free(hi->hi_wlist);
     tfree(hi);
-    return;
 }
 
 #endif /* !defined(HAVE_GNUREADLINE) && !defined(HAVE_BSDEDITLINE) */
@@ -572,6 +569,4 @@ com_history(wordlist *wl)
     else
         cp_hprint(cp_event - 1, cp_event - 1 - atoi(wl->wl_word), rev);
 #endif
-
-    return;
 }
diff --git a/src/frontend/com_let.c b/src/frontend/com_let.c
index 42645c566..6744e67cc 100644
--- a/src/frontend/com_let.c
+++ b/src/frontend/com_let.c
@@ -245,5 +245,4 @@ quit:
         vec_free(t);
     free_pnode(nn); /* frees also t, if pnode nn is simple value */
     tfree(p);
-    return;
 }
diff --git a/src/frontend/com_measure2.c b/src/frontend/com_measure2.c
index 272876206..64bb92c05 100644
--- a/src/frontend/com_measure2.c
+++ b/src/frontend/com_measure2.c
@@ -78,7 +78,6 @@ measure_errMessage(char *mName, char *mFunction, char *trigTarg, char *errMsg, i
         printf("%s", errMsg);
         // printf("\tmeasure '%s'  failed\n", mName);
     }
-    return;
 }
 
 
@@ -116,7 +115,6 @@ correct_vec(MEASUREPTR meas)
         tfree(vecfirst);
         meas->m_vec2 = copy(newvec2);
     }
-    return;
 }
 
 
@@ -614,8 +612,6 @@ com_measure_when(
 
     if (init_measured_value)
         meas->m_measured = NAN;
-
-    return;
 }
 
 
@@ -694,7 +690,6 @@ measure_at(
     }
 
     meas->m_measured = NAN;
-    return;
 }
 
 
@@ -844,7 +839,6 @@ measure_minMaxAvg(
     default :
         fprintf(cp_err, "Error: improper min/max/avg call.\n");
     }
-    return;
 }
 
 
@@ -1042,7 +1036,6 @@ measure_rms(
     // Calculates the square root of the area under the 'out_var2' curve
     //  divided be the period of interest
     measure_rms_integral(meas, AT_RMS);
-    return;
 }
 #endif
 
@@ -1058,7 +1051,6 @@ measure_integ(
 {
     // INTEGRAL INTEG
     measure_rms_integral(meas, AT_INTEG);
-    return;
 }
 #endif
 
@@ -1069,7 +1061,6 @@ static void
 measure_deriv(void)
 {
     // DERIVATIVE DERIV
-    return;
 }
 #endif
 
@@ -1079,25 +1070,21 @@ measure_deriv(void)
 static void
 measure_ERR(void)
 {
-    return;
 }
 
 static void
 measure_ERR1(void)
 {
-    return;
 }
 
 static void
 measure_ERR2(void)
 {
-    return;
 }
 
 static void
 measure_ERR3(void)
 {
-    return;
 }
 #endif
 
@@ -1110,8 +1097,6 @@ com_dotmeasure(wordlist *wl)
     /* simulation info */
     // printf("*%s\n", plot_cur->pl_title);
     // printf("\t %s, %s\n", plot_cur->pl_name, plot_cur->pl_date); // missing temp
-
-    return;
 }
 
 
diff --git a/src/frontend/com_option.c b/src/frontend/com_option.c
index 5988581ee..a97519f01 100644
--- a/src/frontend/com_option.c
+++ b/src/frontend/com_option.c
@@ -115,6 +115,5 @@ com_option(wordlist *wl)
         cp_vset(vars->va_name, vars->va_type, s);
         vars = vars->va_next;
     }
-    return;
 }
 
diff --git a/src/frontend/com_plot.c b/src/frontend/com_plot.c
index b2e5c57c6..8c8ccace4 100644
--- a/src/frontend/com_plot.c
+++ b/src/frontend/com_plot.c
@@ -14,7 +14,6 @@ void
 com_plot(wordlist *wl)
 {
     plotit(wl, NULL, NULL);
-    return;
 }
 
 #ifdef TCL_MODULE
@@ -22,7 +21,6 @@ void
 com_bltplot(wordlist *wl)
 {
     plotit(wl, NULL, "blt");
-    return;
 }
 
 #endif
diff --git a/src/frontend/com_rehash.c b/src/frontend/com_rehash.c
index c4bb78967..4918c0fb4 100644
--- a/src/frontend/com_rehash.c
+++ b/src/frontend/com_rehash.c
@@ -29,5 +29,4 @@ com_rehash(wordlist *wl)
         cp_rehash(s, TRUE);
     else
         fprintf(cp_err, "Error: no PATH in environment.\n");
-    return;
 }
diff --git a/src/frontend/com_set.c b/src/frontend/com_set.c
index ca52492a4..dd97e0a4e 100644
--- a/src/frontend/com_set.c
+++ b/src/frontend/com_set.c
@@ -54,6 +54,4 @@ com_set(wordlist *wl)
         /* don't free oldvar->va_list! This structure is used furthermore! */
         tfree(oldvar);
     }
-
-    return;
 }
diff --git a/src/frontend/com_shell.c b/src/frontend/com_shell.c
index 98fc7d38f..cb892012b 100644
--- a/src/frontend/com_shell.c
+++ b/src/frontend/com_shell.c
@@ -61,5 +61,4 @@ com_shell(wordlist *wl)
     }
 #endif
 
-    return;
 }
diff --git a/src/frontend/com_shift.c b/src/frontend/com_shift.c
index 9b05c6296..ff0e1aeff 100644
--- a/src/frontend/com_shift.c
+++ b/src/frontend/com_shift.c
@@ -47,5 +47,4 @@ com_shift(wordlist *wl)
     }
 
     v->va_vlist = vv;
-    return;
 }
diff --git a/src/frontend/com_state.c b/src/frontend/com_state.c
index 94e32c181..2b68b4aed 100644
--- a/src/frontend/com_state.c
+++ b/src/frontend/com_state.c
@@ -29,5 +29,4 @@ com_state(wordlist *wl)
     fprintf(cp_out, "Number of points so far: %d\n",
             plot_cur->pl_scale->v_length);
     fprintf(cp_out, "(That's all this command does so far)\n");
-    return;
 }
diff --git a/src/frontend/com_strcmp.c b/src/frontend/com_strcmp.c
index 3064c604f..ac9b47486 100644
--- a/src/frontend/com_strcmp.c
+++ b/src/frontend/com_strcmp.c
@@ -24,5 +24,4 @@ com_strcmp(wordlist *wl)
     tfree(s1);/*DG  cp_unquote memory leak*/
     tfree(s2);
     cp_vset(var, CP_NUM, &i);
-    return;
 }
diff --git a/src/frontend/com_unset.c b/src/frontend/com_unset.c
index abb852dfa..45aa1abaa 100644
--- a/src/frontend/com_unset.c
+++ b/src/frontend/com_unset.c
@@ -29,5 +29,4 @@ com_unset(wordlist *wl)
         cp_remvar(name);
         wl = wl->wl_next;
     }
-    return;
 }
diff --git a/src/frontend/com_xgraph.c b/src/frontend/com_xgraph.c
index d52c97819..d759f0801 100644
--- a/src/frontend/com_xgraph.c
+++ b/src/frontend/com_xgraph.c
@@ -39,5 +39,4 @@ com_xgraph(wordlist *wl)
         (void) unlink(fname);
 #endif
 
-    return;
 }
diff --git a/src/frontend/control.c b/src/frontend/control.c
index f5eeb46c2..3665ca4a2 100644
--- a/src/frontend/control.c
+++ b/src/frontend/control.c
@@ -84,7 +84,6 @@ pwlist(wordlist *wlist, char *name)
     for (wl = wlist; wl; wl = wl->wl_next)
         fprintf(cp_err, "%s ", wl->wl_word);
     fprintf(cp_err, "]\n");
-    return;
 }
 
 
@@ -101,7 +100,6 @@ pwlist_echo(wordlist *wlist, char *name)   /*CDHW used to perform function of se
     for (wl = wlist; wl; wl = wl->wl_next)
         fprintf(cp_err, "%s ", wl->wl_word);
     fprintf(cp_err, "\n");
-    return;
 }
 
 
@@ -885,7 +883,6 @@ void cp_resetcontrol(void)
     control[0] = cend[0] = NULL;
     stackp = 0;
     cp_kwswitch(CT_LABEL, NULL);
-    return;
 }
 
 
@@ -902,7 +899,6 @@ cp_popcontrol(void)
         ctl_free(control[stackp]);
         stackp--;
     }
-    return;
 }
 
 
@@ -919,7 +915,6 @@ cp_pushcontrol(void)
         stackp++;
         control[stackp] = cend[stackp] = NULL;
     }
-    return;
 }
 
 
@@ -931,7 +926,6 @@ cp_toplevel(void)
     if (cend[stackp])
         while (cend[stackp]->co_parent)
             cend[stackp] = cend[stackp]->co_parent;
-    return;
 }
 
 
diff --git a/src/frontend/device.c b/src/frontend/device.c
index d32ea7c1e..339f6b549 100644
--- a/src/frontend/device.c
+++ b/src/frontend/device.c
@@ -1040,8 +1040,6 @@ old_show(wordlist *wl)
         }
         devs = devs->wl_next;
     }
-
-    return;
 }
 
 
@@ -1386,7 +1384,6 @@ com_alter_common(wordlist *wl, int do_model)
     if (names->pn_value == NULL && dv != NULL)
         vec_free(dv);
     free_pnode(names); /* free also dv, if pnode names is simple value */
-    return;
 }
 
 
diff --git a/src/frontend/diff.c b/src/frontend/diff.c
index adcbed8b3..192b68e26 100644
--- a/src/frontend/diff.c
+++ b/src/frontend/diff.c
@@ -264,6 +264,5 @@ com_diff(wordlist *wl)
             }
         }
     }
-    return;
 }
 
diff --git a/src/frontend/dotcards.c b/src/frontend/dotcards.c
index 6fc9735b1..e2bc6d248 100644
--- a/src/frontend/dotcards.c
+++ b/src/frontend/dotcards.c
@@ -70,7 +70,6 @@ ft_dotsaves(void)
         }
 
     com_save(wl);
-    return;
 }
 
 
@@ -176,7 +175,6 @@ ft_savemeasure(void)
             (void) measure_extract_variables(s);
         }
     }
-    return;
 }
 
 
@@ -446,7 +444,6 @@ fixdotplot(wordlist *wl)
         }
         wl = wl->wl_next;
     }
-    return;
 }
 
 
@@ -457,7 +454,6 @@ fixdotprint(wordlist *wl)
         wl->wl_word = fixem(wl->wl_word);
         wl = wl->wl_next;
     }
-    return;
 }
 
 
diff --git a/src/frontend/error.c b/src/frontend/error.c
index ca090c874..3113c2593 100644
--- a/src/frontend/error.c
+++ b/src/frontend/error.c
@@ -41,7 +41,6 @@ fperror(char *mess, int code)
 {
     NG_IGNORE(code);
     fprintf(cp_err, "%s: floating point exception.\n", mess);
-    return;
 }
 
 
@@ -50,7 +49,6 @@ void
 ft_sperror(int code, char *mess)
 {
     fprintf(cp_err, "%s: %s\n", mess, if_errstring(code));
-    return;
 }
 
 
diff --git a/src/frontend/help/help.c b/src/frontend/help/help.c
index 13573d34d..1371c1de1 100644
--- a/src/frontend/help/help.c
+++ b/src/frontend/help/help.c
@@ -61,7 +61,6 @@ hlp_main(char *path, wordlist *wl)
     hlp_free();
 #endif
 
-    return;
 }
 
 
@@ -173,5 +172,4 @@ hlp_pathfix(char *buf)
 
     if (s)
         tfree(s);
-    return;
 }
diff --git a/src/frontend/help/provide.c b/src/frontend/help/provide.c
index dfac8b574..377e31f6c 100644
--- a/src/frontend/help/provide.c
+++ b/src/frontend/help/provide.c
@@ -143,6 +143,5 @@ hlp_killfamily(topic *top)
         hlp_tkillwin(top);
 
     top->children = NULL;
-    return;
 }
 
diff --git a/src/frontend/help/readhelp.c b/src/frontend/help/readhelp.c
index 297cc770b..9ded1bbe7 100644
--- a/src/frontend/help/readhelp.c
+++ b/src/frontend/help/readhelp.c
@@ -54,7 +54,6 @@ sortlist(toplink **tlp)
         vec[i]->next = vec[i + 1];
     vec[i]->next = NULL;
     tfree(vec);
-    return;
 }
 
 
@@ -334,7 +333,6 @@ void tlfree(toplink *tl)
         tfree(tl);
         tl = nt;
     }
-    return;
 }
 
 
@@ -353,7 +351,6 @@ hlp_free(void)
         tfree(top);
     }
     alltopics = NULL;
-    return;
 }
 
 
diff --git a/src/frontend/help/textdisp.c b/src/frontend/help/textdisp.c
index bc45ea340..5a2d9d492 100644
--- a/src/frontend/help/textdisp.c
+++ b/src/frontend/help/textdisp.c
@@ -139,7 +139,6 @@ hlp_tkillwin(topic *top)
         curtop = curtop->parent;
     if (curtop && !quitflag)
         (void) hlp_tdisplay(curtop);
-    return;
 }
 
 
@@ -160,7 +159,6 @@ putline(char *s)
     }
     buf[i] = '\0';
     out_printf("%s\n", buf);
-    return;
 }
 
 
diff --git a/src/frontend/help/x11disp.c b/src/frontend/help/x11disp.c
index 3a6f4bf8f..c00f82963 100644
--- a/src/frontend/help/x11disp.c
+++ b/src/frontend/help/x11disp.c
@@ -301,7 +301,6 @@ hlp_xkillwin(topic *top)
         }
     }
     XtDestroyWidget(top->shellwidget);
-    return;
 }
 
 
@@ -326,8 +325,6 @@ sputline(char *buf, char *s)
     /* strcat can't handle long strings */
     tmpp = buf + strlen(buf);
     sprintf(tmpp, "%s\n", tmp);
-
-    return;
 }
 
 #endif  /* X_DISPLAY_MISSING */
diff --git a/src/frontend/init.c b/src/frontend/init.c
index 3446c7fa8..7b26f273f 100644
--- a/src/frontend/init.c
+++ b/src/frontend/init.c
@@ -41,6 +41,4 @@ cp_init(void)
     /* io redirection in streams.c:
        cp_in set to cp_curin etc. */
     cp_ioreset();
-
-    return;
 }
diff --git a/src/frontend/inpcom.c b/src/frontend/inpcom.c
index 4275d8ada..3f0cf0127 100644
--- a/src/frontend/inpcom.c
+++ b/src/frontend/inpcom.c
@@ -1964,7 +1964,6 @@ inp_casefix(char *string)
                 *string = (char) tolower(*string);
             string++;
         }
-    return;
 #endif
 }
 
diff --git a/src/frontend/interp.c b/src/frontend/interp.c
index 3c222a3e8..5dc5b3413 100644
--- a/src/frontend/interp.c
+++ b/src/frontend/interp.c
@@ -47,6 +47,5 @@ lincopy(struct dvec *ov, double *newscale, int newlen, struct dvec *oldscale)
     v->v_realdata = nd;
 
     vec_new(v);
-    return;
 }
 
diff --git a/src/frontend/inventory.c b/src/frontend/inventory.c
index bf12737a6..4c8b1d62c 100644
--- a/src/frontend/inventory.c
+++ b/src/frontend/inventory.c
@@ -47,5 +47,4 @@ com_inventory(wordlist *wl)
                        ft_sim->devices[k]->name,
                        devList[k].instNum);
     out_send("\n");
-    return;
 }
diff --git a/src/frontend/linear.c b/src/frontend/linear.c
index f1c7ee68f..e0b28d3c1 100644
--- a/src/frontend/linear.c
+++ b/src/frontend/linear.c
@@ -95,6 +95,4 @@ com_linearize(wordlist *wl)
             lincopy(v, newtime->v_realdata, len, oldtime);
         }
     }
-    return;
-
 }
diff --git a/src/frontend/nutinp.c b/src/frontend/nutinp.c
index 506d670e8..77f566f07 100644
--- a/src/frontend/nutinp.c
+++ b/src/frontend/nutinp.c
@@ -180,7 +180,6 @@ inp_nutsource(FILE *fp, bool comfile, char *filename)
     cp_curerr = lasterr;
 
     tfree(tt);
-    return;
 }
 
 
@@ -241,7 +240,6 @@ nutcom_source(wordlist *wl)
     cp_interactive = inter;
     if (tempfile)
         (void) unlink(tempfile);
-    return;
 }
 
 
@@ -252,7 +250,6 @@ nutinp_source(char *file)
 
     wl.wl_word = file;
     nutcom_source(&wl);
-    return;
 }
 
 
diff --git a/src/frontend/parser/complete.c b/src/frontend/parser/complete.c
index 2050c1e8a..0163faed3 100644
--- a/src/frontend/parser/complete.c
+++ b/src/frontend/parser/complete.c
@@ -161,7 +161,6 @@ found:
     for (i = 0; wbuf[i]; i++)
         (void) ioctl(fileno(cp_in), TIOCSTI, &wbuf[i]);
     wl_free(pmatches);
-    return;
 }
 
 
@@ -311,7 +310,6 @@ printem(wordlist *wl)
         }
         (void) putchar('\n');
     }
-    return;
 }
 
 #else /* if not TIOCSTI */
@@ -322,7 +320,6 @@ cp_ccom(wordlist *wlist, char *buf, bool esc)
     NG_IGNORE(wlist);
     NG_IGNORE(buf);
     NG_IGNORE(esc);
-    return;
 }
 
 #endif
@@ -440,7 +437,6 @@ cp_ccon(bool on)
     NG_IGNORE(on);
 #endif
 
-    return;
 }
 
 
@@ -472,7 +468,6 @@ cp_addcomm(char *word, long int bits0, long int bits1, long int bits2, long int
     cc->cc_kwords[1] = bits1;
     cc->cc_kwords[2] = bits2;
     cc->cc_kwords[3] = bits3;
-    return;
 }
 
 
@@ -486,7 +481,6 @@ cp_remcomm(char *word)
     cc = clookup(word, &commands, FALSE, FALSE);
     if (cc)
         cdelete(cc, &commands);
-    return;
 }
 
 
@@ -505,7 +499,6 @@ cp_addkword(int kw_class, char *word)
     /* word = copy(word); va: not necessary, clookup copies itself (memory leak) */
     cc = clookup(word, &keywords[kw_class], FALSE, TRUE);
     cc->cc_invalid = 0;
-    return;
 }
 
 
@@ -534,7 +527,6 @@ cp_remkword(int kw_class, char *word)
     cc = clookup(word, &keywords[kw_class], FALSE, FALSE);
     if (cc)
         cdelete(cc, &keywords[kw_class]);
-    return;
 }
 
 
@@ -567,7 +559,6 @@ cp_ccrestart(bool kwords)
     NG_IGNORE(kwords);
 
     /* Ack. */
-    return;
 }
 
 
@@ -582,7 +573,6 @@ throwaway(struct ccom *dbase)
         throwaway(dbase->cc_sibling);
     tfree(dbase->cc_name); /* va: also tfree dbase->cc_name (memory leak) */
     tfree(dbase);
-    return;
 }
 
 
@@ -741,5 +731,4 @@ cdelete(struct ccom *node, struct ccom **top)
 
     tfree(node->cc_name); /* va: we should allways use tfree */
     tfree(node);
-    return;
 }
diff --git a/src/frontend/parser/cshpar.c b/src/frontend/parser/cshpar.c
index 0eed170c5..8d0639ea3 100644
--- a/src/frontend/parser/cshpar.c
+++ b/src/frontend/parser/cshpar.c
@@ -102,5 +102,4 @@ pwlist(wordlist *wlist, char *name)
     for (wl = wlist; wl; wl = wl->wl_next)
         fprintf(cp_err, "%s ", wl->wl_word);
     fprintf(cp_err, "]\n");
-    return;
 }
diff --git a/src/frontend/parser/unixcom.c b/src/frontend/parser/unixcom.c
index 17f10ad3b..e3b2f9c04 100644
--- a/src/frontend/parser/unixcom.c
+++ b/src/frontend/parser/unixcom.c
@@ -142,7 +142,6 @@ cp_rehash(char *pathlist, bool docc)
         }
         closedir(pdir);
     }
-    return;
 }
 
 
@@ -241,7 +240,6 @@ cp_hstat(void)
         for (hh = hashtab[i]; hh; hh = hh->h_next)
             fprintf(cp_err, "i = %d, name = %s, path = %s\n",
                     i, hh->h_name, hh->h_path);
-    return;
 }
 
 
diff --git a/src/frontend/plotting/agraf.c b/src/frontend/plotting/agraf.c
index aff52c2a7..f2e8a2369 100644
--- a/src/frontend/plotting/agraf.c
+++ b/src/frontend/plotting/agraf.c
@@ -333,6 +333,4 @@ ft_agraf(double *xlims, double *ylims, struct dvec *xscale, struct plot *plot, s
     tfree(line2);
     if (!novalue)
         tfree(values);
-
-    return;
 }
diff --git a/src/frontend/plotting/gnuplot.c b/src/frontend/plotting/gnuplot.c
index c4baabeda..23f5484d2 100644
--- a/src/frontend/plotting/gnuplot.c
+++ b/src/frontend/plotting/gnuplot.c
@@ -213,7 +213,6 @@ ft_gnuplot(double *xlims, double *ylims, char *filename, char *title, char *xlab
 #endif
     err = system(buf);
 
-    return;
 }
 
 
@@ -276,6 +275,4 @@ ft_writesimple(double *xlims, double *ylims, char *filename, char *title, char *
     }
 
     (void) fclose(file_data);
-
-    return;
 }
diff --git a/src/frontend/plotting/graf.c b/src/frontend/plotting/graf.c
index 6ded83487..f06c13af7 100644
--- a/src/frontend/plotting/graf.c
+++ b/src/frontend/plotting/graf.c
@@ -458,7 +458,6 @@ gr_pmsg(char *text)
         fprintf(cp_err, " %s \n", text);
 
     DevUpdate();
-    return;
 }
 
 
@@ -466,7 +465,6 @@ void
 gr_clean(void)
 {
     DevUpdate();
-    return;
 }
 
 
@@ -841,7 +839,6 @@ set(struct plot *plot, struct dbcomm *db, bool unset, short mode)
         else
             v->v_flags |= mode;
     }
-    return;
 }
 
 
@@ -1020,8 +1017,6 @@ gr_end_iplot(void)
             }
         }
     }
-
-    return;
 }
 
 
diff --git a/src/frontend/plotting/grid.c b/src/frontend/plotting/grid.c
index a97a07d6a..91638f0ac 100644
--- a/src/frontend/plotting/grid.c
+++ b/src/frontend/plotting/grid.c
@@ -116,8 +116,6 @@ gr_fixgrid(GRAPH *graph, double xdelta, double ydelta, int xtype, int ytype)
       graph->viewport.height + graph->viewportyoff);
       SetLinestyle(1);
     */
-
-    return;
 }
 
 
@@ -975,7 +973,6 @@ drawpolargrid(GRAPH *graph)
                 graph->grid.yaxis.circular.center
                 - graph->grid.xaxis.circular.radius);
     DevUpdate();
-    return;
 }
 
 
@@ -1009,7 +1006,6 @@ adddeglabel(GRAPH *graph, int deg, int x, int y, int cx, int cy, int lx, int ly)
     DevDrawText(buf, x, y);
     DevDrawText("o", x + (int) strlen(buf) * graph->fontwidth,
                 y + graph->fontheight / 2);
-    return;
 }
 
 
@@ -1032,7 +1028,6 @@ addradlabel(GRAPH *graph, int lab, double theta, int x, int y)
         x -= graph->fontwidth * (int) strlen(buf) + 3;
     }
     DevDrawText(buf, x, y);
-    return;
 }
 
 
@@ -1324,7 +1319,6 @@ drawsmithgrid(GRAPH *graph)
     DevDrawText(buf, gr_xcenter + gr_radius, gr_ycenter - gr_radius);
 
     DevUpdate();
-    return;
 }
 
 
@@ -1415,8 +1409,6 @@ arcset(GRAPH *graph, double rad, double prevrad, double irad, double iprevrad, d
      * if ((x > gr_xmargin) && (x < gi_maxx))
      *     DevDrawText(nlab, x, centy + yoffset - gi_fntheight - 1);
      */
-
-    return;
 }
 
 
diff --git a/src/frontend/plotting/plotcurv.c b/src/frontend/plotting/plotcurv.c
index b7a7ea378..f04ddb65f 100644
--- a/src/frontend/plotting/plotcurv.c
+++ b/src/frontend/plotting/plotcurv.c
@@ -302,7 +302,6 @@ ft_graf(struct dvec *v, struct dvec *xs, bool nostart)
     tfree(result);
 
     gr_end(v);
-    return;
 }
 
 
@@ -342,6 +341,4 @@ plotinterval(struct dvec *v, double lo, double hi, register double *coeffs, int
         ly = dy;
         /* fprintf(cp_err, "plot (%G, %G)\n\r", dx, dy); */
     }
-
-    return;
 }
diff --git a/src/frontend/plotting/pvec.c b/src/frontend/plotting/pvec.c
index 9cde59e99..79dfedb52 100644
--- a/src/frontend/plotting/pvec.c
+++ b/src/frontend/plotting/pvec.c
@@ -93,5 +93,4 @@ pvec(struct dvec *d)
         strcat(buf, "\n");
 
     out_send(buf);
-    return;
 }
diff --git a/src/frontend/plotting/x11.c b/src/frontend/plotting/x11.c
index 2aea3ab65..57fa30fb7 100644
--- a/src/frontend/plotting/x11.c
+++ b/src/frontend/plotting/x11.c
@@ -741,8 +741,6 @@ slopelocation(GRAPH *graph, int x0, int y0)
                     (fy1-fy0)/(fx1-fx0), (fx1-fx0)/(fy1-fy0));
         }
     }
-
-    return;
 }
 
 
diff --git a/src/frontend/plotting/xgraph.c b/src/frontend/plotting/xgraph.c
index 403541451..216bd650b 100644
--- a/src/frontend/plotting/xgraph.c
+++ b/src/frontend/plotting/xgraph.c
@@ -164,6 +164,4 @@ ft_xgraph(double *xlims, double *ylims, char *filename, char *title, char *xlabe
     (void) fclose(file);
     (void) sprintf(buf, "xgraph %s &", filename);
     (void) system(buf);
-
-    return;
 }
diff --git a/src/frontend/postcoms.c b/src/frontend/postcoms.c
index 6a5c839c9..15844014f 100644
--- a/src/frontend/postcoms.c
+++ b/src/frontend/postcoms.c
@@ -36,7 +36,6 @@ com_unlet(wordlist *wl)
         vec_remove(wl->wl_word);
         wl = wl->wl_next;
     }
-    return;
 }
 
 
@@ -59,8 +58,6 @@ com_load(wordlist *wl)
 
     /* note: default is to display the vectors in the last (current) plot */
     com_display(NULL);
-
-    return;
 }
 
 
@@ -361,7 +358,6 @@ done:
     /* Get rid of the vectors. */
     tfree(buf);
     tfree(buf2);
-    return;
 }
 
 
@@ -508,7 +504,6 @@ com_write(wordlist *wl)
         /* If there are more plots we want them appended... */
         appendwrite = TRUE;
     }
-    return;
 }
 
 
@@ -657,7 +652,6 @@ com_write_sparam(wordlist *wl)
         /* If there are more plots we want them appended... */
         appendwrite = TRUE;
     }
-    return;
 }
 
 
@@ -767,7 +761,6 @@ com_cross(wordlist *wl)
     vec_new(v);
     v->v_flags |= VF_PERMANENT;
     cp_addkword(CT_VECTOR, v->v_name);
-    return;
 }
 
 
@@ -803,7 +796,6 @@ com_destroy(wordlist *wl)
             wl = wl->wl_next;
         }
     }
-    return;
 }
 
 
@@ -852,8 +844,6 @@ killplot(struct plot *pl)
         fflush(stdout);
     }
     tfree(pl); /* va: also tfree pl itself (memory leak) */
-
-    return;
 }
 
 
@@ -934,5 +924,4 @@ com_splot(wordlist *wl)
         return;
 
     plot_setcur(s);
-    return;
 }
diff --git a/src/frontend/quote.c b/src/frontend/quote.c
index dc3bf2556..9964434b5 100644
--- a/src/frontend/quote.c
+++ b/src/frontend/quote.c
@@ -29,7 +29,6 @@ cp_wstrip(char *str)
                 *str = d;
             str++;
         }
-    return;
 }
 
 
@@ -43,7 +42,6 @@ cp_quoteword(char *str)
             *str = (char) quote(*str);
             str++;
         }
-    return;
 }
 
 
@@ -57,7 +55,6 @@ cp_printword(char *string, FILE *fp)
     if (string)
         for (s = string; *s; s++)
             (void) putc((strip(*s)), fp);
-    return;
 }
 
 
@@ -70,7 +67,6 @@ cp_striplist(wordlist *wlist)
 
     for (wl = wlist; wl; wl = wl->wl_next)
         cp_wstrip(wl->wl_word);
-    return;
 }
 
 
diff --git a/src/frontend/rawfile.c b/src/frontend/rawfile.c
index 3cb9d78ab..a60801324 100644
--- a/src/frontend/rawfile.c
+++ b/src/frontend/rawfile.c
@@ -253,7 +253,6 @@ raw_write(char *name, struct plot *pl, bool app, bool binary)
         }
     }
     (void) fclose(fp);
-    return;
 }
 
 
@@ -700,8 +699,6 @@ fixdims(struct dvec *v, char *s)
         v->v_numdims = 0;
     else
         v->v_length = ndimpoints;
-
-    return;
 }
 
 
@@ -806,5 +803,4 @@ spar_write(char *name, struct plot *pl, double Rbaseval)
     }
 
     (void) fclose(fp);
-    return;
 }
diff --git a/src/frontend/resource.c b/src/frontend/resource.c
index 5b01548a7..dcbd5e748 100644
--- a/src/frontend/resource.c
+++ b/src/frontend/resource.c
@@ -140,7 +140,6 @@ com_rusage(wordlist *wl)
         (void) putc('\n', cp_out);
         printres("space");
     }
-    return;
 }
 
 
@@ -188,8 +187,6 @@ ft_ckspace(void)
         fprintmem(cp_err, limit);
         fprintf(cp_err, "\n");
     }
-
-    return;
 }
 
 
@@ -479,7 +476,6 @@ printres(char *name)
 
     if (vfree)
         free_struct_variable(vfree);
-    return;
 }
 
 
diff --git a/src/frontend/runcoms.c b/src/frontend/runcoms.c
index a9f95ab13..8231c440e 100644
--- a/src/frontend/runcoms.c
+++ b/src/frontend/runcoms.c
@@ -103,7 +103,6 @@ com_scirc(wordlist *wl)
         ft_curckt->ci_nodes = cp_kwswitch(CT_NODENAMES, p->ci_nodes);
     }
     ft_curckt = p;
-    return;
 }
 
 
@@ -111,7 +110,6 @@ void
 com_pz(wordlist *wl)
 {
     dosim("pz", wl);
-    return;
 }
 
 
@@ -119,7 +117,6 @@ void
 com_op(wordlist *wl)
 {
     dosim("op", wl);
-    return;
 }
 
 
@@ -127,7 +124,6 @@ void
 com_dc(wordlist *wl)
 {
     dosim("dc", wl);
-    return;
 }
 
 
@@ -135,7 +131,6 @@ void
 com_ac(wordlist *wl)
 {
     dosim("ac", wl);
-    return;
 }
 
 
@@ -143,7 +138,6 @@ void
 com_tf(wordlist *wl)
 {
     dosim("tf", wl);
-    return;
 }
 
 
@@ -151,7 +145,6 @@ void
 com_tran(wordlist *wl)
 {
     dosim("tran", wl);
-    return;
 }
 
 
@@ -159,7 +152,6 @@ void
 com_sens(wordlist *wl)
 {
     dosim("sens", wl);
-    return;
 }
 
 
@@ -167,7 +159,6 @@ void
 com_disto(wordlist *wl)
 {
     dosim("disto", wl);
-    return;
 }
 
 
@@ -175,7 +166,6 @@ void
 com_noise(wordlist *wl)
 {
     dosim("noise", wl);
-    return;
 }
 
 
@@ -185,7 +175,6 @@ void
 com_pss(wordlist *wl)
 {
     dosim("pss", wl);
-    return;
 }
 /* SP */
 #endif
@@ -384,7 +373,6 @@ com_run(wordlist *wl)
 {
     /* ft_getsaves(); */
     dosim("run", wl);
-    return;
 }
 
 
diff --git a/src/frontend/runcoms2.c b/src/frontend/runcoms2.c
index 89ee0856e..8a12ff3b0 100644
--- a/src/frontend/runcoms2.c
+++ b/src/frontend/runcoms2.c
@@ -165,8 +165,6 @@ com_resume(wordlist *wl)
     } else {
         ft_curckt->ci_inprogress = FALSE;
     }
-
-    return;
 }
 
 
@@ -196,7 +194,6 @@ com_rset(wordlist *wl)
 
     inp_dodeck(ft_curckt->ci_deck, ft_curckt->ci_name, NULL,
                TRUE, ft_curckt->ci_options, ft_curckt->ci_filename);
-    return;
 }
 
 
@@ -257,6 +254,4 @@ com_remcirc(wordlist *wl)
 
     /* make first entry in ft_circuits the actual circuit (or NULL) */
     ft_curckt = ft_circuits;
-
-    return;
 }
diff --git a/src/frontend/signal_handler.c b/src/frontend/signal_handler.c
index 234843b2b..51fe9fdf8 100644
--- a/src/frontend/signal_handler.c
+++ b/src/frontend/signal_handler.c
@@ -107,7 +107,6 @@ sigstop(void)
     cp_ccon(FALSE);
     (void) signal(SIGTSTP, SIG_DFL);
     (void) kill(getpid(), SIGTSTP); /* This should stop us */
-    return;
 }
 
 
diff --git a/src/frontend/spec.c b/src/frontend/spec.c
index d9f6ef8fa..b9a932fce 100644
--- a/src/frontend/spec.c
+++ b/src/frontend/spec.c
@@ -299,5 +299,4 @@ com_spec(wordlist *wl)
     tfree(win);
 #endif
 
-    return;
 }
diff --git a/src/frontend/spiceif.c b/src/frontend/spiceif.c
index e88041351..3696ebf0d 100644
--- a/src/frontend/spiceif.c
+++ b/src/frontend/spiceif.c
@@ -1629,7 +1629,6 @@ void com_loadsnap(wordlist *wl)
             return;
         }
     }
-    return;
 }
 
 
@@ -1765,5 +1764,4 @@ void com_savesnap(wordlist *wl)
 #endif
 
     fclose(file);
-    return;
 }
diff --git a/src/frontend/subckt.c b/src/frontend/subckt.c
index 857f72e43..30b5c7b50 100644
--- a/src/frontend/subckt.c
+++ b/src/frontend/subckt.c
@@ -2081,7 +2081,6 @@ devmodtranslate(struct line *deck, char *subname, wordlist * const submod)
             break;
         }
     }
-    return;
 }
 
 
diff --git a/src/frontend/terminal.c b/src/frontend/terminal.c
index ad90c099b..f74991869 100644
--- a/src/frontend/terminal.c
+++ b/src/frontend/terminal.c
@@ -122,8 +122,6 @@ out_init(void)
     ysize -= 2; /* Fudge room... */
 
     xpos = ypos = 0;
-
-    return;
 }
 
 
@@ -257,7 +255,6 @@ out_send(char *string)
     }
 
     (void) outbufputc();
-    return;
 }
 
 
diff --git a/src/frontend/trannoise/FastNorm3.c b/src/frontend/trannoise/FastNorm3.c
index 6be7aea7f..4339577f7 100644
--- a/src/frontend/trannoise/FastNorm3.c
+++ b/src/frontend/trannoise/FastNorm3.c
@@ -695,7 +695,6 @@ passdone:
     }
 
     /* We have a new lot of variates in wk1 */
-    return;
 }
 
 
@@ -743,7 +742,6 @@ nextpair:
     if (i < ll)
         goto nextpair;
     /* Horrid, but good enough */
-    return;
 }
 
 
@@ -835,7 +833,6 @@ docheck:
     } else {
         printf ("\nInitnorm check OK\n");
     }
-    return;
 }
 
 
diff --git a/src/frontend/trannoise/wallace.c b/src/frontend/trannoise/wallace.c
index 058b1b763..6bbdf10a3 100644
--- a/src/frontend/trannoise/wallace.c
+++ b/src/frontend/trannoise/wallace.c
@@ -510,7 +510,6 @@ timediff(struct timeb *now, struct timeb *begin, int *sec, int *msec)
         *msec += 1000;
         (*sec)--;
     }
-    return;
 }
 
 
diff --git a/src/frontend/typesdef.c b/src/frontend/typesdef.c
index e617f9725..5f95172fa 100644
--- a/src/frontend/typesdef.c
+++ b/src/frontend/typesdef.c
@@ -148,8 +148,6 @@ com_dftype(wordlist *wl)
         fprintf(cp_err, "Error: missing 'p' or 'v' argument\n");
         break;
     }
-
-    return;
 }
 
 
@@ -246,6 +244,4 @@ com_stype(wordlist *wl)
                 if (vv->v_flags & VF_PERMANENT)
                     vv->v_type = tt;
     }
-
-    return;
 }
diff --git a/src/frontend/vectors.c b/src/frontend/vectors.c
index 40c03c2c6..449a9ab65 100644
--- a/src/frontend/vectors.c
+++ b/src/frontend/vectors.c
@@ -244,7 +244,6 @@ ft_loadfile(char *file)
     }
     plot_num++;
     plotl_changed = TRUE;
-    return;
 }
 
 
@@ -281,8 +280,6 @@ plot_add(struct plot *pl)
     cp_addkword(CT_PLOT, buf);
     pl->pl_ccom = cp_kwswitch(CT_VECTOR, NULL);
     plot_setcur(pl->pl_typename);
-
-    return;
 }
 
 
@@ -304,7 +301,6 @@ vec_remove(char *name)
 
     /* Remove from the keyword list. */
     cp_remkword(CT_VECTOR, name);
-    return;
 }
 
 
@@ -621,7 +617,6 @@ plot_docoms(wordlist *wl)
     }
     cp_resetcontrol();
     cp_interactive = inter;
-    return;
 }
 
 
@@ -743,7 +738,6 @@ vec_new(struct dvec *d)
     }
     d->v_next = d->v_plot->pl_dvecs;
     d->v_plot->pl_dvecs = d;
-    return;
 }
 
 
@@ -775,8 +769,6 @@ vec_gc(void)
     for (pl = plot_list; pl; pl = pl->pl_next)
         for (d = pl->pl_dvecs; d; d = d->v_next)
             d->v_link2 = NULL;
-
-    return;
 }
 
 
@@ -828,7 +820,6 @@ vec_free_x(struct dvec *v)
         tfree(v->v_compdata);
 
     tfree(v);
-    return;
 }
 
 
@@ -930,7 +921,6 @@ plot_setcur(char *name)
      }
     */
     plot_cur = pl;
-    return;
 }
 
 
@@ -943,8 +933,6 @@ plot_new(struct plot *pl)
 {
     pl->pl_next = plot_list;
     plot_list = pl;
-
-    return;
 }