From 93a9cc8533a197af0d20ef1efbfb52c7efc1c628 Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <peter_e@gmx.net>
Date: Tue, 11 Sep 2001 23:08:07 +0000
Subject: [PATCH] Invoke on_exit() with correct number and type of arguments.

---
 src/bin/psql/input.c | 17 ++++++++++++++---
 src/bin/psql/input.h |  3 +--
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/bin/psql/input.c b/src/bin/psql/input.c
index 894fc8d454..17cfee41ae 100644
--- a/src/bin/psql/input.c
+++ b/src/bin/psql/input.c
@@ -3,7 +3,7 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/input.c,v 1.16 2001/02/27 08:13:27 ishii Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/input.c,v 1.17 2001/09/11 23:08:07 petere Exp $
  */
 #include "postgres_fe.h"
 #include "input.h"
@@ -26,6 +26,13 @@ static bool useHistory;
 
 #endif
 
+#ifdef HAVE_ATEXIT
+static void	finishInput(void);
+#else
+/* designed for use with on_exit() */
+static void	finishInput(int, void*);
+#endif
+
 
 /*
  * gets_interactive()
@@ -154,7 +161,7 @@ initializeInput(int flags)
 #ifdef HAVE_ATEXIT
 	atexit(finishInput);
 #else
-	on_exit(finishInput);
+	on_exit(finishInput, NULL);
 #endif
 }
 
@@ -182,8 +189,12 @@ saveHistory(char *fname)
 
 
 
-void
+static void
+#ifdef HAVE_ATEXIT
 finishInput(void)
+#else
+finishInput(int exitstatus, void *arg)
+#endif
 {
 #ifdef USE_HISTORY
 	if (useHistory)
diff --git a/src/bin/psql/input.h b/src/bin/psql/input.h
index 69387989fa..ff9deade1d 100644
--- a/src/bin/psql/input.h
+++ b/src/bin/psql/input.h
@@ -3,7 +3,7 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/input.h,v 1.11 2000/10/03 19:50:20 petere Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/input.h,v 1.12 2001/09/11 23:08:07 petere Exp $
  */
 #ifndef INPUT_H
 #define INPUT_H
@@ -39,6 +39,5 @@ char	   *gets_fromFile(FILE *source);
 
 void		initializeInput(int flags);
 bool		saveHistory(char *fname);
-void		finishInput(void);
 
 #endif	 /* INPUT_H */
-- 
2.11.0