database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-18 02:02:55 +03:00
Code Activity

Another PGINDENT run that changes variable indenting and case label indenting. Also static variable indenting.

Browse Source
This commit is contained in:
Bruce Momjian
1997-09-08 02:41:22 +00:00
parent a90f12fd9d
commit 319dbfa736
632 changed files with 28301 additions and 28220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/backend/utils/mmgr/aset.c
View File

@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/mmgr/aset.c,v 1.6 1997/09/07 04:54:01 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/mmgr/aset.c,v 1.7 1997/09/08 02:32:05 momjian Exp $
*
* NOTE
* XXX This is a preliminary implementation which lacks fail-fast
@@ -25,7 +25,7 @@
#include <string.h>
#endif
static void AllocPointerDump(AllocPointer pointer);
static void AllocPointerDump(AllocPointer pointer);
static int
AllocSetIterate(AllocSet set,
void (*function) (AllocPointer pointer));
@@ -45,8 +45,8 @@ AllocSetIterate(AllocSet set,
typedef struct AllocElemData
{
OrderedElemData elemData; /* elem in AllocSet */
Size size;
} AllocElemData;
Size size;
} AllocElemData;
typedef AllocElemData *AllocElem;
@@ -125,7 +125,7 @@ AllocSetInit(AllocSet set, AllocMode mode, Size limit)
void
AllocSetReset(AllocSet set)
{
AllocPointer pointer;
AllocPointer pointer;
AssertArg(AllocSetIsValid(set));
@@ -139,7 +139,7 @@ AllocSetReset(AllocSet set)
void
AllocSetReset_debug(char *file, int line, AllocSet set)
{
AllocPointer pointer;
AllocPointer pointer;
AssertArg(AllocSetIsValid(set));
@@ -181,7 +181,7 @@ AllocSetContains(AllocSet set, AllocPointer pointer)
AllocPointer
AllocSetAlloc(AllocSet set, Size size)
{
AllocElem alloc;
AllocElem alloc;
AssertArg(AllocSetIsValid(set));
@@ -214,7 +214,7 @@ AllocSetAlloc(AllocSet set, Size size)
void
AllocSetFree(AllocSet set, AllocPointer pointer)
{
AllocElem alloc;
AllocElem alloc;
/* AssertArg(AllocSetIsValid(set)); */
/* AssertArg(AllocPointerIsValid(pointer)); */
@@ -244,8 +244,8 @@ AllocSetFree(AllocSet set, AllocPointer pointer)
AllocPointer
AllocSetRealloc(AllocSet set, AllocPointer pointer, Size size)
{
AllocPointer newPointer;
AllocElem alloc;
AllocPointer newPointer;
AllocElem alloc;
/* AssertArg(AllocSetIsValid(set)); */
/* AssertArg(AllocPointerIsValid(pointer)); */
@@ -287,8 +287,8 @@ static int
AllocSetIterate(AllocSet set,
void (*function) (AllocPointer pointer))
{
int count = 0;
AllocPointer pointer;
int count = 0;
AllocPointer pointer;
AssertArg(AllocSetIsValid(set));
@@ -311,8 +311,8 @@ AllocSetIterate(AllocSet set,
int
AllocSetCount(AllocSet set)
{
int count = 0;
AllocPointer pointer;
int count = 0;
AllocPointer pointer;
AssertArg(AllocSetIsValid(set));
@@ -338,10 +338,10 @@ AllocSetCount(AllocSet set)
* Note:
* Assumes set is valid.
*/
static AllocPointer
static AllocPointer
AllocSetGetFirst(AllocSet set)
{
AllocElem alloc;
AllocElem alloc;
alloc = (AllocElem) OrderedSetGetHead(&set->setData);
@@ -360,10 +360,10 @@ AllocSetGetFirst(AllocSet set)
* Note:
* Assumes pointer is valid.
*/
static AllocPointer
static AllocPointer
AllocPointerGetNext(AllocPointer pointer)
{
AllocElem alloc;
AllocElem alloc;
alloc = (AllocElem)
OrderedElemGetSuccessor(&AllocPointerGetAllocElem(pointer)->elemData);
@@ -398,7 +398,7 @@ AllocPointerDump(AllocPointer pointer)
void
AllocSetDump(AllocSet set)
{
int count;
int count;
count = AllocSetIterate(set, AllocPointerDump);
printf("\ttotal %d allocations\n", count);

40
src/backend/utils/mmgr/mcxt.c
View File

@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/mmgr/mcxt.c,v 1.4 1997/09/07 04:54:08 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/mmgr/mcxt.c,v 1.5 1997/09/08 02:32:10 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -35,7 +35,7 @@
/*
* Global State
*/
static int MemoryContextEnableCount = 0;
static int MemoryContextEnableCount = 0;
#define MemoryContextEnabled (MemoryContextEnableCount > 0)
@@ -67,22 +67,22 @@ static OrderedSetData ActiveGlobalMemorySetData; /* uninitialized */
* CurrentMemoryContext --
* Memory context for general global allocations.
*/
MemoryContext CurrentMemoryContext = NULL;
MemoryContext CurrentMemoryContext = NULL;
/*****************************************************************************
* PRIVATE DEFINITIONS *
*****************************************************************************/
static Pointer GlobalMemoryAlloc(GlobalMemory this, Size size);
static void GlobalMemoryFree(GlobalMemory this, Pointer pointer);
static Pointer GlobalMemoryAlloc(GlobalMemory this, Size size);
static void GlobalMemoryFree(GlobalMemory this, Pointer pointer);
static Pointer
GlobalMemoryRealloc(GlobalMemory this, Pointer pointer,
Size size);
static char *GlobalMemoryGetName(GlobalMemory this);
static void GlobalMemoryDump(GlobalMemory this);
static char *GlobalMemoryGetName(GlobalMemory this);
static void GlobalMemoryDump(GlobalMemory this);
#ifdef NOT_USED
static void DumpGlobalMemories(void);
static void DumpGlobalMemories(void);
#endif
@@ -121,7 +121,7 @@ static struct GlobalMemory TopGlobalMemoryData = {
* allocate something here, you are expected to clean it up when
* appropriate.
*/
MemoryContext TopMemoryContext = (MemoryContext) & TopGlobalMemoryData;
MemoryContext TopMemoryContext = (MemoryContext) & TopGlobalMemoryData;
@@ -145,7 +145,7 @@ MemoryContext TopMemoryContext = (MemoryContext) & TopGlobalMemoryData;
void
EnableMemoryContext(bool on)
{
static bool processing = false;
static bool processing = false;
AssertState(!processing);
AssertArg(BoolIsValid(on));
@@ -175,7 +175,7 @@ EnableMemoryContext(bool on)
}
else
{ /* cleanup */
GlobalMemory context;
GlobalMemory context;
/* walk the list of allocations */
while (PointerIsValid(context = (GlobalMemory)
@@ -293,7 +293,7 @@ MemoryContextRealloc(MemoryContext context,
* BadArgumentsErr if firstTime is true for subsequent calls.
*/
#ifdef NOT_USED
char *
char *
MemoryContextGetName(MemoryContext context)
{
AssertState(MemoryContextEnabled);
@@ -341,7 +341,7 @@ PointerGetAllocSize(Pointer pointer)
MemoryContext
MemoryContextSwitchTo(MemoryContext context)
{
MemoryContext old;
MemoryContext old;
AssertState(MemoryContextEnabled);
AssertArg(MemoryContextIsValid(context));
@@ -369,8 +369,8 @@ MemoryContextSwitchTo(MemoryContext context)
GlobalMemory
CreateGlobalMemory(char *name) /* XXX MemoryContextName */
{
GlobalMemory context;
MemoryContext savecxt;
GlobalMemory context;
MemoryContext savecxt;
AssertState(MemoryContextEnabled);
@@ -423,7 +423,7 @@ GlobalMemoryDestroy(GlobalMemory context)
* Exceptions:
* ExhaustedMemory if allocation fails.
*/
static Pointer
static Pointer
GlobalMemoryAlloc(GlobalMemory this, Size size)
{
return (AllocSetAlloc(&this->setData, size));
@@ -456,7 +456,7 @@ GlobalMemoryFree(GlobalMemory this,
* BadArgumentsErr if pointer is invalid.
* NoMoreMemoryErr if allocation fails.
*/
static Pointer
static Pointer
GlobalMemoryRealloc(GlobalMemory this,
Pointer pointer,
Size size)
@@ -471,7 +471,7 @@ GlobalMemoryRealloc(GlobalMemory this,
* Exceptions:
* ???
*/
static char *
static char *
GlobalMemoryGetName(GlobalMemory this)
{
return (this->name);
@@ -487,7 +487,7 @@ GlobalMemoryGetName(GlobalMemory this)
static void
GlobalMemoryDump(GlobalMemory this)
{
GlobalMemory context;
GlobalMemory context;
printf("--\n%s:\n", GlobalMemoryGetName(this));
@@ -517,7 +517,7 @@ GlobalMemoryDump(GlobalMemory this)
static void
DumpGlobalMemories()
{
GlobalMemory context;
GlobalMemory context;
context = (GlobalMemory) OrderedSetGetHead(&ActiveGlobalMemorySetData);

10
src/backend/utils/mmgr/oset.c
View File

@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/mmgr/Attic/oset.c,v 1.4 1997/09/07 04:54:11 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/mmgr/Attic/oset.c,v 1.5 1997/09/08 02:32:14 momjian Exp $
*
* NOTE
* XXX This is a preliminary implementation which lacks fail-fast
@@ -19,15 +19,15 @@
#include "utils/memutils.h" /* where declarations of this file goes */
static Pointer OrderedElemGetBase(OrderedElem elem);
static void OrderedElemPush(OrderedElem elem);
static void OrderedElemPushHead(OrderedElem elem);
static Pointer OrderedElemGetBase(OrderedElem elem);
static void OrderedElemPush(OrderedElem elem);
static void OrderedElemPushHead(OrderedElem elem);
/*
* OrderedElemGetBase --
* Returns base of enclosing structure.
*/
static Pointer
static Pointer
OrderedElemGetBase(OrderedElem elem)
{
if (elem == (OrderedElem) NULL)

10
src/backend/utils/mmgr/palloc.c
View File

@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/mmgr/Attic/palloc.c,v 1.4 1997/09/07 04:54:12 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/mmgr/Attic/palloc.c,v 1.5 1997/09/08 02:32:17 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -60,7 +60,7 @@
* NonallocatedPointer if pointer was not returned by palloc or repalloc
* or may have been subsequently freed.
*/
void *
void *
palloc(Size size)
{
#ifdef PALLOC_IS_MALLOC
@@ -94,7 +94,7 @@ pfree(void *pointer)
* NonallocatedPointer if pointer was not returned by palloc or repalloc
* or may have been freed already.
*/
void *
void *
repalloc(void *pointer, Size size)
{
#ifdef PALLOC_IS_MALLOC
@@ -107,10 +107,10 @@ repalloc(void *pointer, Size size)
/* pstrdup
allocates space for and copies a string
just like strdup except it uses palloc instead of malloc */
char *
char *
pstrdup(char *string)
{
char *nstr;
char *nstr;
nstr = (char *) palloc(strlen(string) + 1);
strcpy(nstr, string);

80
src/backend/utils/mmgr/portalmem.c
View File

@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/mmgr/portalmem.c,v 1.6 1997/09/07 04:54:13 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/mmgr/portalmem.c,v 1.7 1997/09/08 02:32:19 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -91,11 +91,11 @@
#include "utils/portal.h"
static void CollectNamedPortals(Portal * portalP, int destroy);
static Portal PortalHeapMemoryGetPortal(PortalHeapMemory context);
static void CollectNamedPortals(Portal * portalP, int destroy);
static Portal PortalHeapMemoryGetPortal(PortalHeapMemory context);
static PortalVariableMemory PortalHeapMemoryGetVariableMemory(PortalHeapMemory context);
static void PortalResetHeapMemory(Portal portal);
static Portal PortalVariableMemoryGetPortal(PortalVariableMemory context);
static void PortalResetHeapMemory(Portal portal);
static Portal PortalVariableMemoryGetPortal(PortalVariableMemory context);
/* ----------------
* ALLOCFREE_ERROR_ABORT
@@ -110,19 +110,19 @@ static Portal PortalVariableMemoryGetPortal(PortalVariableMemory context);
* ----------------
*/
static int PortalManagerEnableCount = 0;
static int PortalManagerEnableCount = 0;
#define MAX_PORTALNAME_LEN 64 /* XXX LONGALIGNable value */
typedef struct portalhashent
{
char portalname[MAX_PORTALNAME_LEN];
Portal portal;
} PortalHashEnt;
char portalname[MAX_PORTALNAME_LEN];
Portal portal;
} PortalHashEnt;
#define PortalManagerEnabled (PortalManagerEnableCount >= 1)
static HTAB *PortalHashTable = NULL;
static HTAB *PortalHashTable = NULL;
#define PortalHashTableLookup(NAME, PORTAL) \
{ PortalHashEnt *hentry; bool found; char key[MAX_PORTALNAME_LEN]; \
@@ -162,9 +162,9 @@ static HTAB *PortalHashTable = NULL;
}
static GlobalMemory PortalMemory = NULL;
static char PortalMemoryName[] = "Portal";
static char PortalMemoryName[] = "Portal";
static Portal BlankPortal = NULL;
static Portal BlankPortal = NULL;
/* ----------------
* Internal class definitions
@@ -172,9 +172,9 @@ static Portal BlankPortal = NULL;
*/
typedef struct HeapMemoryBlockData
{
AllocSetData setData;
FixedItemData itemData;
} HeapMemoryBlockData;
AllocSetData setData;
FixedItemData itemData;
} HeapMemoryBlockData;
typedef HeapMemoryBlockData *HeapMemoryBlock;
@@ -189,7 +189,7 @@ typedef HeapMemoryBlockData *HeapMemoryBlock;
* PortalVariableMemoryAlloc
* ----------------
*/
static Pointer
static Pointer
PortalVariableMemoryAlloc(PortalVariableMemory this,
Size size)
{
@@ -211,7 +211,7 @@ PortalVariableMemoryFree(PortalVariableMemory this,
* PortalVariableMemoryRealloc
* ----------------
*/
static Pointer
static Pointer
PortalVariableMemoryRealloc(PortalVariableMemory this,
Pointer pointer,
Size size)
@@ -223,7 +223,7 @@ PortalVariableMemoryRealloc(PortalVariableMemory this,
* PortalVariableMemoryGetName
* ----------------
*/
static char *
static char *
PortalVariableMemoryGetName(PortalVariableMemory this)
{
return (form("%s-var", PortalVariableMemoryGetPortal(this)->name));
@@ -245,7 +245,7 @@ PortalVariableMemoryDump(PortalVariableMemory this)
* PortalHeapMemoryAlloc
* ----------------
*/
static Pointer
static Pointer
PortalHeapMemoryAlloc(PortalHeapMemory this,
Size size)
{
@@ -285,7 +285,7 @@ PortalHeapMemoryFree(PortalHeapMemory this,
* PortalHeapMemoryRealloc
* ----------------
*/
static Pointer
static Pointer
PortalHeapMemoryRealloc(PortalHeapMemory this,
Pointer pointer,
Size size)
@@ -301,7 +301,7 @@ PortalHeapMemoryRealloc(PortalHeapMemory this,
* PortalHeapMemoryGetName
* ----------------
*/
static char *
static char *
PortalHeapMemoryGetName(PortalHeapMemory this)
{
return (form("%s-heap", PortalHeapMemoryGetPortal(this)->name));
@@ -366,7 +366,7 @@ static struct MemoryContextMethodsData PortalHeapContextMethodsData = {
static void
CreateNewBlankPortal()
{
Portal portal;
Portal portal;
AssertState(!PortalIsValid(BlankPortal));
@@ -428,16 +428,16 @@ PortalNameIsSpecial(char *pname)
static void
CollectNamedPortals(Portal * portalP, int destroy)
{
static Portal *portalList = (Portal *) NULL;
static int listIndex = 0;
static int maxIndex = 9;
static Portal *portalList = (Portal *) NULL;
static int listIndex = 0;
static int maxIndex = 9;
if (portalList == (Portal *) NULL)
portalList = (Portal *) malloc(10 * sizeof(Portal));
if (destroy != 0)
{
int i;
int i;
for (i = 0; i < listIndex; i++)
PortalDestroy(&portalList[i]);
@@ -515,8 +515,8 @@ DumpPortals()
void
EnablePortalManager(bool on)
{
static bool processing = false;
HASHCTL ctl;
static bool processing = false;
HASHCTL ctl;
AssertState(!processing);
AssertArg(BoolIsValid(on));
@@ -581,7 +581,7 @@ EnablePortalManager(bool on)
Portal
GetPortalByName(char *name)
{
Portal portal;
Portal portal;
AssertState(PortalManagerEnabled);
@@ -615,8 +615,8 @@ GetPortalByName(char *name)
Portal
BlankPortalAssignName(char *name) /* XXX PortalName */
{
Portal portal;
uint16 length;
Portal portal;
uint16 length;
AssertState(PortalManagerEnabled);
AssertState(PortalIsValid(BlankPortal));
@@ -687,7 +687,7 @@ PortalSetQuery(Portal portal,
* BadState if called when disabled.
* BadArg if portal is invalid.
*/
QueryDesc *
QueryDesc *
PortalGetQueryDesc(Portal portal)
{
AssertState(PortalManagerEnabled);
@@ -704,7 +704,7 @@ PortalGetQueryDesc(Portal portal)
* BadState if called when disabled.
* BadArg if portal is invalid.
*/
EState *
EState *
PortalGetState(Portal portal)
{
AssertState(PortalManagerEnabled);
@@ -729,8 +729,8 @@ PortalGetState(Portal portal)
Portal
CreatePortal(char *name) /* XXX PortalName */
{
Portal portal;
uint16 length;
Portal portal;
uint16 length;
AssertState(PortalManagerEnabled);
AssertArg(PointerIsValid(name)); /* XXX PortalName */
@@ -788,7 +788,7 @@ CreatePortal(char *name) /* XXX PortalName */
void
PortalDestroy(Portal * portalP)
{
Portal portal = *portalP;
Portal portal = *portalP;
AssertState(PortalManagerEnabled);
AssertArg(PortalIsValid(portal));
@@ -828,7 +828,7 @@ static void
PortalResetHeapMemory(Portal portal)
{
PortalHeapMemory context;
MemoryContext currentContext;
MemoryContext currentContext;
context = PortalGetHeapMemory(portal);
@@ -955,7 +955,7 @@ PortalGetHeapMemory(Portal portal)
* BadState if called when disabled.
* BadArg if context is invalid.
*/
static Portal
static Portal
PortalVariableMemoryGetPortal(PortalVariableMemory context)
{
return ((Portal) ((char *) context - offsetof(PortalD, variable)));
@@ -969,7 +969,7 @@ PortalVariableMemoryGetPortal(PortalVariableMemory context)
* BadState if called when disabled.
* BadArg if context is invalid.
*/
static Portal
static Portal
PortalHeapMemoryGetPortal(PortalHeapMemory context)
{
return ((Portal) ((char *) context - offsetof(PortalD, heap)));
@@ -1002,7 +1002,7 @@ PortalVariableMemoryGetHeapMemory(PortalVariableMemory context)
* BadState if called when disabled.
* BadArg if context is invalid.
*/
static PortalVariableMemory
static PortalVariableMemory
PortalHeapMemoryGetVariableMemory(PortalHeapMemory context)
{
return ((PortalVariableMemory) ((char *) context