diff options
| author | Bruce Momjian | 2011-04-10 15:42:00 +0000 |
|---|---|---|
| committer | Bruce Momjian | 2011-04-10 15:42:00 +0000 |
| commit | bf50caf105a901c4f83ac1df3cdaf910c26694a4 (patch) | |
| tree | dac42d7795070f107eefb085c500f86a4d35f92f /src/include/commands | |
| parent | 9a8b73147c07e02e10e0d0a34aa99d72e3336fb2 (diff) | |
pgindent run before PG 9.1 beta 1.
Diffstat (limited to 'src/include/commands')
| -rw-r--r-- | src/include/commands/alter.h | 2 | ||||
| -rw-r--r-- | src/include/commands/collationcmds.h | 2 | ||||
| -rw-r--r-- | src/include/commands/copy.h | 6 | ||||
| -rw-r--r-- | src/include/commands/dbcommands.h | 4 | ||||
| -rw-r--r-- | src/include/commands/defrem.h | 14 | ||||
| -rw-r--r-- | src/include/commands/explain.h | 10 | ||||
| -rw-r--r-- | src/include/commands/extension.h | 4 | ||||
| -rw-r--r-- | src/include/commands/proclang.h | 2 | ||||
| -rw-r--r-- | src/include/commands/seclabel.h | 10 | ||||
| -rw-r--r-- | src/include/commands/trigger.h | 2 | ||||
| -rw-r--r-- | src/include/commands/typecmds.h | 2 | ||||
| -rw-r--r-- | src/include/commands/vacuum.h | 2 |
12 files changed, 30 insertions, 30 deletions
diff --git a/src/include/commands/alter.h b/src/include/commands/alter.h index 21731685f5c..e942b538af9 100644 --- a/src/include/commands/alter.h +++ b/src/include/commands/alter.h @@ -21,7 +21,7 @@ extern void ExecRenameStmt(RenameStmt *stmt); extern void ExecAlterObjectSchemaStmt(AlterObjectSchemaStmt *stmt); extern Oid AlterObjectNamespace_oid(Oid classId, Oid objid, Oid nspOid); -extern Oid AlterObjectNamespace(Relation rel, int oidCacheId, int nameCacheId, +extern Oid AlterObjectNamespace(Relation rel, int oidCacheId, int nameCacheId, Oid objid, Oid nspOid, int Anum_name, int Anum_namespace, int Anum_owner, AclObjectKind acl_kind); diff --git a/src/include/commands/collationcmds.h b/src/include/commands/collationcmds.h index 60504694a5b..6dbeb751aa9 100644 --- a/src/include/commands/collationcmds.h +++ b/src/include/commands/collationcmds.h @@ -23,6 +23,6 @@ extern void RenameCollation(List *name, const char *newname); extern void AlterCollationOwner(List *name, Oid newOwnerId); extern void AlterCollationOwner_oid(Oid collationOid, Oid newOwnerId); extern void AlterCollationNamespace(List *name, const char *newschema); -extern Oid AlterCollationNamespace_oid(Oid collOid, Oid newNspOid); +extern Oid AlterCollationNamespace_oid(Oid collOid, Oid newNspOid); #endif /* COLLATIONCMDS_H */ diff --git a/src/include/commands/copy.h b/src/include/commands/copy.h index 7098a70c959..a31479defb5 100644 --- a/src/include/commands/copy.h +++ b/src/include/commands/copy.h @@ -25,12 +25,12 @@ extern uint64 DoCopy(const CopyStmt *stmt, const char *queryString); extern void ProcessCopyOptions(CopyState cstate, bool is_from, List *options); extern CopyState BeginCopyFrom(Relation rel, const char *filename, - List *attnamelist, List *options); + List *attnamelist, List *options); extern void EndCopyFrom(CopyState cstate); extern bool NextCopyFrom(CopyState cstate, ExprContext *econtext, - Datum *values, bool *nulls, Oid *tupleOid); + Datum *values, bool *nulls, Oid *tupleOid); extern bool NextCopyFromRawFields(CopyState cstate, - char ***fields, int *nfields); + char ***fields, int *nfields); extern void CopyFromErrorCallback(void *arg); extern DestReceiver *CreateCopyDestReceiver(void); diff --git a/src/include/commands/dbcommands.h b/src/include/commands/dbcommands.h index f54c57907a1..21dacff39c7 100644 --- a/src/include/commands/dbcommands.h +++ b/src/include/commands/dbcommands.h @@ -27,14 +27,14 @@ typedef struct xl_dbase_create_rec_old Oid db_id; char src_path[1]; /* VARIABLE LENGTH STRING */ /* dst_path follows src_path */ -} xl_dbase_create_rec_old; +} xl_dbase_create_rec_old; typedef struct xl_dbase_drop_rec_old { /* Records dropping of a single subdirectory incl. contents */ Oid db_id; char dir_path[1]; /* VARIABLE LENGTH STRING */ -} xl_dbase_drop_rec_old; +} xl_dbase_drop_rec_old; typedef struct xl_dbase_create_rec { diff --git a/src/include/commands/defrem.h b/src/include/commands/defrem.h index 157ee394614..bbc024f50cc 100644 --- a/src/include/commands/defrem.h +++ b/src/include/commands/defrem.h @@ -68,7 +68,7 @@ extern void AlterFunctionNamespace(List *name, List *argtypes, bool isagg, const char *newschema); extern Oid AlterFunctionNamespace_oid(Oid procOid, Oid nspOid); extern void ExecuteDoStmt(DoStmt *stmt); -extern Oid get_cast_oid(Oid sourcetypeid, Oid targettypeid, bool missing_ok); +extern Oid get_cast_oid(Oid sourcetypeid, Oid targettypeid, bool missing_ok); /* commands/operatorcmds.c */ extern void DefineOperator(List *names, List *parameters); @@ -107,9 +107,9 @@ extern void AlterOpFamilyOwner(List *name, const char *access_method, Oid newOwn extern void AlterOpFamilyOwner_oid(Oid opfamilyOid, Oid newOwnerId); extern void AlterOpFamilyNamespace(List *name, char *access_method, const char *newschema); extern Oid AlterOpFamilyNamespace_oid(Oid opfamilyOid, Oid newNspOid); -extern Oid get_am_oid(const char *amname, bool missing_ok); -extern Oid get_opclass_oid(Oid amID, List *opclassname, bool missing_ok); -extern Oid get_opfamily_oid(Oid amID, List *opfamilyname, bool missing_ok); +extern Oid get_am_oid(const char *amname, bool missing_ok); +extern Oid get_opclass_oid(Oid amID, List *opclassname, bool missing_ok); +extern Oid get_opfamily_oid(Oid amID, List *opfamilyname, bool missing_ok); /* commands/tsearchcmds.c */ extern void DefineTSParser(List *names, List *parameters); @@ -164,9 +164,9 @@ extern void RemoveUserMapping(DropUserMappingStmt *stmt); extern void RemoveUserMappingById(Oid umId); extern void CreateForeignTable(CreateForeignTableStmt *stmt, Oid relid); extern Datum transformGenericOptions(Oid catalogId, - Datum oldOptions, - List *options, - Oid fdwvalidator); + Datum oldOptions, + List *options, + Oid fdwvalidator); /* support routines in commands/define.c */ diff --git a/src/include/commands/explain.h b/src/include/commands/explain.h index 2c38c92ae51..d7998c31781 100644 --- a/src/include/commands/explain.h +++ b/src/include/commands/explain.h @@ -73,14 +73,14 @@ extern void ExplainEndOutput(ExplainState *es); extern void ExplainSeparatePlans(ExplainState *es); extern void ExplainPropertyList(const char *qlabel, List *data, - ExplainState *es); + ExplainState *es); extern void ExplainPropertyText(const char *qlabel, const char *value, - ExplainState *es); + ExplainState *es); extern void ExplainPropertyInteger(const char *qlabel, int value, - ExplainState *es); + ExplainState *es); extern void ExplainPropertyLong(const char *qlabel, long value, - ExplainState *es); + ExplainState *es); extern void ExplainPropertyFloat(const char *qlabel, double value, int ndigits, - ExplainState *es); + ExplainState *es); #endif /* EXPLAIN_H */ diff --git a/src/include/commands/extension.h b/src/include/commands/extension.h index c6e69d5fd42..2792c6dd49f 100644 --- a/src/include/commands/extension.h +++ b/src/include/commands/extension.h @@ -24,7 +24,7 @@ * installation script. */ extern bool creating_extension; -extern Oid CurrentExtensionObject; +extern Oid CurrentExtensionObject; extern void CreateExtension(CreateExtensionStmt *stmt); @@ -32,7 +32,7 @@ extern void CreateExtension(CreateExtensionStmt *stmt); extern void RemoveExtensions(DropStmt *stmt); extern void RemoveExtensionById(Oid extId); -extern Oid InsertExtensionTuple(const char *extName, Oid extOwner, +extern Oid InsertExtensionTuple(const char *extName, Oid extOwner, Oid schemaOid, bool relocatable, const char *extVersion, Datum extConfig, Datum extCondition, List *requiredExtensions); diff --git a/src/include/commands/proclang.h b/src/include/commands/proclang.h index aa1fb34d1a0..644c371dcc0 100644 --- a/src/include/commands/proclang.h +++ b/src/include/commands/proclang.h @@ -21,6 +21,6 @@ extern void RenameLanguage(const char *oldname, const char *newname); extern void AlterLanguageOwner(const char *name, Oid newOwnerId); extern void AlterLanguageOwner_oid(Oid oid, Oid newOwnerId); extern bool PLTemplateExists(const char *languageName); -extern Oid get_language_oid(const char *langname, bool missing_ok); +extern Oid get_language_oid(const char *langname, bool missing_ok); #endif /* PROCLANG_H */ diff --git a/src/include/commands/seclabel.h b/src/include/commands/seclabel.h index 1ae922b7e90..06ce602d7dc 100644 --- a/src/include/commands/seclabel.h +++ b/src/include/commands/seclabel.h @@ -19,7 +19,7 @@ extern char *GetSecurityLabel(const ObjectAddress *object, const char *provider); extern void SetSecurityLabel(const ObjectAddress *object, - const char *provider, const char *label); + const char *provider, const char *label); extern void DeleteSecurityLabel(const ObjectAddress *object); /* @@ -27,9 +27,9 @@ extern void DeleteSecurityLabel(const ObjectAddress *object); */ extern void ExecSecLabelStmt(SecLabelStmt *stmt); -typedef void (*check_object_relabel_type)(const ObjectAddress *object, - const char *seclabel); +typedef void (*check_object_relabel_type) (const ObjectAddress *object, + const char *seclabel); extern void register_label_provider(const char *provider, - check_object_relabel_type hook); + check_object_relabel_type hook); -#endif /* SECLABEL_H */ +#endif /* SECLABEL_H */ diff --git a/src/include/commands/trigger.h b/src/include/commands/trigger.h index 80a779ed0bd..ad97871d98a 100644 --- a/src/include/commands/trigger.h +++ b/src/include/commands/trigger.h @@ -115,7 +115,7 @@ extern Oid CreateTrigger(CreateTrigStmt *stmt, const char *queryString, extern void DropTrigger(Oid relid, const char *trigname, DropBehavior behavior, bool missing_ok); extern void RemoveTriggerById(Oid trigOid); -extern Oid get_trigger_oid(Oid relid, const char *name, bool missing_ok); +extern Oid get_trigger_oid(Oid relid, const char *name, bool missing_ok); extern void renametrig(Oid relid, const char *oldname, const char *newname); diff --git a/src/include/commands/typecmds.h b/src/include/commands/typecmds.h index 1b20296934f..6d9d1ccaa95 100644 --- a/src/include/commands/typecmds.h +++ b/src/include/commands/typecmds.h @@ -42,7 +42,7 @@ extern void AlterTypeOwnerInternal(Oid typeOid, Oid newOwnerId, bool hasDependEntry); extern void AlterTypeNamespace(List *names, const char *newschema); extern Oid AlterTypeNamespace_oid(Oid typeOid, Oid nspOid); -extern Oid AlterTypeNamespaceInternal(Oid typeOid, Oid nspOid, +extern Oid AlterTypeNamespaceInternal(Oid typeOid, Oid nspOid, bool isImplicitArray, bool errorOnTableType); diff --git a/src/include/commands/vacuum.h b/src/include/commands/vacuum.h index cc1441372dc..79c9f5d90fb 100644 --- a/src/include/commands/vacuum.h +++ b/src/include/commands/vacuum.h @@ -68,7 +68,7 @@ typedef struct VacAttrStats * type-specific typanalyze function. * * Note: do not assume that the data being analyzed has the same datatype - * shown in attr, ie do not trust attr->atttypid, attlen, etc. This is + * shown in attr, ie do not trust attr->atttypid, attlen, etc. This is * because some index opclasses store a different type than the underlying * column/expression. Instead use attrtypid, attrtypmod, and attrtype for * information about the datatype being fed to the typanalyze function. |
