mirror of
https://github.com/postgres/postgres.git
synced 2025-08-31 17:02:12 +03:00
New pgindent run with fixes suggested by Tom. Patch manually reviewed,
initdb/regression tests pass.
This commit is contained in:
@@ -32,7 +32,7 @@ typedef struct
|
||||
{
|
||||
char *name; /* the symbols's name */
|
||||
void *addr; /* its relocated virtual address */
|
||||
} Export, *ExportPtr;
|
||||
} Export, *ExportPtr;
|
||||
|
||||
/*
|
||||
* xlC uses the following structure to list its constructors and
|
||||
@@ -42,7 +42,7 @@ typedef struct
|
||||
{
|
||||
void (*init) (void); /* call static constructors */
|
||||
void (*term) (void); /* call static destructors */
|
||||
} Cdtor, *CdtorPtr;
|
||||
} Cdtor, *CdtorPtr;
|
||||
|
||||
/*
|
||||
* The void * handle returned from dlopen is actually a ModulePtr.
|
||||
@@ -57,7 +57,7 @@ typedef struct Module
|
||||
CdtorPtr cdtors; /* optional C++ constructors */
|
||||
int nExports; /* the number of exports found */
|
||||
ExportPtr exports; /* the array of exports */
|
||||
} Module, *ModulePtr;
|
||||
} Module, *ModulePtr;
|
||||
|
||||
/*
|
||||
* We keep a list of all loaded modules to be able to call the fini
|
||||
@@ -608,4 +608,4 @@ findMain(void)
|
||||
return ret;
|
||||
}
|
||||
|
||||
#endif /* HAVE_DLOPEN */
|
||||
#endif /* HAVE_DLOPEN */
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* $Id: aix.h,v 1.8 2001/10/28 06:25:47 momjian Exp $
|
||||
* $Id: aix.h,v 1.9 2001/11/05 17:46:27 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
|
||||
@@ -53,7 +53,7 @@ extern "C"
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
#endif /* HAVE_DLOPEN */
|
||||
#endif /* HAVE_DLOPEN */
|
||||
|
||||
#include "utils/dynamic_loader.h"
|
||||
|
||||
@@ -62,4 +62,4 @@ extern "C"
|
||||
#define pg_dlclose dlclose
|
||||
#define pg_dlerror dlerror
|
||||
|
||||
#endif /* PORT_PROTOS_H */
|
||||
#endif /* PORT_PROTOS_H */
|
||||
|
@@ -7,11 +7,11 @@
|
||||
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
|
||||
* Portions Copyright (c) 1994, Regents of the University of California
|
||||
*
|
||||
* $Id: beos.h,v 1.5 2001/10/25 05:49:40 momjian Exp $
|
||||
* $Id: beos.h,v 1.6 2001/11/05 17:46:27 momjian Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
#ifndef PORT_PROTOS_H
|
||||
#define PORT_PROTOS_H
|
||||
|
||||
#endif /* PORT_PROTOS_H */
|
||||
#endif /* PORT_PROTOS_H */
|
||||
|
@@ -11,7 +11,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/backend/port/dynloader/bsdi.c,v 1.17 2001/10/28 06:25:47 momjian Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/port/dynloader/bsdi.c,v 1.18 2001/11/05 17:46:27 momjian Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@@ -95,4 +95,4 @@ pg_dlerror()
|
||||
return dld_strerror(dld_errno);
|
||||
}
|
||||
|
||||
#endif /* not HAVE_DLOPEN */
|
||||
#endif /* not HAVE_DLOPEN */
|
||||
|
@@ -32,6 +32,6 @@ do { \
|
||||
dld_unlink_by_file(handle, 1); \
|
||||
free(handle); \
|
||||
} while (0)
|
||||
#endif /* not HAVE_DLOPEN */
|
||||
#endif /* not HAVE_DLOPEN */
|
||||
|
||||
#endif /* PORT_PROTOS_H */
|
||||
#endif /* PORT_PROTOS_H */
|
||||
|
@@ -5,7 +5,7 @@
|
||||
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
|
||||
* Portions Copyright (c) 1994, Regents of the University of California
|
||||
*
|
||||
* $Id: dgux.h,v 1.12 2001/10/28 06:25:47 momjian Exp $
|
||||
* $Id: dgux.h,v 1.13 2001/11/05 17:46:27 momjian Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@@ -28,4 +28,4 @@
|
||||
#define pg_dlclose dlclose
|
||||
#define pg_dlerror dlerror
|
||||
|
||||
#endif /* PORT_PROTOS_H */
|
||||
#endif /* PORT_PROTOS_H */
|
||||
|
@@ -34,7 +34,7 @@
|
||||
|
||||
#if defined(LIBC_SCCS) && !defined(lint)
|
||||
static char sccsid[] = "@(#)dl.c 5.4 (Berkeley) 2/23/91";
|
||||
#endif /* LIBC_SCCS and not lint */
|
||||
#endif /* LIBC_SCCS and not lint */
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <nlist.h>
|
||||
@@ -82,6 +82,7 @@ BSD44_derived_dlsym(void *handle, const char *name)
|
||||
return NULL;
|
||||
#else
|
||||
void *vp;
|
||||
|
||||
#ifndef __ELF__
|
||||
char buf[BUFSIZ];
|
||||
|
||||
|
@@ -7,7 +7,7 @@
|
||||
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
|
||||
* Portions Copyright (c) 1994, Regents of the University of California
|
||||
*
|
||||
* $Id: freebsd.h,v 1.12 2001/10/28 06:25:47 momjian Exp $
|
||||
* $Id: freebsd.h,v 1.13 2001/11/05 17:46:27 momjian Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@@ -44,4 +44,4 @@ void *BSD44_derived_dlopen(const char *filename, int num);
|
||||
void *BSD44_derived_dlsym(void *handle, const char *name);
|
||||
void BSD44_derived_dlclose(void *handle);
|
||||
|
||||
#endif /* PORT_PROTOS_H */
|
||||
#endif /* PORT_PROTOS_H */
|
||||
|
@@ -31,4 +31,4 @@
|
||||
#define pg_dlclose dlclose
|
||||
#define pg_dlerror dlerror
|
||||
|
||||
#endif /* PORT_PROTOS_H */
|
||||
#endif /* PORT_PROTOS_H */
|
||||
|
@@ -6,7 +6,7 @@
|
||||
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
|
||||
* Portions Copyright (c) 1994, Regents of the University of California
|
||||
*
|
||||
* $Id: linux.h,v 1.15 2001/10/28 06:25:47 momjian Exp $
|
||||
* $Id: linux.h,v 1.16 2001/11/05 17:46:27 momjian Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@@ -39,6 +39,6 @@ do { \
|
||||
#define pg_dlsym dlsym
|
||||
#define pg_dlclose dlclose
|
||||
#define pg_dlerror dlerror
|
||||
#endif /* HAVE_DLOPEN */
|
||||
#endif /* HAVE_DLOPEN */
|
||||
|
||||
#endif /* PORT_PROTOS_H */
|
||||
#endif /* PORT_PROTOS_H */
|
||||
|
@@ -34,7 +34,7 @@
|
||||
|
||||
#if defined(LIBC_SCCS) && !defined(lint)
|
||||
static char sccsid[] = "@(#)dl.c 5.4 (Berkeley) 2/23/91";
|
||||
#endif /* LIBC_SCCS and not lint */
|
||||
#endif /* LIBC_SCCS and not lint */
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <nlist.h>
|
||||
|
@@ -7,7 +7,7 @@
|
||||
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
|
||||
* Portions Copyright (c) 1994, Regents of the University of California
|
||||
*
|
||||
* $Id: netbsd.h,v 1.7 2001/10/28 06:25:47 momjian Exp $
|
||||
* $Id: netbsd.h,v 1.8 2001/11/05 17:46:27 momjian Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@@ -44,4 +44,4 @@ void *BSD44_derived_dlopen(const char *filename, int num);
|
||||
void *BSD44_derived_dlsym(void *handle, const char *name);
|
||||
void BSD44_derived_dlclose(void *handle);
|
||||
|
||||
#endif /* PORT_PROTOS_H */
|
||||
#endif /* PORT_PROTOS_H */
|
||||
|
@@ -23,4 +23,4 @@ char *next_dlerror(void);
|
||||
|
||||
/* port.c */
|
||||
|
||||
#endif /* PORT_PROTOS_H */
|
||||
#endif /* PORT_PROTOS_H */
|
||||
|
@@ -34,7 +34,7 @@
|
||||
|
||||
#if defined(LIBC_SCCS) && !defined(lint)
|
||||
static char sccsid[] = "@(#)dl.c 5.4 (Berkeley) 2/23/91";
|
||||
#endif /* LIBC_SCCS and not lint */
|
||||
#endif /* LIBC_SCCS and not lint */
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <nlist.h>
|
||||
|
@@ -5,7 +5,7 @@
|
||||
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
|
||||
* Portions Copyright (c) 1994, Regents of the University of California
|
||||
*
|
||||
* $Id: openbsd.h,v 1.8 2001/10/28 06:25:47 momjian Exp $
|
||||
* $Id: openbsd.h,v 1.9 2001/11/05 17:46:27 momjian Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@@ -42,4 +42,4 @@ void *BSD44_derived_dlopen(const char *filename, int num);
|
||||
void *BSD44_derived_dlsym(void *handle, const char *name);
|
||||
void BSD44_derived_dlclose(void *handle);
|
||||
|
||||
#endif /* PORT_PROTOS_H */
|
||||
#endif /* PORT_PROTOS_H */
|
||||
|
@@ -7,7 +7,7 @@
|
||||
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
|
||||
* Portions Copyright (c) 1994, Regents of the University of California
|
||||
*
|
||||
* $Id: osf.h,v 1.5 2001/10/28 06:25:47 momjian Exp $
|
||||
* $Id: osf.h,v 1.6 2001/11/05 17:46:27 momjian Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@@ -33,4 +33,4 @@
|
||||
#define pg_dlclose(h) dlclose(h)
|
||||
#define pg_dlerror() dlerror()
|
||||
|
||||
#endif /* PORT_PROTOS_H */
|
||||
#endif /* PORT_PROTOS_H */
|
||||
|
@@ -7,7 +7,7 @@
|
||||
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
|
||||
* Portions Copyright (c) 1994, Regents of the University of California
|
||||
*
|
||||
* $Id: sco.h,v 1.10 2001/10/28 06:25:47 momjian Exp $
|
||||
* $Id: sco.h,v 1.11 2001/11/05 17:46:27 momjian Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@@ -33,4 +33,4 @@
|
||||
|
||||
/* port.c */
|
||||
|
||||
#endif /* PORT_PROTOS_H */
|
||||
#endif /* PORT_PROTOS_H */
|
||||
|
@@ -1,4 +1,4 @@
|
||||
/* $Header: /cvsroot/pgsql/src/backend/port/dynloader/solaris.h,v 1.6 2001/10/28 06:25:47 momjian Exp $ */
|
||||
/* $Header: /cvsroot/pgsql/src/backend/port/dynloader/solaris.h,v 1.7 2001/11/05 17:46:27 momjian Exp $ */
|
||||
|
||||
#ifndef DYNLOADER_SOLARIS_H
|
||||
#define DYNLOADER_SOLARIS_H
|
||||
@@ -11,4 +11,4 @@
|
||||
#define pg_dlclose dlclose
|
||||
#define pg_dlerror dlerror
|
||||
|
||||
#endif /* DYNLOADER_SOLARIS_H */
|
||||
#endif /* DYNLOADER_SOLARIS_H */
|
||||
|
@@ -7,7 +7,7 @@
|
||||
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
|
||||
* Portions Copyright (c) 1994, Regents of the University of California
|
||||
*
|
||||
* $Id: sunos4.h,v 1.10 2001/10/28 06:25:47 momjian Exp $
|
||||
* $Id: sunos4.h,v 1.11 2001/11/05 17:46:27 momjian Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@@ -31,4 +31,4 @@
|
||||
#define pg_dlclose dlclose
|
||||
#define pg_dlerror dlerror
|
||||
|
||||
#endif /* PORT_PROTOS_H */
|
||||
#endif /* PORT_PROTOS_H */
|
||||
|
@@ -7,7 +7,7 @@
|
||||
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
|
||||
* Portions Copyright (c) 1994, Regents of the University of California
|
||||
*
|
||||
* $Id: svr4.h,v 1.10 2001/10/28 06:25:47 momjian Exp $
|
||||
* $Id: svr4.h,v 1.11 2001/11/05 17:46:27 momjian Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@@ -31,4 +31,4 @@
|
||||
#define pg_dlclose dlclose
|
||||
#define pg_dlerror dlerror
|
||||
|
||||
#endif /* DYNLOADER_H */
|
||||
#endif /* DYNLOADER_H */
|
||||
|
@@ -7,7 +7,7 @@
|
||||
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
|
||||
* Portions Copyright (c) 1994, Regents of the University of California
|
||||
*
|
||||
* $Id: ultrix4.h,v 1.9 2001/10/28 06:25:47 momjian Exp $
|
||||
* $Id: ultrix4.h,v 1.10 2001/11/05 17:46:27 momjian Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@@ -51,20 +51,20 @@ typedef struct ScnInfo
|
||||
CoreAddr addr; /* starting address of the section */
|
||||
SCNHDR hdr; /* section header */
|
||||
RELOC *relocEntries; /* relocation entries */
|
||||
} ScnInfo;
|
||||
} ScnInfo;
|
||||
|
||||
typedef enum
|
||||
{
|
||||
DL_NEEDRELOC, /* still need relocation */
|
||||
DL_RELOCATED, /* no relocation necessary */
|
||||
DL_INPROG /* relocation in progress */
|
||||
} dlRStatus;
|
||||
} dlRStatus;
|
||||
|
||||
typedef struct JmpTbl
|
||||
{
|
||||
char *block; /* the jump table memory block */
|
||||
struct JmpTbl *next; /* next block */
|
||||
} JmpTbl;
|
||||
} JmpTbl;
|
||||
|
||||
typedef struct dlFile
|
||||
{
|
||||
@@ -94,14 +94,14 @@ typedef struct dlFile
|
||||
JmpTbl *jmptable; /* the jump table for R_JMPADDR */
|
||||
|
||||
struct dlFile *next; /* next member of the archive */
|
||||
} dlFile;
|
||||
} dlFile;
|
||||
|
||||
typedef struct dlSymbol
|
||||
{
|
||||
char *name; /* name of the symbol */
|
||||
long addr; /* address of the symbol */
|
||||
dlFile *objFile; /* from which file */
|
||||
} dlSymbol;
|
||||
} dlSymbol;
|
||||
|
||||
/*
|
||||
* prototypes for the dl* interface
|
||||
@@ -121,4 +121,4 @@ extern char **dl_undefinedSymbols( /* int *count */ );
|
||||
extern void dl_printAllSymbols( /* void *handle */ );
|
||||
extern void dl_setLibraries( /* char *libs */ );
|
||||
|
||||
#endif /* _DL_HEADER_ */
|
||||
#endif /* _DL_HEADER_ */
|
||||
|
@@ -31,4 +31,4 @@
|
||||
#define pg_dlclose dlclose
|
||||
#define pg_dlerror dlerror
|
||||
|
||||
#endif /* PORT_PROTOS_H */
|
||||
#endif /* PORT_PROTOS_H */
|
||||
|
@@ -31,4 +31,4 @@
|
||||
#define pg_dlclose dlclose
|
||||
#define pg_dlerror dlerror
|
||||
|
||||
#endif /* PORT_PROTOS_H */
|
||||
#endif /* PORT_PROTOS_H */
|
||||
|
@@ -31,4 +31,4 @@
|
||||
#define pg_dlclose dlclose
|
||||
#define pg_dlerror dlerror
|
||||
|
||||
#endif /* PORT_PROTOS_H */
|
||||
#endif /* PORT_PROTOS_H */
|
||||
|
Reference in New Issue
Block a user