- A couple of small fixes for memory and initialization problems.

This is to make valgrind happy


SKIPPED:
	psi/amorscan.c
	psi/el734hp.c
	psi/psi.c
	psi/tasscan.c

conman.h

@@ -12,6 +12,8 @@
 
   Mark Koennecke, Aprl 2003
 
+  Mark Koennecke, December 2004
+
   copyright: see copyright.h
 ----------------------------------------------------------------------------*/
 #ifndef SICSCONNECT
@@ -30,34 +32,32 @@ typedef int (*writeFunc)(struct __SConnection *pCon,
    typedef struct __SConnection {
                                   /* object basics */
                                   pObjectDescriptor pDes;
-                                  /* char *pName; now generated on the fly from ident */
                                   long lMagic;
                                   long ident;
                                   struct __SConnection *next;
                                  
                                   /* I/O control */
+                                  /* our socket */
                                   mkChannel *pSock;
+                       
+                                  /* per connection log files */
                                   FILE *pFiles[MAXLOGFILES];
-                                  int iMacro;
-                                  int iTelnet;
-                                  int iOutput;                                
                                   int iFiles;
-                                  writeFunc write;
-                                  mkChannel *pDataSock;
-                                  char      *pDataComp;
-                                  int       iDataPort;
+
+                                  int iMacro; /* suppress I/O in macro*/
+                                  int iTelnet; /* telnet flag */
+                                  int iOutput;                                
+                                  writeFunc write; /* function doing
+						      writing */
 
                                   /* execution context */
-                                  int eInterrupt;
+                                  int eInterrupt; 
                                   int iUserRights;
-                                  int inUse;
-                                  int iDummy;
-                                  int iGrab;
-                                  int iErrCode;
+                                  int inUse; 
+                                  int iGrab; /* grab flag for token*/
                                   int parameterChange;
                                   int sicsError;
-                                  SicsInterp *pSics;
-                                  
+
                                   /* a FIFO */
                                   pCosta pStack;