rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Invoke on_exit() with correct number and type of arguments.

This commit is contained in:
Peter Eisentraut 2001-09-11 23:08:07 +00:00
parent a8d474195e
commit 93a9cc8533
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/bin/psql/input.c
View File

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

3
src/bin/psql/input.h
View File

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