Fix prototypes so they don't look like function definitions.

2025-10-25 13:17:41 +03:00 · 1998-01-24 22:50:57 +00:00
parent 27317a0d7c
commit 7229513943
82 changed files with 289 additions and 499 deletions
--- a/src/include/utils/acl.h
+++ b/src/include/utils/acl.h
@@ -6,7 +6,7 @@
 *
 * Copyright (c) 1994, Regents of the University of California
 *
- * $Id: acl.h,v 1.12 1998/01/05 18:43:18 momjian Exp $
+ * $Id: acl.h,v 1.13 1998/01/24 22:50:28 momjian Exp $
 *
 * NOTES
 *	  For backward-compatability purposes we have to allow there
@@ -141,8 +141,7 @@ extern Acl *aclinsert3(Acl *old_acl, AclItem *mod_aip, unsigned modechg);

 extern char *aclmakepriv(char *old_privlist, char new_priv);
 extern char *aclmakeuser(char *user_type, char *user);
-extern ChangeACLStmt *
-makeAclStmt(char *privs, List *rel_list, char *grantee,
+extern ChangeACLStmt * makeAclStmt(char *privs, List *rel_list, char *grantee,
 			char grant_or_revoke);

 /*
@@ -164,11 +163,9 @@ extern char *get_groname(AclId grosysid);

 extern int32 pg_aclcheck(char *relname, char *usename, AclMode mode);
 extern int32 pg_ownercheck(char *usename, char *value, int cacheid);
-extern int32
-pg_func_ownercheck(char *usename, char *funcname,
+extern int32 pg_func_ownercheck(char *usename, char *funcname,
 				   int nargs, Oid *arglist);
-extern int32
-pg_aggr_ownercheck(char *usename, char *aggname,
+extern int32 pg_aggr_ownercheck(char *usename, char *aggname,
 				   Oid basetypeID);

 #endif							/* ACL_H */
--- a/src/include/utils/array.h
+++ b/src/include/utils/array.h
@@ -10,7 +10,7 @@
 *
 * Copyright (c) 1994, Regents of the University of California
 *
- * $Id: array.h,v 1.8 1997/09/08 21:54:49 momjian Exp $
+ * $Id: array.h,v 1.9 1998/01/24 22:50:31 momjian Exp $
 *
 * NOTES
 *	  XXX the data array should be LONGALIGN'd -- notice that the array
@@ -117,22 +117,17 @@ typedef struct
 extern char *array_in(char *string, Oid element_type);
 extern char *array_out(ArrayType *v, Oid element_type);
 extern char *array_dims(ArrayType *v, bool *isNull);
-extern Datum
-array_ref(ArrayType *array, int n, int indx[], int reftype,
+extern Datum array_ref(ArrayType *array, int n, int indx[], int reftype,
 		  int elmlen, int arraylen, bool *isNull);
-extern Datum
-array_clip(ArrayType *array, int n, int upperIndx[],
+extern Datum array_clip(ArrayType *array, int n, int upperIndx[],
 		   int lowerIndx[], int reftype, int len, bool *isNull);
-extern char *
-array_set(ArrayType *array, int n, int indx[], char *dataPtr,
+extern char * array_set(ArrayType *array, int n, int indx[], char *dataPtr,
 		  int reftype, int elmlen, int arraylen, bool *isNull);
-extern char *
-array_assgn(ArrayType *array, int n, int upperIndx[],
+extern char * array_assgn(ArrayType *array, int n, int upperIndx[],
 			int lowerIndx[], ArrayType *newArr, int reftype,
 			int len, bool *isNull);
 extern int	array_eq(ArrayType *array1, ArrayType *array2);
-extern int
-_LOtransfer(char **destfd, int size, int nitems, char **srcfd,
+extern int _LOtransfer(char **destfd, int size, int nitems, char **srcfd,
 			int isSrcLO, int isDestLO);

 extern char *_array_newLO(int *fd, int flag);
@@ -156,14 +151,11 @@ extern int	next_tuple(int n, int curr[], int span[]);
 /*
 * prototypes for functions defined in chunk.c
 */
-extern char *
-_ChunkArray(int fd, FILE *afd, int ndim, int dim[], int baseSize,
+extern char * _ChunkArray(int fd, FILE *afd, int ndim, int dim[], int baseSize,
 			int *nbytes, char *chunkfile);
-extern int
-_ReadChunkArray(int st[], int endp[], int bsize, int fp,
+extern int _ReadChunkArray(int st[], int endp[], int bsize, int fp,
 			 char *destfp, ArrayType *array, int isDestLO, bool *isNull);
-extern struct varlena *
-_ReadChunkArray1El(int st[], int bsize, int fp,
+extern struct varlena * _ReadChunkArray1El(int st[], int bsize, int fp,
 				   ArrayType *array, bool *isNull);


--- a/src/include/utils/catcache.h
+++ b/src/include/utils/catcache.h
@@ -6,7 +6,7 @@
 *
 * Copyright (c) 1994, Regents of the University of California
 *
- * $Id: catcache.h,v 1.8 1997/09/08 21:54:52 momjian Exp $
+ * $Id: catcache.h,v 1.9 1998/01/24 22:50:34 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -63,18 +63,14 @@ typedef struct catcache
 extern struct catcache *Caches;
 extern GlobalMemory CacheCxt;

-extern void
-CatalogCacheIdInvalidate(int cacheId, Index hashIndex,
+extern void CatalogCacheIdInvalidate(int cacheId, Index hashIndex,
 						 ItemPointer pointer);
 extern void ResetSystemCache(void);
-extern CatCache *
-InitSysCache(char *relname, char *indname, int id, int nkeys,
+extern CatCache * InitSysCache(char *relname, char *indname, int id, int nkeys,
 			 int key[], HeapTuple (*iScanfuncP) ());
-extern HeapTuple
-SearchSysCache(struct catcache * cache, Datum v1, Datum v2,
+extern HeapTuple SearchSysCache(struct catcache * cache, Datum v1, Datum v2,
 			   Datum v3, Datum v4);
-extern void
-RelationInvalidateCatalogCacheTuple(Relation relation,
+extern void RelationInvalidateCatalogCacheTuple(Relation relation,
 									HeapTuple tuple, void (*function) ());

 #endif							/* CATCACHE_H */
--- a/src/include/utils/datum.h
+++ b/src/include/utils/datum.h
@@ -6,7 +6,7 @@
 *
 * Copyright (c) 1994, Regents of the University of California
 *
- * $Id: datum.h,v 1.5 1997/09/08 21:54:53 momjian Exp $
+ * $Id: datum.h,v 1.6 1998/01/24 22:50:36 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -57,8 +57,7 @@ extern void datumFree(Datum value, Oid type, bool byVal, Size len);
 * return true if thwo datums are equal, false otherwise.
 * XXX : See comments in the code for restrictions!
 */
-extern bool
-datumIsEqual(Datum value1, Datum value2, Oid type,
+extern bool datumIsEqual(Datum value1, Datum value2, Oid type,
 			 bool byVal, Size len);

 #endif							/* DATUM_H */
--- a/src/include/utils/dt.h
+++ b/src/include/utils/dt.h
@@ -8,7 +8,7 @@
 *
 * Copyright (c) 1994, Regents of the University of California
 *
- * $Id: dt.h,v 1.24 1997/12/17 23:19:28 thomas Exp $
+ * $Id: dt.h,v 1.25 1998/01/24 22:50:39 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -320,19 +320,15 @@ extern int date2j(int year, int month, int day);

 extern double time2t(const int hour, const int min, const double sec);

-extern int
-ParseDateTime(char *timestr, char *lowstr,
+extern int ParseDateTime(char *timestr, char *lowstr,
 			  char *field[], int ftype[], int maxfields, int *numfields);
-extern int
-DecodeDateTime(char *field[], int ftype[],
+extern int DecodeDateTime(char *field[], int ftype[],
 			 int nf, int *dtype, struct tm * tm, double *fsec, int *tzp);

-extern int
-DecodeTimeOnly(char *field[], int ftype[], int nf,
+extern int DecodeTimeOnly(char *field[], int ftype[], int nf,
 			   int *dtype, struct tm * tm, double *fsec);

-extern int
-DecodeDateDelta(char *field[], int ftype[],
+extern int DecodeDateDelta(char *field[], int ftype[],
 				int nf, int *dtype, struct tm * tm, double *fsec);

 extern int EncodeDateOnly(struct tm * tm, int style, char *str);
--- a/src/include/utils/exc.h
+++ b/src/include/utils/exc.h
@@ -6,7 +6,7 @@
 *
 * Copyright (c) 1994, Regents of the University of California
 *
- * $Id: exc.h,v 1.10 1997/09/08 21:54:56 momjian Exp $
+ * $Id: exc.h,v 1.11 1998/01/24 22:50:41 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -78,8 +78,7 @@ typedef void ExcProc (Exception *, ExcDetail, ExcData, ExcMessage);
 * prototypes for functions in exc.c
 */
 extern void EnableExceptionHandling(bool on);
-extern void
-ExcRaise(Exception *excP,
+extern void ExcRaise(Exception *excP,
 		 ExcDetail detail,
 		 ExcData data,
 		 ExcMessage message);
@@ -88,8 +87,7 @@ ExcRaise(Exception *excP,
 /*
 * prototypes for functions in excabort.c
 */
-extern void
-ExcAbort(const Exception *excP, ExcDetail detail, ExcData data,
+extern void ExcAbort(const Exception *excP, ExcDetail detail, ExcData data,
 		 ExcMessage message);

 #endif							/* EXC_H */
--- a/src/include/utils/fcache2.h
+++ b/src/include/utils/fcache2.h
@@ -6,7 +6,7 @@
 *
 * Copyright (c) 1994, Regents of the University of California
 *
- * $Id: fcache2.h,v 1.5 1997/09/08 21:55:02 momjian Exp $
+ * $Id: fcache2.h,v 1.6 1998/01/24 22:50:42 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -15,7 +15,6 @@

 #include <nodes/execnodes.h>

-extern void
-			setFcache(Node *node, Oid foid, List *argList, ExprContext *econtext);
+extern void setFcache(Node *node, Oid foid, List *argList, ExprContext *econtext);

 #endif							/* FCACHE2_H */
--- a/src/include/utils/geo_decls.h
+++ b/src/include/utils/geo_decls.h
@@ -5,7 +5,7 @@
 *
 * Copyright (c) 1994, Regents of the University of California
 *
- * $Id: geo_decls.h,v 1.16 1998/01/07 18:46:59 momjian Exp $
+ * $Id: geo_decls.h,v 1.17 1998/01/24 22:50:43 momjian Exp $
 *
 * NOTE
 *	  These routines do *not* use the float types from adt/.
@@ -340,11 +340,9 @@ extern double *circle_area(CIRCLE *circle);
 extern double circle_dt(CIRCLE *circle1, CIRCLE *circle2);

 /* geo_selfuncs.c */
-extern float64
-areasel(Oid opid, Oid relid, AttrNumber attno,
+extern float64 areasel(Oid opid, Oid relid, AttrNumber attno,
 		char *value, int32 flag);
-extern float64
-areajoinsel(Oid opid, Oid relid, AttrNumber attno,
+extern float64 areajoinsel(Oid opid, Oid relid, AttrNumber attno,
 			char *value, int32 flag);

 #endif							/* GEO_DECLS_H */
--- a/src/include/utils/hsearch.h
+++ b/src/include/utils/hsearch.h
@@ -6,7 +6,7 @@
 *
 * Copyright (c) 1994, Regents of the University of California
 *
- * $Id: hsearch.h,v 1.6 1997/09/08 21:55:07 momjian Exp $
+ * $Id: hsearch.h,v 1.7 1998/01/24 22:50:45 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -133,8 +133,7 @@ typedef enum
 extern HTAB *hash_create(int nelem, HASHCTL *info, int flags);
 extern void hash_destroy(HTAB *hashp);
 extern void hash_stats(char *where, HTAB *hashp);
-extern long *
-hash_search(HTAB *hashp, char *keyPtr, HASHACTION action,
+extern long * hash_search(HTAB *hashp, char *keyPtr, HASHACTION action,
 			bool *foundPtr);
 extern long *hash_seq(HTAB *hashp);

--- a/src/include/utils/lselect.h
+++ b/src/include/utils/lselect.h
@@ -6,7 +6,7 @@
 *
 * Copyright (c) 1994, Regents of the University of California
 *
- * $Id: lselect.h,v 1.8 1997/11/26 01:14:33 momjian Exp $
+ * $Id: lselect.h,v 1.9 1998/01/24 22:50:46 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -39,14 +39,11 @@ typedef struct
 } LeftistContextData;
 typedef LeftistContextData *LeftistContext;

-extern struct leftist *
-lmerge(struct leftist * pt, struct leftist * qt,
+extern struct leftist * lmerge(struct leftist * pt, struct leftist * qt,
 	   LeftistContext context);
-extern HeapTuple
-gettuple(struct leftist ** treep, short *devnum,
+extern HeapTuple gettuple(struct leftist ** treep, short *devnum,
 		 LeftistContext context);
-extern void
-puttuple(struct leftist ** treep, HeapTuple newtuple, short devnum,
+extern void puttuple(struct leftist ** treep, HeapTuple newtuple, short devnum,
 		 LeftistContext context);
 extern int	tuplecmp(HeapTuple ltup, HeapTuple rtup, LeftistContext context);

--- a/src/include/utils/lsyscache.h
+++ b/src/include/utils/lsyscache.h
@@ -6,7 +6,7 @@
 *
 * Copyright (c) 1994, Regents of the University of California
 *
- * $Id: lsyscache.h,v 1.7 1998/01/20 05:05:08 momjian Exp $
+ * $Id: lsyscache.h,v 1.8 1998/01/24 22:50:48 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -24,8 +24,7 @@ extern bool get_attisset(Oid relid, char *attname);
 extern int get_atttypmod(Oid relid, AttrNumber attnum);
 extern RegProcedure get_opcode(Oid opid);
 extern char *get_opname(Oid opid);
-extern bool
-op_mergesortable(Oid opid, Oid ltype, Oid rtype,
+extern bool op_mergesortable(Oid opid, Oid ltype, Oid rtype,
 				 Oid *leftOp, Oid *rightOp);
 extern Oid	op_hashjoinable(Oid opid, Oid ltype, Oid rtype);
 extern Oid	get_commutator(Oid opid);
--- a/src/include/utils/mcxt.h
+++ b/src/include/utils/mcxt.h
@@ -6,7 +6,7 @@
 *
 * Copyright (c) 1994, Regents of the University of California
 *
- * $Id: mcxt.h,v 1.8 1997/09/08 21:55:11 momjian Exp $
+ * $Id: mcxt.h,v 1.9 1998/01/24 22:50:50 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -39,8 +39,7 @@ extern MemoryContext TopMemoryContext;
 */
 extern void EnableMemoryContext(bool on);
 extern Pointer MemoryContextAlloc(MemoryContext context, Size size);
-extern Pointer
-MemoryContextRealloc(MemoryContext context,
+extern Pointer MemoryContextRealloc(MemoryContext context,
 					 Pointer pointer,
 					 Size size);
 extern void MemoryContextFree(MemoryContext context, Pointer pointer);
--- a/src/include/utils/memutils.h
+++ b/src/include/utils/memutils.h
@@ -15,7 +15,7 @@
 *
 * Copyright (c) 1994, Regents of the University of California
 *
- * $Id: memutils.h,v 1.12 1998/01/11 21:03:10 momjian Exp $
+ * $Id: memutils.h,v 1.13 1998/01/24 22:50:51 momjian Exp $
 *
 * NOTES
 *	  some of the information in this file will be moved to
@@ -233,8 +233,7 @@ extern void AllocSetReset(AllocSet set);
 extern bool AllocSetContains(AllocSet set, AllocPointer pointer);
 extern AllocPointer AllocSetAlloc(AllocSet set, Size size);
 extern void AllocSetFree(AllocSet set, AllocPointer pointer);
-extern AllocPointer
-AllocSetRealloc(AllocSet set, AllocPointer pointer,
+extern AllocPointer AllocSetRealloc(AllocSet set, AllocPointer pointer,
 				Size size);

 extern void AllocSetDump(AllocSet set);
--- a/src/include/utils/portal.h
+++ b/src/include/utils/portal.h
@@ -6,7 +6,7 @@
 *
 * Copyright (c) 1994, Regents of the University of California
 *
- * $Id: portal.h,v 1.7 1997/09/08 21:55:14 momjian Exp $
+ * $Id: portal.h,v 1.8 1998/01/24 22:50:52 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -68,8 +68,7 @@ extern void AtEOXact_portals(void);
 extern void EnablePortalManager(bool on);
 extern Portal GetPortalByName(char *name);
 extern Portal BlankPortalAssignName(char *name);
-extern void
-PortalSetQuery(Portal portal, QueryDesc *queryDesc,
+extern void PortalSetQuery(Portal portal, QueryDesc *queryDesc,
 			   TupleDesc attinfo, EState *state,
 			   void (*cleanup) (Portal portal));
 extern QueryDesc *PortalGetQueryDesc(Portal portal);
--- a/src/include/utils/rel.h
+++ b/src/include/utils/rel.h
@@ -6,7 +6,7 @@
 *
 * Copyright (c) 1994, Regents of the University of California
 *
- * $Id: rel.h,v 1.15 1998/01/15 19:46:37 pgsql Exp $
+ * $Id: rel.h,v 1.16 1998/01/24 22:50:54 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -186,8 +186,7 @@ typedef Relation *RelationPtr;

 extern IndexStrategy RelationGetIndexStrategy(Relation relation);

-extern void
-RelationSetIndexSupport(Relation relation, IndexStrategy strategy,
+extern void RelationSetIndexSupport(Relation relation, IndexStrategy strategy,
 						RegProcedure *support);

 #endif							/* REL_H */
--- a/src/include/utils/rel2.h
+++ b/src/include/utils/rel2.h
@@ -6,7 +6,7 @@
 *
 * Copyright (c) 1994, Regents of the University of California
 *
- * $Id: rel2.h,v 1.4 1997/09/08 21:55:16 momjian Exp $
+ * $Id: rel2.h,v 1.5 1998/01/24 22:50:55 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -17,8 +17,7 @@

 extern IndexStrategy RelationGetIndexStrategy(Relation relation);

-extern void
-RelationSetIndexSupport(Relation relation, IndexStrategy strategy,
+extern void RelationSetIndexSupport(Relation relation, IndexStrategy strategy,
 						RegProcedure *support);

 #endif							/* TMP_REL2_H */
--- a/src/include/utils/relcache.h
+++ b/src/include/utils/relcache.h
@@ -6,7 +6,7 @@
 *
 * Copyright (c) 1994, Regents of the University of California
 *
- * $Id: relcache.h,v 1.8 1997/09/08 02:39:56 momjian Exp $
+ * $Id: relcache.h,v 1.9 1998/01/24 22:50:56 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -26,8 +26,7 @@ extern void RelationClose(Relation relation);
 extern void RelationForgetRelation(Oid rid);
 extern void RelationIdInvalidateRelationCacheByRelationId(Oid relationId);

-extern void
-			RelationIdInvalidateRelationCacheByAccessMethodId(Oid accessMethodId);
+extern void RelationIdInvalidateRelationCacheByAccessMethodId(Oid accessMethodId);

 extern void RelationCacheInvalidate(bool onlyFlushReferenceCountZero);

--- a/src/include/utils/syscache.h
+++ b/src/include/utils/syscache.h
@@ -6,7 +6,7 @@
 *
 * Copyright (c) 1994, Regents of the University of California
 *
- * $Id: syscache.h,v 1.8 1997/10/28 15:11:45 vadim Exp $
+ * $Id: syscache.h,v 1.9 1998/01/24 22:50:57 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -79,14 +79,11 @@ struct cachedesc

 extern void zerocaches(void);
 extern void InitCatalogCache(void);
-extern HeapTuple
-SearchSysCacheTuple(int cacheId, Datum key1, Datum key2,
+extern HeapTuple SearchSysCacheTuple(int cacheId, Datum key1, Datum key2,
 					Datum key3, Datum key4);
-extern int32
-SearchSysCacheStruct(int cacheId, char *returnStruct,
+extern int32 SearchSysCacheStruct(int cacheId, char *returnStruct,
 					 Datum key1, Datum key2, Datum key3, Datum key4);
-extern void *
-SearchSysCacheGetAttribute(int cacheId,
+extern void * SearchSysCacheGetAttribute(int cacheId,
 						   AttrNumber attributeNumber,
 						   Datum key1,
 						   Datum key2,