Various cleanups from D'Arcy

3 files changed, 17 insertions, 11 deletions

diff --git a/src/interfaces/libpgtcl/pgtcl.c b/src/interfaces/libpgtcl/pgtcl.c
index ad9b68b41d..2cbec47395 100644
--- a/src/interfaces/libpgtcl/pgtcl.c
+++ b/src/interfaces/libpgtcl/pgtcl.c
@@ -9,14 +9,18 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/pgtcl.c,v 1.4 1996/11/09 10:39:40 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/pgtcl.c,v 1.5 1996/11/11 12:14:38 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 
+#include <stdlib.h>
+
+#include "postgres.h"
 #include "tcl.h"
 #include "libpgtcl.h"
 #include "pgtclCmds.h"
+#include "pgtclId.h"
 
 /*
  * Pgtcl_Init 
@@ -27,7 +31,7 @@
 /*
  * Tidy up forgotten postgres connection at Tcl_Exit
  */
-void
+static void
 Pgtcl_AtExit (ClientData cData)
 {
   Pg_clientData *cd = (Pg_clientData *)cData;
@@ -52,7 +56,7 @@ Pgtcl_AtExit (ClientData cData)
 /*
  * Tidy up forgotten postgres connections on Interpreter deletion
  */
-void
+static void
 Pgtcl_Shutdown (ClientData cData, Tcl_Interp *interp)
 {
   Pgtcl_AtExit(cData);
diff --git a/src/interfaces/libpgtcl/pgtclCmds.c b/src/interfaces/libpgtcl/pgtclCmds.c
index 397bcd15f7..980055e378 100644
--- a/src/interfaces/libpgtcl/pgtclCmds.c
+++ b/src/interfaces/libpgtcl/pgtclCmds.c
@@ -7,16 +7,17 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/pgtclCmds.c,v 1.6 1996/11/09 10:39:41 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/pgtclCmds.c,v 1.7 1996/11/11 12:14:42 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-
 #include <stdio.h>
 #include <stdlib.h>
-#include <tcl.h>
 #include <string.h>
+#include <tcl.h>
+
+#include "postgres.h"
 #include "libpq/pqcomm.h"
 #include "libpq-fe.h"
 #include "libpq/libpq-fs.h"
@@ -224,7 +225,7 @@ tcl_value (char *value)
  **********************************/
 
 int
-Pg_conndefaults(ClientData cData, Tcl_Interp *interp, int argc, char* argv[])
+Pg_conndefaults(ClientData cData, Tcl_Interp *interp, int argc, char **argv)
 {
     PQconninfoOption *option;
     char	buf[8192];
@@ -581,7 +582,7 @@ Pg_result(ClientData cData, Tcl_Interp *interp, int argc, char* argv[])
       Tcl_ResetResult(interp);
       for (i = 0; i < PQnfields(result); i++) {
           sprintf(buf, "{%s} %ld %d", PQfname(result, i),
-	  			      PQftype(result, i),
+	  			      (long) PQftype(result, i),
 				      PQfsize(result, i));
           Tcl_AppendElement(interp, buf);
       }
@@ -1125,7 +1126,7 @@ Pg_select(ClientData cData, Tcl_Interp *interp, int argc, char **argv)
     Pg_clientData *cd = (Pg_clientData *)cData;
 	PGconn *conn;
    	PGresult *result;
-    int ch_flag, r;
+    int r;
     size_t tupno, column, ncols;
 	Tcl_DString headers;
 	struct {
diff --git a/src/interfaces/libpgtcl/pgtclId.c b/src/interfaces/libpgtcl/pgtclId.c
index 53654b6da7..f39342c002 100644
--- a/src/interfaces/libpgtcl/pgtclId.c
+++ b/src/interfaces/libpgtcl/pgtclId.c
@@ -12,15 +12,16 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/pgtclId.c,v 1.2 1996/10/30 06:18:41 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/pgtclId.c,v 1.3 1996/11/11 12:14:45 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 
 #include <stdlib.h>
 #include <string.h>
-#include "tcl.h"
+#include <tcl.h>
 
+#include "postgres.h"
 #include "pgtclCmds.h"
 #include "pgtclId.h"