fix bug causing memory corruption and clean up lmp_f2c.h header

lib/linalg/lmp_f2c.h

@@ -19,141 +19,13 @@ typedef long int logical;
 typedef short int shortlogical;
 typedef char logical1;
 typedef char integer1;
-#ifdef INTEGER_STAR_8   /* Adjust for integer*8. */
-typedef long long longint;              /* system-dependent */
-typedef unsigned long long ulongint;    /* system-dependent */
-#define qbit_clear(a,b) ((a) & ~((ulongint)1 << (b)))
-#define qbit_set(a,b)   ((a) |  ((ulongint)1 << (b)))
-#endif
 
 #define TRUE_ (1)
 #define FALSE_ (0)
 
-/* Extern is for use with -E */
-#ifndef Extern
-#define Extern extern
-#endif
-
-/* I/O stuff */
-
-#ifdef f2c_i2
-/* for -i2 */
-typedef short flag;
-typedef short ftnlen;
-typedef short ftnint;
-#else
-typedef long int flag;
 typedef long int ftnlen;
-typedef long int ftnint;
-#endif
-
-/*external read, write*/
-typedef struct
-{       flag cierr;
-        ftnint ciunit;
-        flag ciend;
-        char *cifmt;
-        ftnint cirec;
-} cilist;
-
-/*internal read, write*/
-typedef struct
-{       flag icierr;
-        char *iciunit;
-        flag iciend;
-        char *icifmt;
-        ftnint icirlen;
-        ftnint icirnum;
-} icilist;
-
-/*open*/
-typedef struct
-{       flag oerr;
-        ftnint ounit;
-        char *ofnm;
-        ftnlen ofnmlen;
-        char *osta;
-        char *oacc;
-        char *ofm;
-        ftnint orl;
-        char *oblnk;
-} olist;
-
-/*close*/
-typedef struct
-{       flag cerr;
-        ftnint cunit;
-        char *csta;
-} cllist;
-
-/*rewind, backspace, endfile*/
-typedef struct
-{       flag aerr;
-        ftnint aunit;
-} alist;
-
-/* inquire */
-typedef struct
-{       flag inerr;
-        ftnint inunit;
-        char *infile;
-        ftnlen infilen;
-        ftnint	*inex;	/*parameters in standard's order*/
-        ftnint	*inopen;
-        ftnint	*innum;
-        ftnint	*innamed;
-        char	*inname;
-        ftnlen	innamlen;
-        char	*inacc;
-        ftnlen	inacclen;
-        char	*inseq;
-        ftnlen	inseqlen;
-        char 	*indir;
-        ftnlen	indirlen;
-        char	*infmt;
-        ftnlen	infmtlen;
-        char	*inform;
-        ftnint	informlen;
-        char	*inunf;
-        ftnlen	inunflen;
-        ftnint	*inrecl;
-        ftnint	*innrec;
-        char	*inblank;
-        ftnlen	inblanklen;
-} inlist;
-
 #define VOID void
 
-union Multitype {       /* for multiple entry points */
-        integer1 g;
-        shortint h;
-        integer i;
-        /* longint j; */
-        real r;
-        doublereal d;
-        complex c;
-        doublecomplex z;
-        };
-
-typedef union Multitype Multitype;
-
-/*typedef long int Long;*/      /* No longer used; formerly in Namelist */
-
-struct Vardesc {        /* for Namelist */
-        char *name;
-        char *addr;
-        ftnlen *dims;
-        int  type;
-        };
-typedef struct Vardesc Vardesc;
-
-struct Namelist {
-        char *name;
-        Vardesc **vars;
-        int nvars;
-        };
-typedef struct Namelist Namelist;
-
 #define abs(x) ((x) >= 0 ? (x) : -(x))
 #define dabs(x) (doublereal)abs(x)
 #define min(a,b) ((a) <= (b) ? (a) : (b))

lib/linalg/s_lmp_cat.cpp

@@ -4,7 +4,7 @@
 // concatenate two strings
 
 extern "C" {
-void s_lmp_cat(char *lp, char *rpp[], ftnint rnp[], ftnint *np, ftnlen ll)
+void s_lmp_cat(char *lp, char **rpp, integer *rnp, integer *np, ftnlen ll)
 {
     ftnlen i, nc;
     char *rp;