diff options
author | Bruce Momjian | 2013-05-29 20:58:43 +0000 |
---|---|---|
committer | Bruce Momjian | 2013-05-29 20:58:43 +0000 |
commit | 9af4159fce6654aa0e081b00d02bca40b978745c (patch) | |
tree | 3aa507fc6cc67ed3d9f6ceec4d65d1e56cc08e1a /contrib/sepgsql | |
parent | 07ab261ef3a9575a4a2bd3045b222d7b3dee2c46 (diff) |
pgindent run for release 9.3
This is the first run of the Perl-based pgindent script. Also update
pgindent instructions.
Diffstat (limited to 'contrib/sepgsql')
-rw-r--r-- | contrib/sepgsql/hooks.c | 30 | ||||
-rw-r--r-- | contrib/sepgsql/label.c | 5 | ||||
-rw-r--r-- | contrib/sepgsql/proc.c | 22 | ||||
-rw-r--r-- | contrib/sepgsql/relation.c | 22 | ||||
-rw-r--r-- | contrib/sepgsql/schema.c | 1 |
5 files changed, 40 insertions, 40 deletions
diff --git a/contrib/sepgsql/hooks.c b/contrib/sepgsql/hooks.c index a1320e86381..d950b3e9641 100644 --- a/contrib/sepgsql/hooks.c +++ b/contrib/sepgsql/hooks.c @@ -98,7 +98,7 @@ sepgsql_object_access(ObjectAccessType access, case OAT_POST_CREATE: { ObjectAccessPostCreate *pc_arg = arg; - bool is_internal; + bool is_internal; is_internal = pc_arg ? pc_arg->is_internal : false; @@ -107,7 +107,7 @@ sepgsql_object_access(ObjectAccessType access, case DatabaseRelationId: Assert(!is_internal); sepgsql_database_post_create(objectId, - sepgsql_context_info.createdb_dtemplate); + sepgsql_context_info.createdb_dtemplate); break; case NamespaceRelationId: @@ -190,8 +190,8 @@ sepgsql_object_access(ObjectAccessType access, case OAT_POST_ALTER: { - ObjectAccessPostAlter *pa_arg = arg; - bool is_internal = pa_arg->is_internal; + ObjectAccessPostAlter *pa_arg = arg; + bool is_internal = pa_arg->is_internal; switch (classId) { @@ -207,21 +207,21 @@ sepgsql_object_access(ObjectAccessType access, case RelationRelationId: if (subId == 0) - { + { /* * A case when we don't want to apply permission * check is that relation is internally altered - * without user's intention. E.g, no need to - * check on toast table/index to be renamed at - * end of the table rewrites. + * without user's intention. E.g, no need to check + * on toast table/index to be renamed at end of + * the table rewrites. */ if (is_internal) - break; + break; sepgsql_relation_setattr(objectId); - } - else - sepgsql_attribute_setattr(objectId, subId); + } + else + sepgsql_attribute_setattr(objectId, subId); break; case ProcedureRelationId: @@ -238,11 +238,11 @@ sepgsql_object_access(ObjectAccessType access, case OAT_NAMESPACE_SEARCH: { - ObjectAccessNamespaceSearch *ns_arg = arg; + ObjectAccessNamespaceSearch *ns_arg = arg; /* - * If stacked extension already decided not to allow users - * to search this schema, we just stick with that decision. + * If stacked extension already decided not to allow users to + * search this schema, we just stick with that decision. */ if (!ns_arg->result) break; diff --git a/contrib/sepgsql/label.c b/contrib/sepgsql/label.c index 6146399e807..17b832efe22 100644 --- a/contrib/sepgsql/label.c +++ b/contrib/sepgsql/label.c @@ -351,9 +351,8 @@ sepgsql_fmgr_hook(FmgrHookEventType event, * * Also, db_procedure:entrypoint permission should be checked * whether this procedure can perform as an entrypoint of the - * trusted procedure, or not. - * Note that db_procedure:execute permission shall be checked - * individually. + * trusted procedure, or not. Note that db_procedure:execute + * permission shall be checked individually. */ if (stack->new_label) { diff --git a/contrib/sepgsql/proc.c b/contrib/sepgsql/proc.c index 0230028b2a8..c89f31a789c 100644 --- a/contrib/sepgsql/proc.c +++ b/contrib/sepgsql/proc.c @@ -236,16 +236,16 @@ sepgsql_proc_relabel(Oid functionId, const char *seclabel) void sepgsql_proc_setattr(Oid functionId) { - Relation rel; - ScanKeyData skey; - SysScanDesc sscan; - HeapTuple oldtup; - HeapTuple newtup; - Form_pg_proc oldform; - Form_pg_proc newform; - uint32 required; - ObjectAddress object; - char *audit_name; + Relation rel; + ScanKeyData skey; + SysScanDesc sscan; + HeapTuple oldtup; + HeapTuple newtup; + Form_pg_proc oldform; + Form_pg_proc newform; + uint32 required; + ObjectAddress object; + char *audit_name; /* * Fetch newer catalog @@ -297,7 +297,7 @@ sepgsql_proc_setattr(Oid functionId) sepgsql_avc_check_perms(&object, SEPG_CLASS_DB_PROCEDURE, - required, + required, audit_name, true); /* cleanups */ diff --git a/contrib/sepgsql/relation.c b/contrib/sepgsql/relation.c index c1fd1c2e19e..a3005ad8976 100644 --- a/contrib/sepgsql/relation.c +++ b/contrib/sepgsql/relation.c @@ -31,7 +31,7 @@ #include "sepgsql.h" -static void sepgsql_index_modify(Oid indexOid); +static void sepgsql_index_modify(Oid indexOid); /* * sepgsql_attribute_post_create @@ -571,13 +571,13 @@ sepgsql_relation_relabel(Oid relOid, const char *seclabel) void sepgsql_relation_setattr(Oid relOid) { - Relation rel; - ScanKeyData skey; - SysScanDesc sscan; - HeapTuple oldtup; - HeapTuple newtup; - Form_pg_class oldform; - Form_pg_class newform; + Relation rel; + ScanKeyData skey; + SysScanDesc sscan; + HeapTuple oldtup; + HeapTuple newtup; + Form_pg_class oldform; + Form_pg_class newform; ObjectAddress object; char *audit_name; uint16_t tclass; @@ -680,8 +680,8 @@ sepgsql_relation_setattr_extra(Relation catalog, AttrNumber anum_relation_id, AttrNumber anum_extra_id) { - ScanKeyData skey; - SysScanDesc sscan; + ScanKeyData skey; + SysScanDesc sscan; HeapTuple tuple; Datum datum; bool isnull; @@ -708,7 +708,7 @@ sepgsql_relation_setattr_extra(Relation catalog, /* * sepgsql_index_modify - * Handle index create, update, drop + * Handle index create, update, drop * * Unlike other relation kinds, indexes do not have their own security labels, * so instead of doing checks directly, treat them as extra attributes of their diff --git a/contrib/sepgsql/schema.c b/contrib/sepgsql/schema.c index 442ccd4f61a..709de23adcc 100644 --- a/contrib/sepgsql/schema.c +++ b/contrib/sepgsql/schema.c @@ -81,6 +81,7 @@ sepgsql_schema_post_create(Oid namespaceId) tcontext, SEPG_CLASS_DB_SCHEMA, nsp_name); + /* * check db_schema:{create} */ |