Fix indenting for 'extern "C"' cases.

src/backend/port/darwin/system.c

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

src/backend/port/dynloader/aix.h

 /*
- * $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
  * This is an unpublished work copyright (c) 1992 HELIOS Software GmbH
@@ -31,23 +31,23 @@ extern		"C"
  * To be able to intialize, a library may provide a dl_info structure
  * that contains functions to be called to initialize and terminate.
  */
-	struct dl_info
-	{
+struct dl_info
+{
 	void		(*init) (void);
 	void		(*fini) (void);
-	};
+};
 
 #if __STDC__ || defined(_IBMR2)
-	void	   *dlopen(const char *path, int mode);
-	void	   *dlsym(void *handle, const char *symbol);
-	char	   *dlerror(void);
-	int			dlclose(void *handle);
+void	   *dlopen(const char *path, int mode);
+void	   *dlsym(void *handle, const char *symbol);
+char	   *dlerror(void);
+int			dlclose(void *handle);
 
 #else
-	void	   *dlopen();
-	void	   *dlsym();
-	char	   *dlerror();
-	int			dlclose();
+void	   *dlopen();
+void	   *dlsym();
+char	   *dlerror();
+int			dlclose();
 #endif
 
 #ifdef __cplusplus

src/backend/port/qnx4/sem.h

@@ -7,7 +7,7 @@
  *
  *
  * 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 $
  *
  *-------------------------------------------------------------------------
  */
@@ -38,28 +38,28 @@ extern		"C"
  *	There is one semaphore structure for each semaphore in the system.
  */
 
-	struct sem
-	{
+struct sem
+{
 	ushort_t	semval;			/* semaphore text map address	*/
 	pid_t		sempid;			/* pid of last operation	*/
 	ushort_t	semncnt;		/* # awaiting semval > cval */
 	ushort_t	semzcnt;		/* # awaiting semval = 0	*/
-	};
+};
 
 /*
  * User semaphore template for semop system calls.
  */
 
-	struct sembuf
-	{
+struct sembuf
+{
 	ushort_t	sem_num;		/* semaphore #			*/
 	short		sem_op;			/* semaphore operation		*/
 	short		sem_flg;		/* operation flags		*/
-	};
+};
 
-	extern int	semctl(int semid, int semnum, int cmd, /* ... */ union semun arg);
-	extern int	semget(key_t key, int nsems, int semflg);
-	extern int	semop(int semid, struct sembuf * sops, size_t nsops);
+extern int	semctl(int semid, int semnum, int cmd, /* ... */ union semun arg);
+extern int	semget(key_t key, int nsems, int semflg);
+extern int	semop(int semid, struct sembuf * sops, size_t nsops);
 
 #ifdef __cplusplus
 }

src/backend/port/qnx4/shm.h

@@ -7,7 +7,7 @@
  *
  *
  * 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 $
  *
  *-------------------------------------------------------------------------
  */
@@ -25,16 +25,16 @@ extern		"C"
 #define SHM_R	0400			/* read permission */
 #define SHM_W	0200			/* write permission */
 
-	struct shmid_ds
-	{
+struct shmid_ds
+{
 	int			dummy;
 	int			shm_nattch;
-	};
+};
 
-	extern void *shmat(int shmid, const void *shmaddr, int shmflg);
-	extern int	shmdt(const void *addr);
-	extern int	shmctl(int shmid, int cmd, struct shmid_ds * buf);
-	extern int	shmget(key_t key, size_t size, int flags);
+extern void *shmat(int shmid, const void *shmaddr, int shmflg);
+extern int	shmdt(const void *addr);
+extern int	shmctl(int shmid, int cmd, struct shmid_ds * buf);
+extern int	shmget(key_t key, size_t size, int flags);
 
 #ifdef	__cplusplus
 }

src/backend/storage/lmgr/proc.c

@@ -8,7 +8,7 @@
  *
  *
  * 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 $
  *
  *-------------------------------------------------------------------------
  */

src/backend/tioga/tgRecipe.h

@@ -12,7 +12,7 @@
  * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
  * 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;
 } Point;						/* this should match whatever is in
 
+								 *
 								 *
 								 *
 								 * geo-decls.h */

src/include/executor/spi.h

@@ -2,7 +2,7 @@
  *
  * 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 $
  *
  *-------------------------------------------------------------------------
  */

src/include/port/darwin/sem.h

@@ -7,7 +7,7 @@
  *
  *
  * 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 $
  *
  *-------------------------------------------------------------------------
  */
@@ -44,28 +44,28 @@ extern		"C"
  *	There is one semaphore structure for each semaphore in the system.
  */
 
-	struct sem
-	{
+struct sem
+{
 	ushort_t	semval;			/* semaphore text map address	*/
 	pid_t		sempid;			/* pid of last operation	*/
 	ushort_t	semncnt;		/* # awaiting semval > cval */
 	ushort_t	semzcnt;		/* # awaiting semval = 0	*/
-	};
+};
 
 /*
  * User semaphore template for semop system calls.
  */
 
-	struct sembuf
-	{
+struct sembuf
+{
 	ushort_t	sem_num;		/* semaphore #			*/
 	short		sem_op;			/* semaphore operation		*/
 	short		sem_flg;		/* operation flags		*/
-	};
+};
 
-	extern int	semctl(int semid, int semnum, int cmd, /* ... */ union semun arg);
-	extern int	semget(key_t key, int nsems, int semflg);
-	extern int	semop(int semid, struct sembuf * sops, size_t nsops);
+extern int	semctl(int semid, int semnum, int cmd, /* ... */ union semun arg);
+extern int	semget(key_t key, int nsems, int semflg);
+extern int	semop(int semid, struct sembuf * sops, size_t nsops);
 
 #ifdef __cplusplus
 }

src/interfaces/ecpg/include/ecpglib.h

@@ -35,23 +35,23 @@ extern		"C"
 {
 #endif
 
-	void		ECPGdebug(int, FILE *);
-	bool		ECPGstatus(int, const char *);
-	bool		ECPGsetcommit(int, const char *, const char *);
-	bool		ECPGsetconn(int, const char *);
-	bool		ECPGconnect(int, const char *, const char *, const char *, const char *, int);
-	bool		ECPGdo(int, const char *, char *,...);
-	bool		ECPGtrans(int, const char *, const char *);
-	bool		ECPGdisconnect(int, const char *);
-	bool		ECPGprepare(int, char *, char *);
-	bool		ECPGdeallocate(int, char *);
-	bool		ECPGdeallocate_all(int);
-	char	   *ECPGprepared_statement(char *);
-
-	void		ECPGlog(const char *format,...);
+void		ECPGdebug(int, FILE *);
+bool		ECPGstatus(int, const char *);
+bool		ECPGsetcommit(int, const char *, const char *);
+bool		ECPGsetconn(int, const char *);
+bool		ECPGconnect(int, const char *, const char *, const char *, const char *, int);
+bool		ECPGdo(int, const char *, char *,...);
+bool		ECPGtrans(int, const char *, const char *);
+bool		ECPGdisconnect(int, const char *);
+bool		ECPGprepare(int, char *, char *);
+bool		ECPGdeallocate(int, char *);
+bool		ECPGdeallocate_all(int);
+char	   *ECPGprepared_statement(char *);
+
+void		ECPGlog(const char *format,...);
 
  /* print an error message */
-	void		sqlprint(void);
+void		sqlprint(void);
 
 /* define this for simplicity as well as compatibility */
 
@@ -59,16 +59,15 @@ extern		"C"
 
 /* dynamic SQL */
 
-	bool		ECPGdo_descriptor(int line, const char *connection,
+bool ECPGdo_descriptor(int line, const char *connection,
 				  const char *descriptor, const char *query);
-	bool		ECPGdeallocate_desc(int line, const char *name);
-	bool		ECPGallocate_desc(int line, const char *name);
-	void		ECPGraise(int line, int code, const char *str);
-	bool		ECPGget_desc_header(int, char *, int *);
-	bool		ECPGget_desc(int, char *, int,...);
+bool		ECPGdeallocate_desc(int line, const char *name);
+bool		ECPGallocate_desc(int line, const char *name);
+void		ECPGraise(int line, int code, const char *str);
+bool		ECPGget_desc_header(int, char *, int *);
+bool		ECPGget_desc(int, char *, int,...);
 
 
 #ifdef __cplusplus
 }
-
 #endif

src/interfaces/ecpg/include/ecpgtype.h

@@ -32,8 +32,8 @@ extern		"C"
 {
 #endif
 
-	enum ECPGttype
-	{
+enum ECPGttype
+{
 	ECPGt_char = 1, ECPGt_unsigned_char, ECPGt_short, ECPGt_unsigned_short,
 	ECPGt_int, ECPGt_unsigned_int, ECPGt_long, ECPGt_unsigned_long,
 	ECPGt_bool,
@@ -48,11 +48,11 @@ extern		"C"
 	ECPGt_NO_INDICATOR,			/* no indicator */
 	ECPGt_long_long, ECPGt_unsigned_long_long,
 	ECPGt_descriptor			/* sql descriptor, no C variable */
-	};
+};
 
  /* descriptor items */
-	enum ECPGdtype
-	{
+enum ECPGdtype
+{
 	ECPGd_count = 1,
 	ECPGd_data,
 	ECPGd_di_code,
@@ -70,11 +70,10 @@ extern		"C"
 	ECPGd_type,
 	ECPGd_EODT,					/* End of descriptor types. */
 	ECPGd_cardinality
-	};
+};
 
 #define IS_SIMPLE_TYPE(type) (((type) >= ECPGt_char && (type) <= ECPGt_varchar2) || ((type)>=ECPGt_long_long && (type) <= ECPGt_unsigned_long_long))
 
 #ifdef __cplusplus
 }
-
 #endif

src/interfaces/ecpg/include/sqlca.h

@@ -16,8 +16,8 @@ extern		"C"
 {
 #endif
 
-	struct sqlca
-	{
+struct sqlca
+{
 	char		sqlcaid[8];
 	long		sqlabc;
 	long		sqlcode;
@@ -51,9 +51,9 @@ extern		"C"
 	/* 7: empty						*/
 
 	char		sqlext[8];
-	};
+};
 
-	extern DLLIMPORT struct sqlca sqlca;
+extern DLLIMPORT struct sqlca sqlca;
 
 
 #ifdef __cplusplus

src/interfaces/libpq/fe-misc.c

@@ -25,7 +25,7 @@
  *
  *
  * 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 $
  *
  *-------------------------------------------------------------------------
  */

src/interfaces/odbc/gpps.h

@@ -18,8 +18,8 @@ extern		"C"
 {
 #endif
 
-	DWORD
-				GetPrivateProfileString(const char *theSection, /* section name */
+DWORD
+GetPrivateProfileString(const char *theSection, /* section name */
 						const char *theKey,		/* search key name */
 						const char *theDefault, /* default value if not
 												 * found */
@@ -30,8 +30,8 @@ extern		"C"
 						const char *theIniFileName);	/* pathname of ini file
 														 * to search */
 
-	DWORD
-				WritePrivateProfileString(const char *theSection,		/* section name */
+DWORD
+WritePrivateProfileString(const char *theSection,		/* section name */
 						  const char *theKey,	/* write key name */
 						  const char *theBuffer,		/* input buffer */
 						  const char *theIniFileName);	/* pathname of ini file

src/interfaces/odbc/isql.h

@@ -135,21 +135,21 @@ extern		"C"
 {
 #endif
 
-	RETCODE SQL_API SQLAllocConnect(HENV henv,
+RETCODE SQL_API SQLAllocConnect(HENV henv,
 				HDBC FAR * phdbc);
-	RETCODE SQL_API SQLAllocEnv(HENV FAR * phenv);
-	RETCODE SQL_API SQLAllocStmt(HDBC hdbc,
+RETCODE SQL_API SQLAllocEnv(HENV FAR * phenv);
+RETCODE SQL_API SQLAllocStmt(HDBC hdbc,
 			 HSTMT FAR * phstmt);
-	RETCODE SQL_API SQLBindCol(HSTMT hstmt,
+RETCODE SQL_API SQLBindCol(HSTMT hstmt,
 		   UWORD icol,
 		   SWORD fCType,
 		   PTR rgbValue,
 		   SDWORD cbValueMax,
 		   SDWORD FAR * pcbValue);
 
-	RETCODE SQL_API SQLCancel(HSTMT hstmt);
+RETCODE SQL_API SQLCancel(HSTMT hstmt);
 
-	RETCODE SQL_API SQLColAttributes(HSTMT hstmt,
+RETCODE SQL_API SQLColAttributes(HSTMT hstmt,
 				 UWORD icol,
 				 UWORD fDescType,
 				 PTR rgbDesc,
@@ -157,7 +157,7 @@ extern		"C"
 				 SWORD FAR * pcbDesc,
 				 SDWORD FAR * pfDesc);
 
-	RETCODE SQL_API SQLConnect(HDBC hdbc,
+RETCODE SQL_API SQLConnect(HDBC hdbc,
 		   UCHAR FAR * szDSN,
 		   SWORD cbDSN,
 		   UCHAR FAR * szUID,
@@ -165,7 +165,7 @@ extern		"C"
 		   UCHAR FAR * szAuthStr,
 		   SWORD cbAuthStr);
 
-	RETCODE SQL_API SQLDescribeCol(HSTMT hstmt,
+RETCODE SQL_API SQLDescribeCol(HSTMT hstmt,
 			   UWORD icol,
 			   UCHAR FAR * szColName,
 			   SWORD cbColNameMax,
@@ -175,9 +175,9 @@ extern		"C"
 			   SWORD FAR * pibScale,
 			   SWORD FAR * pfNullable);
 
-	RETCODE SQL_API SQLDisconnect(HDBC hdbc);
+RETCODE SQL_API SQLDisconnect(HDBC hdbc);
 
-	RETCODE SQL_API SQLError(HENV henv,
+RETCODE SQL_API SQLError(HENV henv,
 		 HDBC hdbc,
 		 HSTMT hstmt,
 		 UCHAR FAR * szSqlState,
@@ -186,45 +186,45 @@ extern		"C"
 		 SWORD cbErrorMsgMax,
 		 SWORD FAR * pcbErrorMsg);
 
-	RETCODE SQL_API SQLExecDirect(HSTMT hstmt,
+RETCODE SQL_API SQLExecDirect(HSTMT hstmt,
 			  UCHAR FAR * szSqlStr,
 			  SDWORD cbSqlStr);
 
-	RETCODE SQL_API SQLExecute(HSTMT hstmt);
+RETCODE SQL_API SQLExecute(HSTMT hstmt);
 
-	RETCODE SQL_API SQLFetch(HSTMT hstmt);
+RETCODE SQL_API SQLFetch(HSTMT hstmt);
 
-	RETCODE SQL_API SQLFreeConnect(HDBC hdbc);
+RETCODE SQL_API SQLFreeConnect(HDBC hdbc);
 
-	RETCODE SQL_API SQLFreeEnv(HENV henv);
+RETCODE SQL_API SQLFreeEnv(HENV henv);
 
-	RETCODE SQL_API SQLFreeStmt(HSTMT hstmt,
+RETCODE SQL_API SQLFreeStmt(HSTMT hstmt,
 			UWORD fOption);
 
-	RETCODE SQL_API SQLGetCursorName(HSTMT hstmt,
+RETCODE SQL_API SQLGetCursorName(HSTMT hstmt,
 				 UCHAR FAR * szCursor,
 				 SWORD cbCursorMax,
 				 SWORD FAR * pcbCursor);
 
-	RETCODE SQL_API SQLNumResultCols(HSTMT hstmt,
+RETCODE SQL_API SQLNumResultCols(HSTMT hstmt,
 				 SWORD FAR * pccol);
 
-	RETCODE SQL_API SQLPrepare(HSTMT hstmt,
+RETCODE SQL_API SQLPrepare(HSTMT hstmt,
 		   UCHAR FAR * szSqlStr,
 		   SDWORD cbSqlStr);
 
-	RETCODE SQL_API SQLRowCount(HSTMT hstmt,
+RETCODE SQL_API SQLRowCount(HSTMT hstmt,
 			SDWORD FAR * pcrow);
 
-	RETCODE SQL_API SQLSetCursorName(HSTMT hstmt,
+RETCODE SQL_API SQLSetCursorName(HSTMT hstmt,
 				 UCHAR FAR * szCursor,
 				 SWORD cbCursor);
 
-	RETCODE SQL_API SQLTransact(HENV henv,
+RETCODE SQL_API SQLTransact(HENV henv,
 			HDBC hdbc,
 			UWORD fType);
 
-	RETCODE SQL_API SQLSetParam(HSTMT hstmt,
+RETCODE SQL_API SQLSetParam(HSTMT hstmt,
 			UWORD ipar,
 			SWORD fCType,
 			SWORD fSqlType,
@@ -233,7 +233,7 @@ extern		"C"
 			PTR rgbValue,
 			SDWORD FAR * pcbValue);
 
-	RETCODE SQL_API SQLDataSources(HENV henv,
+RETCODE SQL_API SQLDataSources(HENV henv,
 			   UWORD Direction, UCHAR FAR * ServerName,
 			   WORD BufferLength1, WORD *NameLength1,
 			   UCHAR FAR * Description, WORD BufferLength2,

src/interfaces/odbc/isqlext.h

@@ -1342,13 +1342,13 @@ extern		"C"
 {
 #endif
 
-	RETCODE SQL_API SQLSetConnectOption(HDBC, UWORD, UDWORD);
-	RETCODE SQL_API SQLNumResultCols(HSTMT, SWORD FAR *);
+RETCODE SQL_API SQLSetConnectOption(HDBC, UWORD, UDWORD);
+RETCODE SQL_API SQLNumResultCols(HSTMT, SWORD FAR *);
 
 /*
  *	 function prototypes previously missing from isqlext.h
  */
-	RETCODE SQL_API SQLColumns(HSTMT hstmt,
+RETCODE SQL_API SQLColumns(HSTMT hstmt,
 		   UCHAR FAR * szTableQualifier,
 		   SWORD cbTableQualifier,
 		   UCHAR FAR * szTableOwner,
@@ -1358,7 +1358,7 @@ extern		"C"
 		   UCHAR FAR * szColumnName,
 		   SWORD cbColumnName);
 
-	RETCODE SQL_API SQLDriverConnect(HDBC hdbc,
+RETCODE SQL_API SQLDriverConnect(HDBC hdbc,
 				 HWND hwnd,
 				 UCHAR FAR * szConnStrIn,
 				 SWORD cbConnStrIn,
@@ -1367,46 +1367,46 @@ extern		"C"
 				 SWORD FAR * pcbConnStrOut,
 				 UWORD fDriverCompletion);
 
-	RETCODE SQL_API SQLGetConnectOption(HDBC hdbc,
+RETCODE SQL_API SQLGetConnectOption(HDBC hdbc,
 					UWORD fOption,
 					PTR pvParam);
 
-	RETCODE SQL_API SQLGetData(HSTMT hstmt,
+RETCODE SQL_API SQLGetData(HSTMT hstmt,
 		   UWORD icol,
 		   SWORD fCType,
 		   PTR rgbValue,
 		   SDWORD cbValueMax,
 		   SDWORD FAR * pcbValue);
 
-	RETCODE SQL_API SQLGetFunctions(HDBC hdbc,
+RETCODE SQL_API SQLGetFunctions(HDBC hdbc,
 				UWORD fFunction,
 				UWORD FAR * pfExists);
 
-	RETCODE SQL_API SQLGetInfo(HDBC hdbc,
+RETCODE SQL_API SQLGetInfo(HDBC hdbc,
 		   UWORD fInfoType,
 		   PTR rgbInfoValue,
 		   SWORD cbInfoValueMax,
 		   SWORD FAR * pcbInfoValue);
 
-	RETCODE SQL_API SQLGetStmtOption(HSTMT hstmt,
+RETCODE SQL_API SQLGetStmtOption(HSTMT hstmt,
 				 UWORD fOption,
 				 PTR pvParam);
 
-	RETCODE SQL_API SQLGetTypeInfo(HSTMT hstmt,
+RETCODE SQL_API SQLGetTypeInfo(HSTMT hstmt,
 			   SWORD fSqlType);
 
-	RETCODE SQL_API SQLParamData(HSTMT hstmt,
+RETCODE SQL_API SQLParamData(HSTMT hstmt,
 			 PTR FAR * prgbValue);
 
-	RETCODE SQL_API SQLPutData(HSTMT hstmt,
+RETCODE SQL_API SQLPutData(HSTMT hstmt,
 		   PTR rgbValue,
 		   SDWORD cbValue);
 
-	RETCODE SQL_API SQLSetStmtOption(HSTMT hstmt,
+RETCODE SQL_API SQLSetStmtOption(HSTMT hstmt,
 				 UWORD fOption,
 				 UDWORD vParam);
 
-	RETCODE SQL_API SQLSpecialColumns(HSTMT hstmt,
+RETCODE SQL_API SQLSpecialColumns(HSTMT hstmt,
 				  UWORD fColType,
 				  UCHAR FAR * szTableQualifier,
 				  SWORD cbTableQualifier,
@@ -1417,7 +1417,7 @@ extern		"C"
 				  UWORD fScope,
 				  UWORD fNullable);
 
-	RETCODE SQL_API SQLStatistics(HSTMT hstmt,
+RETCODE SQL_API SQLStatistics(HSTMT hstmt,
 			  UCHAR FAR * szTableQualifier,
 			  SWORD cbTableQualifier,
 			  UCHAR FAR * szTableOwner,
@@ -1427,7 +1427,7 @@ extern		"C"
 			  UWORD fUnique,
 			  UWORD fAccuracy);
 
-	RETCODE SQL_API SQLTables(HSTMT hstmt,
+RETCODE SQL_API SQLTables(HSTMT hstmt,
 		  UCHAR FAR * szTableQualifier,
 		  SWORD cbTableQualifier,
 		  UCHAR FAR * szTableOwner,
@@ -1437,14 +1437,14 @@ extern		"C"
 		  UCHAR FAR * szTableType,
 		  SWORD cbTableType);
 
-	RETCODE SQL_API SQLBrowseConnect(HDBC hdbc,
+RETCODE SQL_API SQLBrowseConnect(HDBC hdbc,
 				 UCHAR FAR * szConnStrIn,
 				 SWORD cbConnStrIn,
 				 UCHAR FAR * szConnStrOut,
 				 SWORD cbConnStrOutMax,
 				 SWORD FAR * pcbConnStrOut);
 
-	RETCODE SQL_API SQLColumnPrivileges(HSTMT hstmt,
+RETCODE SQL_API SQLColumnPrivileges(HSTMT hstmt,
 					UCHAR FAR * szTableQualifier,
 					SWORD cbTableQualifier,
 					UCHAR FAR * szTableOwner,
@@ -1454,20 +1454,20 @@ extern		"C"
 					UCHAR FAR * szColumnName,
 					SWORD cbColumnName);
 
-	RETCODE SQL_API SQLDescribeParam(HSTMT hstmt,
+RETCODE SQL_API SQLDescribeParam(HSTMT hstmt,
 				 UWORD ipar,
 				 SWORD FAR * pfSqlType,
 				 UDWORD FAR * pcbColDef,
 				 SWORD FAR * pibScale,
 				 SWORD FAR * pfNullable);
 
-	RETCODE SQL_API SQLExtendedFetch(HSTMT hstmt,
+RETCODE SQL_API SQLExtendedFetch(HSTMT hstmt,
 				 UWORD fFetchType,
 				 SDWORD irow,
 				 UDWORD FAR * pcrow,
 				 UWORD FAR * rgfRowStatus);
 
-	RETCODE SQL_API SQLForeignKeys(HSTMT hstmt,
+RETCODE SQL_API SQLForeignKeys(HSTMT hstmt,
 			   UCHAR FAR * szPkTableQualifier,
 			   SWORD cbPkTableQualifier,
 			   UCHAR FAR * szPkTableOwner,
@@ -1481,23 +1481,23 @@ extern		"C"
 			   UCHAR FAR * szFkTableName,
 			   SWORD cbFkTableName);
 
-	RETCODE SQL_API SQLMoreResults(HSTMT hstmt);
+RETCODE SQL_API SQLMoreResults(HSTMT hstmt);
 
-	RETCODE SQL_API SQLNativeSql(HDBC hdbc,
+RETCODE SQL_API SQLNativeSql(HDBC hdbc,
 			 UCHAR FAR * szSqlStrIn,
 			 SDWORD cbSqlStrIn,
 			 UCHAR FAR * szSqlStr,
 			 SDWORD cbSqlStrMax,
 			 SDWORD FAR * pcbSqlStr);
 
-	RETCODE SQL_API SQLNumParams(HSTMT hstmt,
+RETCODE SQL_API SQLNumParams(HSTMT hstmt,
 			 SWORD FAR * pcpar);
 
-	RETCODE SQL_API SQLParamOptions(HSTMT hstmt,
+RETCODE SQL_API SQLParamOptions(HSTMT hstmt,
 				UDWORD crow,
 				UDWORD FAR * pirow);
 
-	RETCODE SQL_API SQLPrimaryKeys(HSTMT hstmt,
+RETCODE SQL_API SQLPrimaryKeys(HSTMT hstmt,
 			   UCHAR FAR * szTableQualifier,
 			   SWORD cbTableQualifier,
 			   UCHAR FAR * szTableOwner,
@@ -1505,7 +1505,7 @@ extern		"C"
 			   UCHAR FAR * szTableName,
 			   SWORD cbTableName);
 
-	RETCODE SQL_API SQLProcedureColumns(HSTMT hstmt,
+RETCODE SQL_API SQLProcedureColumns(HSTMT hstmt,
 					UCHAR FAR * szProcQualifier,
 					SWORD cbProcQualifier,
 					UCHAR FAR * szProcOwner,
@@ -1515,7 +1515,7 @@ extern		"C"
 					UCHAR FAR * szColumnName,
 					SWORD cbColumnName);
 
-	RETCODE SQL_API SQLProcedures(HSTMT hstmt,
+RETCODE SQL_API SQLProcedures(HSTMT hstmt,
 			  UCHAR FAR * szProcQualifier,
 			  SWORD cbProcQualifier,
 			  UCHAR FAR * szProcOwner,
@@ -1523,12 +1523,12 @@ extern		"C"
 			  UCHAR FAR * szProcName,
 			  SWORD cbProcName);
 
-	RETCODE SQL_API SQLSetPos(HSTMT hstmt,
+RETCODE SQL_API SQLSetPos(HSTMT hstmt,
 		  UWORD irow,
 		  UWORD fOption,
 		  UWORD fLock);
 
-	RETCODE SQL_API SQLTablePrivileges(HSTMT hstmt,
+RETCODE SQL_API SQLTablePrivileges(HSTMT hstmt,
 				   UCHAR FAR * szTableQualifier,
 				   SWORD cbTableQualifier,
 				   UCHAR FAR * szTableOwner,
@@ -1536,7 +1536,7 @@ extern		"C"
 				   UCHAR FAR * szTableName,
 				   SWORD cbTableName);
 
-	RETCODE SQL_API SQLBindParameter(HSTMT hstmt,
+RETCODE SQL_API SQLBindParameter(HSTMT hstmt,
 				 UWORD ipar,
 				 SWORD fParamType,
 				 SWORD fCType,
@@ -1547,7 +1547,7 @@ extern		"C"
 				 SDWORD cbValueMax,
 				 SDWORD FAR * pcbValue);
 
-	RETCODE SQL_API SQLSetScrollOptions(HSTMT hstmt,
+RETCODE SQL_API SQLSetScrollOptions(HSTMT hstmt,
 					UWORD fConcurrency,
 					SDWORD crowKeyset,
 					UWORD crowRowset);

src/pl/plpgsql/src/pl_exec.c

@@ -3,7 +3,7 @@
  *			  procedural language
  *
  * 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.
  *
@@ -419,6 +419,7 @@ plpgsql_exec_function(PLpgSQL_function * func, FunctionCallInfo fcinfo)
 											func->fn_rettypelem,
 											-1,
 											&fcinfo->isnull);
+
 			/*
 			 * If the functions return type isn't by value, copy the value
 			 * into upper executor memory context.