mirror of
https://github.com/postgres/postgres.git
synced 2025-06-29 10:41:53 +03:00
Restructure error handling as recently discussed. It is now really
possible to trap an error inside a function rather than letting it propagate out to PostgresMain. You still have to use AbortCurrentTransaction to clean up, but at least the error handling itself will cooperate.
This commit is contained in:
@ -8,7 +8,7 @@
|
||||
* Portions Copyright (c) 1994, Regents of the University of California
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $PostgreSQL: pgsql/src/backend/bootstrap/bootstrap.c,v 1.189 2004/07/21 20:34:45 momjian Exp $
|
||||
* $PostgreSQL: pgsql/src/backend/bootstrap/bootstrap.c,v 1.190 2004/07/31 00:45:30 tgl Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@ -16,7 +16,6 @@
|
||||
|
||||
#include <unistd.h>
|
||||
#include <signal.h>
|
||||
#include <setjmp.h>
|
||||
#ifdef HAVE_GETOPT_H
|
||||
#include <getopt.h>
|
||||
#endif
|
||||
@ -458,15 +457,6 @@ BootstrapMain(int argc, char *argv[])
|
||||
for (i = 0; i < HASHTABLESIZE; ++i)
|
||||
hashtable[i] = NULL;
|
||||
|
||||
/*
|
||||
* abort processing resumes here (this is probably dead code?)
|
||||
*/
|
||||
if (sigsetjmp(Warn_restart, 1) != 0)
|
||||
{
|
||||
Warnings++;
|
||||
AbortCurrentTransaction();
|
||||
}
|
||||
|
||||
/*
|
||||
* Process bootstrap input.
|
||||
*
|
||||
|
Reference in New Issue
Block a user