From d8105873db48525a07446f4c7ba8220f8968e7e1 Mon Sep 17 00:00:00 2001 From: rlar Date: Sat, 5 May 2012 21:54:48 +0200 Subject: [PATCH] remove error.h, use fteext.h for controlled_exit() --- src/frontend/com_measure2.c | 2 -- src/frontend/device.c | 1 - src/frontend/display.c | 1 - src/frontend/error.c | 1 - src/frontend/error.h | 13 ------------- src/frontend/hpgl.c | 1 - src/frontend/inp.c | 1 - src/frontend/inpcom.c | 2 -- src/frontend/measure.c | 2 -- src/frontend/numparam/mystring.c | 2 +- src/frontend/numparam/spicenum.c | 2 +- src/frontend/numparam/xpressn.c | 1 - src/frontend/plotting/graf.c | 1 - src/frontend/plotting/graphdb.c | 1 - src/frontend/plotting/x11.c | 1 - src/frontend/postsc.c | 1 - src/frontend/spiceif.c | 2 -- src/frontend/vectors.c | 1 - src/include/ngspice/fteext.h | 3 +++ src/spicelib/devices/bsim3soi_dd/b3soiddld.c | 2 +- src/spicelib/devices/bsim3soi_fd/b3soifdld.c | 2 +- src/spicelib/devices/cktask.c | 4 +--- src/spicelib/devices/cpl/cplload.c | 2 +- src/spicelib/devices/cpl/cplsetup.c | 2 +- src/spicelib/devices/txl/txlload.c | 2 +- src/spicelib/devices/txl/txlsetup.c | 2 +- src/spicelib/parser/inp2q.c | 4 ---- src/spicelib/parser/inp2u.c | 3 --- src/spicelib/parser/inpdomod.c | 2 +- 29 files changed, 13 insertions(+), 51 deletions(-) delete mode 100644 src/frontend/error.h diff --git a/src/frontend/com_measure2.c b/src/frontend/com_measure2.c index 59705c4ae..1435c8dc2 100644 --- a/src/frontend/com_measure2.c +++ b/src/frontend/com_measure2.c @@ -17,8 +17,6 @@ #include "com_measure2.h" #include "breakp2.h" -#include "error.h" /* controlled_exit() */ - typedef enum { MEASUREMENT_OK = 0, MEASUREMENT_FAILURE = 1 diff --git a/src/frontend/device.c b/src/frontend/device.c index 23c70c5b4..3213a75af 100644 --- a/src/frontend/device.c +++ b/src/frontend/device.c @@ -20,7 +20,6 @@ Modified: 2000 AlansFixes #include "variable.h" #include "com_commands.h" #include "../misc/util.h" /* ngdirname() */ -#include "error.h" /* controlled_ext() */ #include "gens.h" /* wl_forall */ diff --git a/src/frontend/display.c b/src/frontend/display.c index 205d8d49d..a5c6fcf6e 100644 --- a/src/frontend/display.c +++ b/src/frontend/display.c @@ -16,7 +16,6 @@ Copyright 1990 Regents of the University of California. All rights reserved. #include "display.h" #include "variable.h" -#include "error.h" /* static declarations */ static void gen_DatatoScreen(GRAPH *graph, double x, double y, int *screenx, int *screeny); diff --git a/src/frontend/error.c b/src/frontend/error.c index 6c00e9946..07cc3ec11 100644 --- a/src/frontend/error.c +++ b/src/frontend/error.c @@ -11,7 +11,6 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group #include "ngspice/cpdefs.h" #include "ngspice/ftedefs.h" #include -#include "error.h" /* global error message buffer */ diff --git a/src/frontend/error.h b/src/frontend/error.h deleted file mode 100644 index 1cc4b26c6..000000000 --- a/src/frontend/error.h +++ /dev/null @@ -1,13 +0,0 @@ -/************* - * Header file for error.c - * 1999 E. Rouat - ************/ - -#ifndef ERROR_H_INCLUDED -#define ERROR_H_INCLUDED - -#include "ngspice/defines.h" - -void controlled_exit(int status); - -#endif diff --git a/src/frontend/hpgl.c b/src/frontend/hpgl.c index 7794f5ebd..29d32988c 100644 --- a/src/frontend/hpgl.c +++ b/src/frontend/hpgl.c @@ -36,7 +36,6 @@ Author: Jim Groves #include "ngspice/fteinput.h" #include "ngspice/fteext.h" #include "variable.h" -#include "error.h" #include "plotting/graphdb.h" #include "hpgl.h" diff --git a/src/frontend/inp.c b/src/frontend/inp.c index 0da925781..af8fe8675 100644 --- a/src/frontend/inp.c +++ b/src/frontend/inp.c @@ -28,7 +28,6 @@ Author: 1985 Wayne A. Christopher #include "../misc/misc_time.h" #include "subckt.h" #include "spiceif.h" -#include "error.h" /* controlled_exit() */ #include "com_let.h" #ifdef XSPICE diff --git a/src/frontend/inpcom.c b/src/frontend/inpcom.c index 750dd44ff..8ae0f85e5 100644 --- a/src/frontend/inpcom.c +++ b/src/frontend/inpcom.c @@ -34,8 +34,6 @@ Author: 1985 Wayne A. Christopher /* SJB - Uncomment this line for debug tracing */ /*#define TRACE*/ -#include "error.h" /* controlled_exit() */ - /* globals -- wanted to avoid complicating inp_readall interface */ static char *library_file[1000]; static char *library_name[1000][1000]; diff --git a/src/frontend/measure.c b/src/frontend/measure.c index bfd3b46ff..2f1480cea 100644 --- a/src/frontend/measure.c +++ b/src/frontend/measure.c @@ -20,8 +20,6 @@ #include "com_commands.h" #include "com_display.h" -#include "error.h" /* controlled_exit() */ - static wordlist *measure_parse_line( char *line ) ; static bool measure_valid[20000];/* TRUE: if measurement no. [xxx] has been done successfully diff --git a/src/frontend/numparam/mystring.c b/src/frontend/numparam/mystring.c index de236e713..4c004be7d 100644 --- a/src/frontend/numparam/mystring.c +++ b/src/frontend/numparam/mystring.c @@ -19,7 +19,7 @@ #include "general.h" -#include "../error.h" /* controlled_exit() */ +#include "ngspice/fteext.h" /* controlled_exit() */ /***** primitive input-output ***/ diff --git a/src/frontend/numparam/spicenum.c b/src/frontend/numparam/spicenum.c index 2205f0486..3791fa869 100644 --- a/src/frontend/numparam/spicenum.c +++ b/src/frontend/numparam/spicenum.c @@ -27,7 +27,7 @@ Todo: #include "numparam.h" #include "ngspice/ngspice.h" -#include "../error.h" /* controlled_exit() */ +#include "ngspice/fteext.h" /* controlled_exit() */ void dump_symbols(tdico *dico_p); diff --git a/src/frontend/numparam/xpressn.c b/src/frontend/numparam/xpressn.c index 843254776..ce9cd0068 100644 --- a/src/frontend/numparam/xpressn.c +++ b/src/frontend/numparam/xpressn.c @@ -15,7 +15,6 @@ #include "ngspice/dvec.h" #include "../frontend/variable.h" #include "ngspice/compatmode.h" -#include "../frontend/error.h" /* random numbers in /maths/misc/randnumb.c */ extern double gauss0(void); diff --git a/src/frontend/plotting/graf.c b/src/frontend/plotting/graf.c index 9b38a2454..5339136c6 100644 --- a/src/frontend/plotting/graf.c +++ b/src/frontend/plotting/graf.c @@ -26,7 +26,6 @@ Author: 1988 Jeffrey M. Hsu #include "ngspice/grid.h" #include "../terminal.h" #include "../breakp2.h" -#include "../error.h" #include "../display.h" #include "../runcoms.h" diff --git a/src/frontend/plotting/graphdb.c b/src/frontend/plotting/graphdb.c index a322c6e78..74ea37ec5 100644 --- a/src/frontend/plotting/graphdb.c +++ b/src/frontend/plotting/graphdb.c @@ -14,7 +14,6 @@ Copyright 1990 Regents of the University of California. All rights reserved. #include "ngspice/ftedbgra.h" #include "graphdb.h" #include "../breakp2.h" -#include "../error.h" #include "../display.h" diff --git a/src/frontend/plotting/x11.c b/src/frontend/plotting/x11.c index 0f235ccc1..805c739ca 100644 --- a/src/frontend/plotting/x11.c +++ b/src/frontend/plotting/x11.c @@ -45,7 +45,6 @@ Author: 1988 Jeffrey M. Hsu #include "graphdb.h" #include "display.h" #include "graf.h" -#include "../error.h" #define RAD_TO_DEG (180.0 / M_PI) diff --git a/src/frontend/postsc.c b/src/frontend/postsc.c index d6ab74d5a..b79e9707f 100644 --- a/src/frontend/postsc.c +++ b/src/frontend/postsc.c @@ -17,7 +17,6 @@ Author: 1988 Jeffrey M. Hsu #include "postsc.h" #include "variable.h" -#include "error.h" #include "plotting/graphdb.h" #define RAD_TO_DEG (180.0 / M_PI) diff --git a/src/frontend/spiceif.c b/src/frontend/spiceif.c index 8215ecd09..2e8ec5265 100644 --- a/src/frontend/spiceif.c +++ b/src/frontend/spiceif.c @@ -59,8 +59,6 @@ CDHW*/ #include "spiceif.h" #include "variable.h" -#include "error.h" - #ifdef XSPICE /* gtri - add - wbk - 11/9/90 - include MIF function prototypes */ #include "ngspice/mifproto.h" diff --git a/src/frontend/vectors.c b/src/frontend/vectors.c index de1308b53..a70321685 100644 --- a/src/frontend/vectors.c +++ b/src/frontend/vectors.c @@ -20,7 +20,6 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group #include "../misc/misc_time.h" #include "vectors.h" #include "plotting/plotting.h" -#include "error.h" /* controlled_exit() */ #ifdef XSPICE /* gtri - begin - add function prototype for EVTfindvec */ diff --git a/src/include/ngspice/fteext.h b/src/include/ngspice/fteext.h index 2d7eaa0b5..0bef6d4f0 100644 --- a/src/include/ngspice/fteext.h +++ b/src/include/ngspice/fteext.h @@ -342,4 +342,7 @@ extern void vec_transpose(struct dvec *v); extern bool ft_intrpt; extern bool ft_setflag; +/* error.c */ +extern void controlled_exit(int status); + #endif /* FTEext_h */ diff --git a/src/spicelib/devices/bsim3soi_dd/b3soiddld.c b/src/spicelib/devices/bsim3soi_dd/b3soiddld.c index 20dc08f45..9307d59c7 100644 --- a/src/spicelib/devices/bsim3soi_dd/b3soiddld.c +++ b/src/spicelib/devices/bsim3soi_dd/b3soiddld.c @@ -21,7 +21,7 @@ File: b3soiddld.c 98/5/01 #include "ngspice/devdefs.h" #include "ngspice/suffix.h" -#include "../../../frontend/error.h" /* controlled_exit() */ +#include "ngspice/fteext.h" /* controlled_exit() */ #define MAX_EXP 5.834617425e14 #define MIN_EXP 1.713908431e-15 diff --git a/src/spicelib/devices/bsim3soi_fd/b3soifdld.c b/src/spicelib/devices/bsim3soi_fd/b3soifdld.c index b04e5ca35..62917c2a4 100644 --- a/src/spicelib/devices/bsim3soi_fd/b3soifdld.c +++ b/src/spicelib/devices/bsim3soi_fd/b3soifdld.c @@ -21,7 +21,7 @@ File: b3soifdld.c 98/5/01 #include "ngspice/devdefs.h" #include "ngspice/suffix.h" -#include "../../../frontend/error.h" /* controlled_exit() */ +#include "ngspice/fteext.h" /* controlled_exit() */ #define MAX_EXP 5.834617425e14 #define MIN_EXP 1.713908431e-15 diff --git a/src/spicelib/devices/cktask.c b/src/spicelib/devices/cktask.c index c7f4d5b01..5e7c6f979 100644 --- a/src/spicelib/devices/cktask.c +++ b/src/spicelib/devices/cktask.c @@ -13,9 +13,7 @@ Author: 1985 Thomas L. Quarles #include "ngspice/sperror.h" #include "dev.h" -#include "error.h" - -extern bool ft_stricterror; +#include "ngspice/fteext.h" /* controlled_exit() */ int CKTask(CKTcircuit *ckt, GENinstance *instance, int which, IFvalue *value, IFvalue *selector) diff --git a/src/spicelib/devices/cpl/cplload.c b/src/spicelib/devices/cpl/cplload.c index 0ec101ae2..a71029cd8 100644 --- a/src/spicelib/devices/cpl/cplload.c +++ b/src/spicelib/devices/cpl/cplload.c @@ -10,7 +10,7 @@ Author: 1992 Charles Hough #include "ngspice/sperror.h" #include "ngspice/suffix.h" -#include "../../../frontend/error.h" /* controlled_exit() */ +#include "ngspice/fteext.h" /* controlled_exit() */ VI_list *pool_vi; static double ratio[MAX_CP_TX_LINES]; diff --git a/src/spicelib/devices/cpl/cplsetup.c b/src/spicelib/devices/cpl/cplsetup.c index 03f2568c3..38b77ca95 100644 --- a/src/spicelib/devices/cpl/cplsetup.c +++ b/src/spicelib/devices/cpl/cplsetup.c @@ -14,7 +14,7 @@ Modified: 2004 Paolo Nenzi - (ng)spice integration #include "ngspice/multi_line.h" -#include "../../../frontend/error.h" /* controlled_exit() */ +#include "ngspice/fteext.h" /* controlled_exit() */ #define VECTOR_ALLOC(vec, n) { \ diff --git a/src/spicelib/devices/txl/txlload.c b/src/spicelib/devices/txl/txlload.c index 28407910a..8699a83cb 100644 --- a/src/spicelib/devices/txl/txlload.c +++ b/src/spicelib/devices/txl/txlload.c @@ -10,7 +10,7 @@ Author: 1992 Charles Hough #include "ngspice/sperror.h" #include "ngspice/suffix.h" -#include "../../../frontend/error.h" /* controlled_exit() */ +#include "ngspice/fteext.h" /* controlled_exit() */ static double ratio[MAX_CP_TX_LINES]; static int update_cnv_txl(TXLine*, double); diff --git a/src/spicelib/devices/txl/txlsetup.c b/src/spicelib/devices/txl/txlsetup.c index e24d55825..22bf204f7 100644 --- a/src/spicelib/devices/txl/txlsetup.c +++ b/src/spicelib/devices/txl/txlsetup.c @@ -11,7 +11,7 @@ Author: 1992 Charles Hough #include "ngspice/sperror.h" #include "ngspice/suffix.h" -#include "../../../frontend/error.h" /* controlled_exit() */ +#include "ngspice/fteext.h" /* controlled_exit() */ static int ReadTxL(TXLinstance*, CKTcircuit*); /*static int multC();*/ diff --git a/src/spicelib/parser/inp2q.c b/src/spicelib/parser/inp2q.c index ffea3e61f..b4dc29e0e 100644 --- a/src/spicelib/parser/inp2q.c +++ b/src/spicelib/parser/inp2q.c @@ -11,10 +11,6 @@ Modified: 2001 Paolo Nenzi (Cider Integration) #include "ngspice/fteext.h" #include "inp.h" -#ifdef ADMS -#include "error.h" /* controlled_exit() */ -#endif - void INP2Q(CKTcircuit *ckt, INPtables * tab, card * current, CKTnode *gnode) { diff --git a/src/spicelib/parser/inp2u.c b/src/spicelib/parser/inp2u.c index 700623c24..18e704016 100644 --- a/src/spicelib/parser/inp2u.c +++ b/src/spicelib/parser/inp2u.c @@ -10,9 +10,6 @@ Author: 1988 Thomas L. Quarles #include "ngspice/inpmacs.h" #include "ngspice/fteext.h" #include "inp.h" -#if ADMS >= 3 -#include "error.h" /* controlled_exit() */ -#endif void INP2U(CKTcircuit *ckt, INPtables * tab, card * current) { diff --git a/src/spicelib/parser/inpdomod.c b/src/spicelib/parser/inpdomod.c index 733d3ee84..bee2cdca9 100644 --- a/src/spicelib/parser/inpdomod.c +++ b/src/spicelib/parser/inpdomod.c @@ -8,7 +8,7 @@ Author: 1985 Thomas L. Quarles #include "ngspice/inpdefs.h" #include "inp.h" #if ADMS >= 3 -#include "error.h" /* controlled_exit() */ +#include "ngspice/fteext.h" /* controlled_exit() */ #endif /*--------------------------------------------------------------