Fix indenting for 'extern "C"' cases.

This commit is contained in:
Bruce Momjian 2001-11-08 20:37:52 +00:00
parent e8192dc0d0
commit 77e4fd889c
17 changed files with 678 additions and 672 deletions

View File

@ -53,15 +53,18 @@ system(const char *command)
{ {
pid_t pid; pid_t pid;
int pstat; int pstat;
struct sigaction ign, intact, quitact; struct sigaction ign,
sigset_t newsigblock, oldsigblock; intact,
quitact;
sigset_t newsigblock,
oldsigblock;
if (!command) /* just checking... */ if (!command) /* just checking... */
return (1); return (1);
/* /*
* Ignore SIGINT and SIGQUIT, block SIGCHLD. Remember to save * Ignore SIGINT and SIGQUIT, block SIGCHLD. Remember to save existing
* existing signal dispositions. * signal dispositions.
*/ */
ign.sa_handler = SIG_IGN; ign.sa_handler = SIG_IGN;
(void) sigemptyset(&ign.sa_mask); (void) sigemptyset(&ign.sa_mask);
@ -71,10 +74,12 @@ system(const char *command)
(void) sigemptyset(&newsigblock); (void) sigemptyset(&newsigblock);
(void) sigaddset(&newsigblock, SIGCHLD); (void) sigaddset(&newsigblock, SIGCHLD);
(void) sigprocmask(SIG_BLOCK, &newsigblock, &oldsigblock); (void) sigprocmask(SIG_BLOCK, &newsigblock, &oldsigblock);
switch(pid = fork()) { switch (pid = fork())
{
case -1: /* error */ case -1: /* error */
break; break;
case 0: /* child */ case 0: /* child */
/* /*
* Restore original signal dispositions and exec the command. * Restore original signal dispositions and exec the command.
*/ */
@ -84,7 +89,8 @@ system(const char *command)
execl(_PATH_BSHELL, "sh", "-c", command, (char *) NULL); execl(_PATH_BSHELL, "sh", "-c", command, (char *) NULL);
_exit(127); _exit(127);
default: /* parent */ default: /* parent */
do { do
{
pid = wait4(pid, &pstat, 0, (struct rusage *) 0); pid = wait4(pid, &pstat, 0, (struct rusage *) 0);
} while (pid == -1 && errno == EINTR); } while (pid == -1 && errno == EINTR);
break; break;

View File

@ -1,5 +1,5 @@
/* /*
* $Id: aix.h,v 1.9 2001/11/05 17:46:27 momjian Exp $ * $Id: aix.h,v 1.10 2001/11/08 20:37:52 momjian Exp $
* *
* @(#)dlfcn.h 1.4 revision of 95/04/25 09:36:52 * @(#)dlfcn.h 1.4 revision of 95/04/25 09:36:52
* This is an unpublished work copyright (c) 1992 HELIOS Software GmbH * This is an unpublished work copyright (c) 1992 HELIOS Software GmbH

View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/port/qnx4/Attic/sem.h,v 1.6 2001/11/05 17:46:27 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/port/qnx4/Attic/sem.h,v 1.7 2001/11/08 20:37:52 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */

View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/port/qnx4/Attic/shm.h,v 1.6 2001/11/05 17:46:27 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/port/qnx4/Attic/shm.h,v 1.7 2001/11/08 20:37:52 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */

View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.115 2001/11/06 00:38:26 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.116 2001/11/08 20:37:52 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */

View File

@ -12,7 +12,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $Id: tgRecipe.h,v 1.21 2001/11/05 17:46:28 momjian Exp $ * $Id: tgRecipe.h,v 1.22 2001/11/08 20:37:52 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -29,6 +29,7 @@ typedef struct
y; y;
} Point; /* this should match whatever is in } Point; /* this should match whatever is in
*
* *
* *
* geo-decls.h */ * geo-decls.h */

View File

@ -2,7 +2,7 @@
* *
* spi.h * spi.h
* *
* $Id: spi.h,v 1.32 2001/11/05 19:41:56 tgl Exp $ * $Id: spi.h,v 1.33 2001/11/08 20:37:52 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */

View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/include/port/darwin/Attic/sem.h,v 1.5 2001/11/05 17:46:35 momjian Exp $ * $Header: /cvsroot/pgsql/src/include/port/darwin/Attic/sem.h,v 1.6 2001/11/08 20:37:52 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */

View File

@ -70,5 +70,4 @@ extern "C"
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

View File

@ -76,5 +76,4 @@ extern "C"
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

View File

@ -25,7 +25,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-misc.c,v 1.61 2001/11/08 04:05:13 tgl Exp $ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-misc.c,v 1.62 2001/11/08 20:37:52 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */

View File

@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $Id: libpq-fe.h,v 1.79 2001/11/05 17:46:37 momjian Exp $ * $Id: libpq-fe.h,v 1.80 2001/11/08 20:37:52 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -39,17 +39,16 @@ extern "C"
{ {
/* /*
* Although you may decide to change this list in some way, values * Although you may decide to change this list in some way, values
* which become unused should never be removed, nor should * which become unused should never be removed, nor should constants
* constants be redefined - that would break compatibility with * be redefined - that would break compatibility with existing code.
* existing code.
*/ */
CONNECTION_OK, CONNECTION_OK,
CONNECTION_BAD, CONNECTION_BAD,
/* Non-blocking mode only below here */ /* Non-blocking mode only below here */
/* /*
* The existence of these should never be relied upon - they * The existence of these should never be relied upon - they should
* should only be used for user feedback or similar purposes. * only be used for user feedback or similar purposes.
*/ */
CONNECTION_STARTED, /* Waiting for connection to be made. */ CONNECTION_STARTED, /* Waiting for connection to be made. */
CONNECTION_MADE, /* Connection OK; waiting to send. */ CONNECTION_MADE, /* Connection OK; waiting to send. */
@ -106,8 +105,8 @@ extern "C"
*/ */
typedef struct pgNotify typedef struct pgNotify
{ {
char relname[NAMEDATALEN]; /* name of relation char relname[NAMEDATALEN]; /* name of relation containing
* containing data */ * data */
int be_pid; /* process id of backend */ int be_pid; /* process id of backend */
} PGnotify; } PGnotify;
@ -325,28 +324,29 @@ extern "C"
/* === in fe-print.c === */ /* === in fe-print.c === */
extern void PQprint(FILE *fout, /* output stream */ extern void
PQprint(FILE *fout, /* output stream */
const PGresult *res, const PGresult *res,
const PQprintOpt *ps); /* option structure */ const PQprintOpt *ps); /* option structure */
/* /*
* really old printing routines * really old printing routines
*/ */
extern void PQdisplayTuples(const PGresult *res, extern void
FILE *fp, /* where to send the PQdisplayTuples(const PGresult *res,
* output */ FILE *fp, /* where to send the output */
int fillAlign, /* pad the fields with int fillAlign, /* pad the fields with spaces */
* spaces */
const char *fieldSep, /* field separator */ const char *fieldSep, /* field separator */
int printHeader, /* display headers? */ int printHeader, /* display headers? */
int quiet); int quiet);
extern void PQprintTuples(const PGresult *res, extern void
PQprintTuples(const PGresult *res,
FILE *fout, /* output stream */ FILE *fout, /* output stream */
int printAttName, /* print attribute names */ int printAttName, /* print attribute names */
int terseOutput, /* delimiter bars */ int terseOutput, /* delimiter bars */
int width); /* width of column, if int width); /* width of column, if 0, use variable
* 0, use variable width */ * width */
/* === in fe-lobj.c === */ /* === in fe-lobj.c === */

View File

@ -3,7 +3,7 @@
* procedural language * procedural language
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/pl/plpgsql/src/pl_exec.c,v 1.49 2001/11/05 19:41:56 tgl Exp $ * $Header: /cvsroot/pgsql/src/pl/plpgsql/src/pl_exec.c,v 1.50 2001/11/08 20:37:52 momjian Exp $
* *
* This software is copyrighted by Jan Wieck - Hamburg. * This software is copyrighted by Jan Wieck - Hamburg.
* *
@ -419,6 +419,7 @@ plpgsql_exec_function(PLpgSQL_function * func, FunctionCallInfo fcinfo)
func->fn_rettypelem, func->fn_rettypelem,
-1, -1,
&fcinfo->isnull); &fcinfo->isnull);
/* /*
* If the functions return type isn't by value, copy the value * If the functions return type isn't by value, copy the value
* into upper executor memory context. * into upper executor memory context.