diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2004-07-31 00:45:57 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2004-07-31 00:45:57 +0000 |
| commit | a393fbf93763709f90ba1f968e50a35bd4cabcfb (patch) | |
| tree | 955d74e7181214688b575f31c243005fe470dfe1 /src/backend/bootstrap/bootstrap.c | |
| parent | 94f8f63fdbcf61a56a23b8052d68fd78bec86a3b (diff) | |
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.
Diffstat (limited to 'src/backend/bootstrap/bootstrap.c')
| -rw-r--r-- | src/backend/bootstrap/bootstrap.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c index 39887015930..2a4f9a6f503 100644 --- a/src/backend/bootstrap/bootstrap.c +++ b/src/backend/bootstrap/bootstrap.c @@ -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 @@ -459,15 +458,6 @@ BootstrapMain(int argc, char *argv[]) hashtable[i] = NULL; /* - * abort processing resumes here (this is probably dead code?) - */ - if (sigsetjmp(Warn_restart, 1) != 0) - { - Warnings++; - AbortCurrentTransaction(); - } - - /* * Process bootstrap input. * * the sed script boot.sed renamed yyparse to Int_yyparse for the |