remove error.h, use fteext.h for controlled_exit()

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

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 */
 

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);

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 <signal.h>
-#include "error.h"
 
 
 /* global error message buffer */

src/frontend/error.h

@@ -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

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"
 

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

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];

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

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 ***/
 

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);
 

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);

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"
 

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"
 
 

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)
 

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)

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"

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 */

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 */

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

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

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)

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];

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) { \

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);

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();*/

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)
 {
 

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)
 {

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
 
 /*--------------------------------------------------------------